Mercurial > hg > xemacs-beta
annotate src/glyphs-x.h @ 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 | abe6d1db359e |
children | 308d34e9f07d |
rev | line source |
---|---|
428 | 1 /* X-specific glyphs and related. |
2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. | |
3 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
4 Copyright (C) 1995, 1996 Ben Wing | |
5 Copyright (C) 1995 Sun Microsystems, Inc. | |
6 | |
7 This file is part of XEmacs. | |
8 | |
9 XEmacs is free software; you can redistribute it and/or modify it | |
10 under the terms of the GNU General Public License as published by the | |
11 Free Software Foundation; either version 2, or (at your option) any | |
12 later version. | |
13 | |
14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
17 for more details. | |
18 | |
19 You should have received a copy of the GNU General Public License | |
20 along with XEmacs; see the file COPYING. If not, write to | |
21 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
22 Boston, MA 02111-1307, USA. */ | |
23 | |
24 /* Synched up with: Not in FSF. */ | |
25 | |
440 | 26 #ifndef INCLUDED_glyphs_x_h_ |
27 #define INCLUDED_glyphs_x_h_ | |
428 | 28 |
29 #include "glyphs.h" | |
30 | |
31 #ifdef HAVE_X_WINDOWS | |
32 | |
33 #include "xintrinsic.h" | |
34 #include "../lwlib/lwlib.h" | |
442 | 35 #include "../lwlib/lwlib-utils.h" |
428 | 36 |
37 /**************************************************************************** | |
38 * Image-Instance Object * | |
39 ****************************************************************************/ | |
40 | |
41 struct x_image_instance_data | |
42 { | |
43 Pixmap* pixmaps; | |
44 Cursor cursor; | |
45 | |
46 /* If depth>0, then that means that other colors were allocated when | |
47 this pixmap was loaded. These are they; we need to free them when | |
48 finalizing the image instance. */ | |
49 Colormap colormap; | |
50 unsigned long *pixels; | |
51 int npixels; | |
52 | |
53 /* Should we hang on to the extra info from the XpmAttributes, like | |
54 the textual color table and the comments? Is that useful? */ | |
55 }; | |
56 | |
57 #define X_IMAGE_INSTANCE_DATA(i) ((struct x_image_instance_data *) (i)->data) | |
58 | |
59 #define IMAGE_INSTANCE_X_PIXMAP(i) (X_IMAGE_INSTANCE_DATA (i)->pixmaps[0]) | |
60 #define IMAGE_INSTANCE_X_PIXMAP_SLICE(i,slice) \ | |
61 (X_IMAGE_INSTANCE_DATA (i)->pixmaps[slice]) | |
62 #define IMAGE_INSTANCE_X_PIXMAP_SLICES(i) \ | |
63 (X_IMAGE_INSTANCE_DATA (i)->pixmaps) | |
64 #define IMAGE_INSTANCE_X_MASK(i) \ | |
65 (Pixmap)(IMAGE_INSTANCE_PIXMAP_MASK (i)) | |
66 #define IMAGE_INSTANCE_X_CURSOR(i) (X_IMAGE_INSTANCE_DATA (i)->cursor) | |
67 #define IMAGE_INSTANCE_X_COLORMAP(i) (X_IMAGE_INSTANCE_DATA (i)->colormap) | |
68 #define IMAGE_INSTANCE_X_PIXELS(i) (X_IMAGE_INSTANCE_DATA (i)->pixels) | |
69 #define IMAGE_INSTANCE_X_NPIXELS(i) (X_IMAGE_INSTANCE_DATA (i)->npixels) | |
70 | |
71 #define XIMAGE_INSTANCE_X_PIXMAP(i) \ | |
72 IMAGE_INSTANCE_X_PIXMAP (XIMAGE_INSTANCE (i)) | |
73 #define XIMAGE_INSTANCE_X_PIXMAP_SLICES(i) \ | |
74 IMAGE_INSTANCE_X_PIXMAP_SLICES (XIMAGE_INSTANCE (i)) | |
75 #define XIMAGE_INSTANCE_X_PIXMAP_SLICE(i) \ | |
76 IMAGE_INSTANCE_X_PIXMAP_SLICE (XIMAGE_INSTANCE (i)) | |
77 #define XIMAGE_INSTANCE_X_MASK(i) \ | |
78 IMAGE_INSTANCE_X_MASK (XIMAGE_INSTANCE (i)) | |
79 #define XIMAGE_INSTANCE_X_CURSOR(i) \ | |
80 IMAGE_INSTANCE_X_CURSOR (XIMAGE_INSTANCE (i)) | |
81 #define XIMAGE_INSTANCE_X_PIXELS(i) \ | |
82 IMAGE_INSTANCE_X_PIXELS (XIMAGE_INSTANCE (i)) | |
83 #define XIMAGE_INSTANCE_X_NPIXELS(i) \ | |
84 IMAGE_INSTANCE_X_NPIXELS (XIMAGE_INSTANCE (i)) | |
85 | |
86 /**************************************************************************** | |
87 * Subwindow Object * | |
88 ****************************************************************************/ | |
89 | |
90 struct x_subwindow_data | |
91 { | |
92 union | |
93 { | |
94 struct | |
95 { | |
96 Display *display; | |
97 Window parent_window; | |
98 Window clip_window; | |
99 } sub; | |
442 | 100 struct |
428 | 101 { |
102 Widget clip_window; | |
103 Position x_offset; | |
104 Position y_offset; | |
105 LWLIB_ID id; | |
106 } wid; | |
107 } data; | |
108 }; | |
109 | |
110 #define X_SUBWINDOW_INSTANCE_DATA(i) ((struct x_subwindow_data *) (i)->data) | |
111 | |
112 #define IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY(i) \ | |
113 (X_SUBWINDOW_INSTANCE_DATA (i)->data.sub.display) | |
114 #define IMAGE_INSTANCE_X_SUBWINDOW_PARENT(i) \ | |
115 (X_SUBWINDOW_INSTANCE_DATA (i)->data.sub.parent_window) | |
116 #define IMAGE_INSTANCE_X_CLIPWINDOW(i) \ | |
117 (X_SUBWINDOW_INSTANCE_DATA (i)->data.sub.clip_window) | |
118 #define IMAGE_INSTANCE_X_WIDGET_XOFFSET(i) \ | |
119 (X_SUBWINDOW_INSTANCE_DATA (i)->data.wid.x_offset) | |
120 #define IMAGE_INSTANCE_X_WIDGET_YOFFSET(i) \ | |
121 (X_SUBWINDOW_INSTANCE_DATA (i)->data.wid.y_offset) | |
122 #define IMAGE_INSTANCE_X_WIDGET_LWID(i) \ | |
123 (X_SUBWINDOW_INSTANCE_DATA (i)->data.wid.id) | |
124 #define IMAGE_INSTANCE_X_CLIPWIDGET(i) \ | |
125 (X_SUBWINDOW_INSTANCE_DATA (i)->data.wid.clip_window) | |
442 | 126 #define IMAGE_INSTANCE_X_SUBWINDOW_ID(i) \ |
127 (* (Window *) & IMAGE_INSTANCE_SUBWINDOW_ID (i)) | |
128 #define IMAGE_INSTANCE_X_WIDGET_ID(i) \ | |
129 (* (Widget *) & IMAGE_INSTANCE_SUBWINDOW_ID (i)) | |
130 | |
428 | 131 #define XIMAGE_INSTANCE_X_SUBWINDOW_PARENT(i) \ |
132 IMAGE_INSTANCE_X_SUBWINDOW_PARENT (XIMAGE_INSTANCE (i)) | |
133 #define XIMAGE_INSTANCE_X_SUBWINDOW_DISPLAY(i) \ | |
134 IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (XIMAGE_INSTANCE (i)) | |
135 #define XIMAGE_INSTANCE_X_WIDGET_XOFFSET(i) \ | |
136 IMAGE_INSTANCE_X_WIDGET_XOFFSET (XIMAGE_INSTANCE (i)) | |
137 #define XIMAGE_INSTANCE_X_WIDGET_YOFFSET(i) \ | |
138 IMAGE_INSTANCE_X_WIDGET_YOFFSET (XIMAGE_INSTANCE (i)) | |
139 #define XIMAGE_INSTANCE_X_WIDGET_LWID(i) \ | |
140 IMAGE_INSTANCE_X_WIDGET_LWID (XIMAGE_INSTANCE (i)) | |
141 #define XIMAGE_INSTANCE_X_CLIPWIDGET(i) \ | |
142 IMAGE_INSTANCE_X_CLIPWIDGET (XIMAGE_INSTANCE (i)) | |
143 #define XIMAGE_INSTANCE_X_CLIPWINDOW(i) \ | |
144 IMAGE_INSTANCE_X_CLIPWINDOW (XIMAGE_INSTANCE (i)) | |
442 | 145 #define XIMAGE_INSTANCE_X_WIDGET_ID(i) \ |
146 IMAGE_INSTANCE_X_WIDGET_ID (XIMAGE_INSTANCE (i)) | |
147 | |
148 #define DOMAIN_X_WIDGET(domain) \ | |
149 ((IMAGE_INSTANCEP (domain) && \ | |
150 X_SUBWINDOW_INSTANCE_DATA (XIMAGE_INSTANCE (domain))) ? \ | |
151 XIMAGE_INSTANCE_X_WIDGET_ID (domain) : \ | |
152 FRAME_X_CONTAINER_WIDGET (f) (DOMAIN_XFRAME (domain))) | |
428 | 153 |
154 #endif /* HAVE_X_WINDOWS */ | |
440 | 155 #endif /* INCLUDED_glyphs_x_h_ */ |