Mercurial > hg > xemacs-beta
view src/objects-gtk.c @ 4690:257b468bf2ca
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we need such
functionality if we're going to have a reliable and portable
#'query-coding-region implementation. However, this change doesn't yet
provide #'query-coding-region for the mswindow-multibyte coding systems,
there should be no functional differences between an XEmacs with this change
and one without it.
src/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
This is necessary because there is no reasonable way to access the
corresponding mswindows-multibyte functionality from Lisp, and we
need such functionality if we're going to have a reliable and
portable #'query-coding-region implementation. However, this
change doesn't yet provide #'query-coding-region for the
mswindow-multibyte coding systems, there should be no functional
differences between an XEmacs with this change and one without it.
* mule-coding.c (struct fixed_width_coding_system):
Add a new coding system type, fixed_width, and implement it. It
uses the CCL infrastructure but has a much simpler creation API,
and its own query_method, formerly in lisp/mule/mule-coding.el.
* unicode.c:
Move the Unicode query method implementation here from
unicode.el.
* lisp.h: Declare Fmake_coding_system_internal, Fcopy_range_table
here.
* intl-win32.c (complex_vars_of_intl_win32):
Use Fmake_coding_system_internal, not Fmake_coding_system.
* general-slots.h: Add Qsucceeded, Qunencodable, Qinvalid_sequence
here.
* file-coding.h (enum coding_system_variant):
Add fixed_width_coding_system here.
(struct coding_system_methods):
Add query_method and query_lstream_method to the coding system
methods.
Provide flags for the query methods.
Declare the default query method; initialise it correctly in
INITIALIZE_CODING_SYSTEM_TYPE.
* file-coding.c (default_query_method):
New function, the default query method for coding systems that do
not set it. Moved from coding.el.
(make_coding_system_1):
Accept new elements in PROPS in #'make-coding-system; aliases, a
list of aliases; safe-chars and safe-charsets (these were
previously accepted but not saved); and category.
(Fmake_coding_system_internal):
New function, what used to be #'make-coding-system--on Mule
builds, we've now moved some of the functionality of this to
Lisp.
(Fcoding_system_canonical_name_p):
Move this earlier in the file, since it's now called from within
make_coding_system_1.
(Fquery_coding_region):
Move the implementation of this here, from coding.el.
(complex_vars_of_file_coding):
Call Fmake_coding_system_internal, not Fmake_coding_system;
specify safe-charsets properties when we're a mule build.
* extents.h (mouse_highlight_priority, Fset_extent_priority,
Fset_extent_face, Fmap_extents):
Make these available to other C files.
lisp/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
Move the #'query-coding-region implementation to C.
* coding.el:
Consolidate code that depends on the presence or absence of Mule
at the end of this file.
(default-query-coding-region, query-coding-region):
Move these functions to C.
(default-query-coding-region-safe-charset-skip-chars-map):
Remove this variable, the corresponding C variable is
Vdefault_query_coding_region_chartab_cache in file-coding.c.
(query-coding-string): Update docstring to reflect actual multiple
values, be more careful about not modifying a range table that
we're currently mapping over.
(encode-coding-char): Make the implementation of this simpler.
(featurep 'mule): Autoload #'make-coding-system from
mule/make-coding-system.el if we're a mule build; provide an
appropriate compiler macro.
Do various non-mule compatibility things if we're not a mule
build.
* update-elc.el (additional-dump-dependencies):
Add mule/make-coding-system as a dump time dependency if we're a
mule build.
* unicode.el (ccl-encode-to-ucs-2):
(decode-char):
(encode-char):
Move these earlier in the file, for the sake of some byte compile
warnings.
(unicode-query-coding-region):
Move this to unicode.c
* mule/make-coding-system.el:
New file, not dumped. Contains the functionality to rework the
arguments necessary for fixed-width coding systems, and contains
the implementation of #'make-coding-system, which now calls
#'make-coding-system-internal.
* mule/vietnamese.el (viscii):
* mule/latin.el (iso-8859-2):
(windows-1250):
(iso-8859-3):
(iso-8859-4):
(iso-8859-14):
(iso-8859-15):
(iso-8859-16):
(iso-8859-9):
(macintosh):
(windows-1252):
* mule/hebrew.el (iso-8859-8):
* mule/greek.el (iso-8859-7):
(windows-1253):
* mule/cyrillic.el (iso-8859-5):
(koi8-r):
(koi8-u):
(windows-1251):
(alternativnyj):
(koi8-ru):
(koi8-t):
(koi8-c):
(koi8-o):
* mule/arabic.el (iso-8859-6):
(windows-1256):
Move all these coding systems to being of type fixed-width, not of
type CCL. This allows the distinct query-coding-region for them to
be in C, something which will eventually allow us to implement
query-coding-region for the mswindows-multibyte coding systems.
* mule/general-late.el (posix-charset-to-coding-system-hash):
Document why we're pre-emptively persuading the byte compiler that
the ELC for this file needs to be written using escape-quoted.
Call #'set-unicode-query-skip-chars-args, now the Unicode
query-coding-region implementation is in C.
* mule/thai-xtis.el (tis-620):
Don't bother checking whether we're XEmacs or not here.
* mule/mule-coding.el:
Move the eight bit fixed-width functionality from this file to
make-coding-system.el.
tests/ChangeLog addition:
2009-09-19 Aidan Kehoe <kehoea@parhasard.net>
* automated/mule-tests.el:
Check a coding system's type, not an 8-bit-fixed property, for
whether that coding system should be treated as a fixed-width
coding system.
* automated/query-coding-tests.el:
Don't test the query coding functionality for mswindows-multibyte
coding systems, it's not yet implemented.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 19 Sep 2009 22:53:13 +0100 |
parents | 3ef0aaf3dc34 |
children | b3ce27ca7647 304aebb79cd3 |
line wrap: on
line source
/* X-specific Lisp objects. Copyright (C) 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1995 Tinker Systems. Copyright (C) 1995, 1996, 2002 Ben Wing. Copyright (C) 1995 Sun Microsystems, Inc. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Authors: Jamie Zawinski, Chuck Thompson, Ben Wing */ /* Gtk version by William Perry */ #include <config.h> #include "lisp.h" #include "buffer.h" #include "charset.h" #include "device-impl.h" #include "insdel.h" #include "console-gtk-impl.h" #include "objects-gtk-impl.h" /* sigh */ #include <gdk/gdkx.h> /* XListFonts doesn't allocate memory unconditionally based on this. (For XFree86 in 2005, at least. */ #define MAX_FONT_COUNT INT_MAX #ifdef DEBUG_XEMACS Fixnum debug_x_objects; #endif /* DEBUG_XEMACS */ /************************************************************************/ /* color instances */ /************************************************************************/ /* Replacement for XAllocColor() that tries to return the nearest available color if the colormap is full. Original was from FSFmacs, but rewritten by Jareth Hein <jareth@camelot-soft.com> 97/11/25 Modified by Lee Kindness <lkindness@csl.co.uk> 31/08/99 to handle previous total failure which was due to a read/write colorcell being the nearest match - tries the next nearest... Gdk takes care of all this behind the scenes, so we don't need to worry about it. Return value is 1 for normal success, 2 for nearest color success, 3 for Non-deallocable sucess. */ int allocate_nearest_color (GdkColormap *colormap, GdkVisual *UNUSED (visual), GdkColor *color_def) { int rc; rc = gdk_colormap_alloc_color (colormap, color_def, FALSE, TRUE); if (rc == TRUE) return (1); return (0); } int gtk_parse_nearest_color (struct device *d, GdkColor *color, Ibyte *name, Bytecount len, Error_Behavior errb) { GdkColormap *cmap; GdkVisual *visual; int result; cmap = DEVICE_GTK_COLORMAP(d); visual = DEVICE_GTK_VISUAL (d); xzero (*color); { const Extbyte *extname; Bytecount extnamelen; TO_EXTERNAL_FORMAT (DATA, (name, len), ALLOCA, (extname, extnamelen), Qbinary); result = gdk_color_parse (extname, color); } if (result == FALSE) { maybe_invalid_argument ("unrecognized color", make_string (name, len), Qcolor, errb); return 0; } result = allocate_nearest_color (cmap, visual, color); if (!result) { maybe_signal_error (Qgui_error, "couldn't allocate color", make_string (name, len), Qcolor, errb); return 0; } return result; } static int gtk_initialize_color_instance (struct Lisp_Color_Instance *c, Lisp_Object name, Lisp_Object device, Error_Behavior errb) { GdkColor color; int result; result = gtk_parse_nearest_color (XDEVICE (device), &color, XSTRING_DATA (name), XSTRING_LENGTH (name), errb); if (!result) return 0; /* Don't allocate the data until we're sure that we will succeed, or the finalize method may get fucked. */ c->data = xnew (struct gtk_color_instance_data); if (result == 3) COLOR_INSTANCE_GTK_DEALLOC (c) = 0; else COLOR_INSTANCE_GTK_DEALLOC (c) = 1; COLOR_INSTANCE_GTK_COLOR (c) = gdk_color_copy (&color); return 1; } static void gtk_print_color_instance (struct Lisp_Color_Instance *c, Lisp_Object printcharfun, int UNUSED (escapeflag)) { GdkColor *color = COLOR_INSTANCE_GTK_COLOR (c); write_fmt_string (printcharfun, " %ld=(%X,%X,%X)", color->pixel, color->red, color->green, color->blue); } static void gtk_finalize_color_instance (struct Lisp_Color_Instance *c) { if (c->data) { if (DEVICE_LIVE_P (XDEVICE (c->device))) { if (COLOR_INSTANCE_GTK_DEALLOC (c)) { gdk_colormap_free_colors (DEVICE_GTK_COLORMAP (XDEVICE (c->device)), COLOR_INSTANCE_GTK_COLOR (c), 1); } gdk_color_free (COLOR_INSTANCE_GTK_COLOR (c)); } xfree (c->data, void *); c->data = 0; } } /* Color instances are equal if they resolve to the same color on the screen (have the same RGB values). I imagine that "same RGB values" == "same cell in the colormap." Arguably we should be comparing their names or pixel values instead. */ static int gtk_color_instance_equal (struct Lisp_Color_Instance *c1, struct Lisp_Color_Instance *c2, int UNUSED (depth)) { return (gdk_color_equal (COLOR_INSTANCE_GTK_COLOR (c1), COLOR_INSTANCE_GTK_COLOR (c2))); } static Hashcode gtk_color_instance_hash (struct Lisp_Color_Instance *c, int UNUSED (depth)) { return (gdk_color_hash (COLOR_INSTANCE_GTK_COLOR (c), NULL)); } static Lisp_Object gtk_color_instance_rgb_components (struct Lisp_Color_Instance *c) { GdkColor *color = COLOR_INSTANCE_GTK_COLOR (c); return (list3 (make_int (color->red), make_int (color->green), make_int (color->blue))); } static int gtk_valid_color_name_p (struct device *UNUSED (d), Lisp_Object color) { GdkColor c; const char *extname; TO_EXTERNAL_FORMAT (LISP_STRING, color, C_STRING_ALLOCA, extname, Qctext); if (gdk_color_parse (extname, &c) != TRUE) return(0); return (1); } static Lisp_Object gtk_color_list (void) { /* #### BILL!!! Is this correct? */ return call0 (intern ("x-color-list-internal")); } /************************************************************************/ /* font instances */ /************************************************************************/ static int gtk_initialize_font_instance (struct Lisp_Font_Instance *f, Lisp_Object UNUSED (name), Lisp_Object UNUSED (device), Error_Behavior errb) { GdkFont *gf; XFontStruct *xf; const char *extname; TO_EXTERNAL_FORMAT (LISP_STRING, f->name, C_STRING_ALLOCA, extname, Qctext); gf = gdk_font_load (extname); if (!gf) { maybe_signal_error (Qgui_error, "couldn't load font", f->name, Qfont, errb); return 0; } xf = (XFontStruct*) GDK_FONT_XFONT (gf); /* Don't allocate the data until we're sure that we will succeed, or the finalize method may get fucked. */ f->data = xnew (struct gtk_font_instance_data); FONT_INSTANCE_GTK_FONT (f) = gf; f->ascent = gf->ascent; f->descent = gf->descent; f->height = gf->ascent + gf->descent; /* Now lets figure out the width of the font */ { /* following change suggested by Ted Phelps <phelps@dstc.edu.au> */ unsigned int def_char = 'n'; /*xf->default_char;*/ unsigned int byte1, byte2; once_more: byte1 = def_char >> 8; byte2 = def_char & 0xFF; if (xf->per_char) { /* Old versions of the R5 font server have garbage (>63k) as def_char. 'n' might not be a valid character. */ if (byte1 < xf->min_byte1 || byte1 > xf->max_byte1 || byte2 < xf->min_char_or_byte2 || byte2 > xf->max_char_or_byte2) f->width = 0; else f->width = xf->per_char[(byte1 - xf->min_byte1) * (xf->max_char_or_byte2 - xf->min_char_or_byte2 + 1) + (byte2 - xf->min_char_or_byte2)].width; } else f->width = xf->max_bounds.width; /* Some fonts have a default char whose width is 0. This is no good. If that's the case, first try 'n' as the default char, and if n has 0 width too (unlikely) then just use the max width. */ if (f->width == 0) { if (def_char == xf->default_char) f->width = xf->max_bounds.width; else { def_char = xf->default_char; goto once_more; } } } /* If all characters don't exist then there could potentially be 0-width characters lurking out there. Not setting this flag trips an optimization that would make them appear to have width to redisplay. This is bad. So we set it if not all characters have the same width or if not all characters are defined. */ /* #### This sucks. There is a measurable performance increase when using proportional width fonts if this flag is not set. Unfortunately so many of the fucking X fonts are not fully defined that we could almost just get rid of this damn flag and make it an assertion. */ f->proportional_p = (xf->min_bounds.width != xf->max_bounds.width || (/* x_handle_non_fully_specified_fonts */ 0 && !xf->all_chars_exist)); #if 0 f->width = gdk_char_width (gf, 'n'); f->proportional_p = (gdk_char_width (gf, '|') != gdk_char_width (gf, 'W')) ? 1 : 0; #endif return 1; } static void gtk_print_font_instance (struct Lisp_Font_Instance *f, Lisp_Object printcharfun, int UNUSED (escapeflag)) { write_fmt_string (printcharfun, " 0x%lx", (unsigned long) gdk_font_id (FONT_INSTANCE_GTK_FONT (f))); } static void gtk_finalize_font_instance (struct Lisp_Font_Instance *f) { if (f->data) { if (DEVICE_LIVE_P (XDEVICE (f->device))) { gdk_font_unref (FONT_INSTANCE_GTK_FONT (f)); } xfree (f->data, void *); f->data = 0; } } /* Forward declarations for X specific functions at the end of the file */ Lisp_Object __get_gtk_font_truename (GdkFont *gdk_font, int expandp); static Lisp_Object __gtk_font_list_internal (const char *pattern); static Lisp_Object gtk_font_instance_truename (struct Lisp_Font_Instance *f, Error_Behavior UNUSED (errb)) { if (NILP (FONT_INSTANCE_TRUENAME (f))) { FONT_INSTANCE_TRUENAME (f) = __get_gtk_font_truename (FONT_INSTANCE_GTK_FONT (f), 1); if (NILP (FONT_INSTANCE_TRUENAME (f))) { /* Ok, just this once, return the font name as the truename. (This is only used by Fequal() right now.) */ return f->name; } } return (FONT_INSTANCE_TRUENAME (f)); } static Lisp_Object gtk_font_instance_properties (struct Lisp_Font_Instance *UNUSED (f)) { Lisp_Object result = Qnil; /* #### BILL!!! */ /* There seems to be no way to get this information under Gtk */ return result; } static Lisp_Object gtk_font_list (Lisp_Object pattern, Lisp_Object UNUSED (device), Lisp_Object UNUSED (maxnumber)) { const char *patternext; TO_EXTERNAL_FORMAT (LISP_STRING, pattern, C_STRING_ALLOCA, patternext, Qbinary); return (__gtk_font_list_internal (patternext)); } /* Include the charset support, shared, for the moment, with X11. */ #define THIS_IS_GTK #include "objects-xlike-inc.c" /************************************************************************/ /* initialization */ /************************************************************************/ void syms_of_objects_gtk (void) { } void console_type_create_objects_gtk (void) { /* object methods */ CONSOLE_HAS_METHOD (gtk, initialize_color_instance); CONSOLE_HAS_METHOD (gtk, print_color_instance); CONSOLE_HAS_METHOD (gtk, finalize_color_instance); CONSOLE_HAS_METHOD (gtk, color_instance_equal); CONSOLE_HAS_METHOD (gtk, color_instance_hash); CONSOLE_HAS_METHOD (gtk, color_instance_rgb_components); CONSOLE_HAS_METHOD (gtk, valid_color_name_p); CONSOLE_HAS_METHOD (gtk, color_list); CONSOLE_HAS_METHOD (gtk, initialize_font_instance); CONSOLE_HAS_METHOD (gtk, print_font_instance); CONSOLE_HAS_METHOD (gtk, finalize_font_instance); CONSOLE_HAS_METHOD (gtk, font_instance_truename); CONSOLE_HAS_METHOD (gtk, font_instance_properties); CONSOLE_HAS_METHOD (gtk, font_list); #ifdef MULE CONSOLE_HAS_METHOD (gtk, find_charset_font); CONSOLE_HAS_METHOD (gtk, font_spec_matches_charset); #endif } void vars_of_objects_gtk (void) { #ifdef DEBUG_XEMACS DEFVAR_INT ("debug-x-objects", &debug_x_objects /* If non-zero, display debug information about X objects */ ); debug_x_objects = 0; #endif } static int valid_font_name_p (Display *dpy, char *name) { /* Maybe this should be implemented by callign XLoadFont and trapping the error. That would be a lot of work, and wasteful as hell, but might be more correct. */ int nnames = 0; char **names = 0; if (! name) return 0; names = XListFonts (dpy, name, 1, &nnames); if (names) XFreeFontNames (names); return (nnames != 0); } Lisp_Object __get_gtk_font_truename (GdkFont *gdk_font, int expandp) { Display *dpy = GDK_FONT_XDISPLAY (gdk_font); GSList *names = ((GdkFontPrivate *) gdk_font)->names; Lisp_Object font_name = Qnil; while (names) { if (names->data) { if (valid_font_name_p (dpy, (char*) names->data)) { if (!expandp) { /* They want the wildcarded version */ font_name = build_string ((char*) names->data); } else { /* Need to expand out */ int nnames = 0; char **x_font_names = 0; x_font_names = XListFonts (dpy, (char*) names->data, 1, &nnames); if (x_font_names) { font_name = build_string (x_font_names[0]); XFreeFontNames (x_font_names); } } break; } } names = names->next; } return (font_name); } static Lisp_Object __gtk_font_list_internal (const char *pattern) { char **names; int count = 0; Lisp_Object result = Qnil; names = XListFonts (GDK_DISPLAY (), pattern, MAX_FONT_COUNT, &count); while (count--) result = Fcons (build_ext_string (names [count], Qbinary), result); if (names) XFreeFontNames (names); return result; }