Mercurial > hg > xemacs-beta
annotate src/console-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 | 726060ee587c |
| children | b3ce27ca7647 19a72041c5ed |
| rev | line source |
|---|---|
| 428 | 1 /* Define X specific console, device, and frame object for XEmacs. |
| 2 Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. | |
| 1318 | 4 Copyright (C) 1996, 2002, 2003 Ben Wing. |
| 428 | 5 |
| 6 This file is part of XEmacs. | |
| 7 | |
| 8 XEmacs is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 10 Free Software Foundation; either version 2, or (at your option) any | |
| 11 later version. | |
| 12 | |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with XEmacs; see the file COPYING. If not, write to | |
| 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 21 Boston, MA 02111-1307, USA. */ | |
| 22 | |
| 23 /* Synched up with: Not in FSF. */ | |
| 24 | |
| 25 | |
| 26 /* Authorship: | |
| 27 | |
| 28 Ultimately based on FSF, then later on JWZ work for Lemacs. | |
| 29 Rewritten over time by Ben Wing and Chuck Thompson (original | |
| 30 multi-device work by Chuck Thompson). | |
| 31 */ | |
| 32 | |
| 440 | 33 #ifndef INCLUDED_console_x_h_ |
| 34 #define INCLUDED_console_x_h_ | |
| 428 | 35 |
| 36 #ifdef HAVE_X_WINDOWS | |
| 37 | |
| 38 #include "console.h" | |
| 2484 | 39 /* must come before Xutil.h, which is included indirectly from xintrinsic.h, |
| 40 to avoid breakage in keysym-parsing macros from X11R6, at least X.org as | |
| 41 of 2005-01-17, and probably XFree86 too from reports on c.e.x */ | |
| 42 #include <X11/keysym.h> | |
| 428 | 43 #include "xintrinsic.h" |
| 1346 | 44 #include "../lwlib/lwlib.h" |
| 428 | 45 |
| 46 #include <X11/cursorfont.h> | |
| 47 #include <X11/Xatom.h> | |
| 48 #include <X11/StringDefs.h> | |
| 49 | |
| 50 #ifdef HAVE_XPM | |
| 51 #include <X11/xpm.h> | |
| 52 #endif | |
| 53 | |
| 3094 | 54 #ifdef USE_XFT |
| 55 /* shut up GCC */ | |
| 56 #define face_index face_index_arg | |
| 57 #define glyph_index glyph_index_arg | |
| 58 #include <X11/Xft/Xft.h> | |
| 59 #undef glyph_index | |
| 60 #undef face_index | |
| 61 #endif | |
| 62 | |
| 428 | 63 /* R5 defines the XPointer type, but R4 doesn't. |
| 64 R4 also doesn't define a version number, but R5 does. */ | |
| 65 #if (XlibSpecificationRelease < 5) | |
| 66 # define XPointer char * | |
| 67 #endif | |
| 68 | |
| 1204 | 69 #ifdef __cplusplus |
| 70 #define X_CLASSFIELD c_class | |
| 71 #else | |
| 72 #define X_CLASSFIELD class | |
| 73 #endif | |
| 74 | |
| 428 | 75 /* Variables associated with the X display frame this emacs is using. */ |
| 76 extern XtAppContext Xt_app_con; | |
| 77 | |
| 78 extern Lisp_Object Vx_gc_pointer_shape; | |
| 79 extern Lisp_Object Vx_scrollbar_pointer_shape; | |
| 80 extern Lisp_Object Qx_error; | |
| 81 | |
| 82 /* Number of pixels below each line. */ | |
| 83 extern int x_interline_space; /* #### implement me */ | |
| 84 | |
| 458 | 85 extern Fixnum x_selection_timeout; |
| 428 | 86 |
| 87 struct frame *x_any_window_to_frame (struct device *d, Window); | |
| 88 struct frame *x_any_widget_or_parent_to_frame (struct device *d, | |
| 89 Widget widget); | |
| 90 struct frame *decode_x_frame (Lisp_Object); | |
| 91 struct frame *x_window_to_frame (struct device *d, Window); | |
| 92 struct device *get_device_from_display (Display *dpy); | |
| 93 struct device *decode_x_device (Lisp_Object); | |
| 94 | |
| 95 void x_handle_selection_notify (XSelectionEvent *event); | |
| 96 void x_handle_selection_request (XSelectionRequestEvent *event); | |
| 97 void x_handle_selection_clear (XSelectionClearEvent *event); | |
| 98 void x_handle_property_notify (XPropertyEvent *event); | |
| 99 | |
| 440 | 100 void Xatoms_of_select_x (struct device *d); |
| 428 | 101 void Xatoms_of_objects_x (struct device *d); |
| 102 | |
| 103 void x_wm_set_shell_iconic_p (Widget shell, int iconic_p); | |
| 104 void x_wm_set_cell_size (Widget wmshell, int cw, int ch); | |
| 105 void x_wm_set_variable_size (Widget wmshell, int width, int height); | |
| 106 | |
| 442 | 107 const char *x_event_name (int event_type); |
| 1204 | 108 int check_if_pending_expose_event (struct device *d); |
| 428 | 109 int x_error_handler (Display *disp, XErrorEvent *event); |
| 110 void expect_x_error (Display *dpy); | |
| 111 int x_error_occurred_p (Display *dpy); | |
| 112 int signal_if_x_error (Display *dpy, int resumable_p); | |
| 113 int x_IO_error_handler (Display *disp); | |
| 114 | |
| 1346 | 115 widget_value *xmalloc_widget_value (void); |
| 116 | |
| 117 LWLIB_ID new_lwlib_id (void); | |
| 118 | |
| 119 void gcpro_popup_callbacks (LWLIB_ID id); | |
| 120 void ungcpro_popup_callbacks (LWLIB_ID id); | |
| 121 int popup_handled_p (LWLIB_ID id); | |
| 122 void free_popup_widget_value_tree (widget_value *wv); | |
| 123 void popup_selection_callback (Widget widget, LWLIB_ID ignored_id, | |
| 124 XtPointer client_data); | |
| 125 Extbyte *add_accel_and_to_external (Lisp_Object string); | |
| 126 int button_item_to_widget_value (Lisp_Object gui_object_instance, | |
| 127 Lisp_Object gui_item, widget_value *wv, | |
| 128 int allow_text_field_p, int no_keys_p, | |
| 129 int menu_entry_p, int accel_p); | |
| 130 widget_value * gui_items_to_widget_values (Lisp_Object gui_object_instance, | |
| 131 Lisp_Object items, int accel_p); | |
| 132 Extbyte *menu_separator_style_and_to_external (const Ibyte *s); | |
| 133 Lisp_Object widget_value_unwind (Lisp_Object closure); | |
| 134 | |
| 428 | 135 void x_output_string (struct window *w, struct display_line *dl, |
| 867 | 136 Ichar_dynarr *buf, int xpos, int xoffset, |
| 428 | 137 int start_pixpos, int width, face_index findex, |
| 138 int cursor, int cursor_start, int cursor_width, | |
| 139 int cursor_height); | |
| 440 | 140 void x_output_x_pixmap (struct frame *f, Lisp_Image_Instance *p, |
| 428 | 141 int x, int y, int xoffset, int yoffset, |
| 142 int width, int height, | |
| 143 unsigned long fg, unsigned long bg, | |
| 144 GC override_gc); | |
| 145 void x_output_shadows (struct frame *f, int x, int y, int width, | |
| 146 int height, GC top_shadow_gc, | |
| 147 GC bottom_shadow_gc, GC background_gc, | |
| 148 int shadow_thickness, int edges); | |
| 149 void x_generate_shadow_pixels (struct frame *f, | |
| 150 unsigned long *top_shadow, | |
| 151 unsigned long *bottom_shadow, | |
| 152 unsigned long background, | |
| 153 unsigned long core_background); | |
| 154 | |
| 155 int x_initialize_frame_menubar (struct frame *f); | |
| 156 void x_init_modifier_mapping (struct device *d); | |
| 157 | |
| 593 | 158 int x_frame_window_state (struct frame *f); |
| 159 | |
| 428 | 160 #define X_ERROR_OCCURRED(dpy, body) \ |
| 161 (expect_x_error (dpy), body, x_error_occurred_p (dpy)) | |
| 162 | |
| 163 #define HANDLING_X_ERROR(dpy, body) \ | |
| 164 (expect_x_error (dpy), body, signal_if_x_error (dpy, 0)) | |
| 165 | |
| 166 void Initialize_Locale (void); | |
| 167 | |
| 168 #ifdef HAVE_XIM | |
| 169 | |
| 170 /* X Input Method `methods' */ | |
| 171 void XIM_init_device (struct device *d); | |
| 172 void XIM_init_frame (struct frame *f); | |
| 173 void XIM_SetSpotLocation (struct frame *f, int x, int y); | |
| 174 void XIM_SetGeometry (struct frame *f); | |
| 175 void XIM_focus_event (struct frame *f, int in_p); | |
| 176 | |
| 177 #ifdef XIM_XLIB | |
| 178 /* XtTypeConverter */ | |
| 179 Boolean EmacsXtCvtStringToXIMStyles ( | |
| 180 Display *dpy, | |
| 181 XrmValuePtr args, | |
| 182 Cardinal *num_args, | |
| 183 XrmValuePtr from, | |
| 184 XrmValuePtr to_in_out, | |
| 185 XtPointer *converter_data); | |
| 186 | |
| 187 /* XtDestructor */ | |
| 188 void EmacsFreeXIMStyles ( | |
| 189 XtAppContext app, | |
| 190 XrmValuePtr to, | |
| 191 XtPointer converter_data, | |
| 192 XrmValuePtr args, | |
| 193 Cardinal *num_args); | |
| 194 | |
| 195 #ifdef DEBUG_XEMACS | |
| 196 void describe_Window (Window win); | |
| 197 void describe_XFontSet (XFontSet font_set); | |
| 198 void describe_XIM (XIM im); | |
| 199 void describe_XIMStyle (XIMStyle style); | |
| 200 void describe_XIMStyles (XIMStyles *styles); | |
| 201 void describe_XIC (XIC ic); | |
| 202 void describe_event_mask (unsigned long mask); | |
|
4528
726060ee587c
First draft of g++ 4.3 warning removal patch. Builds. *Needs ChangeLogs.*
Stephen J. Turnbull <stephen@xemacs.org>
parents:
4522
diff
changeset
|
203 void describe_XRectangle (const char *name, XRectangle *rect); |
| 428 | 204 void describe_Status (Status status); |
| 205 #endif /* DEBUG_XEMACS */ | |
| 206 #endif /* XIM_XLIB */ | |
| 207 #endif /* HAVE_XIM */ | |
| 208 | |
| 771 | 209 extern Lisp_Object Qxintl; |
| 210 | |
| 428 | 211 extern int in_resource_setting; |
| 212 extern int in_specifier_change_function; | |
| 213 | |
| 214 extern Lisp_Object Vx_initial_argv_list; /* #### ugh! */ | |
| 215 | |
| 216 #endif /* HAVE_X_WINDOWS */ | |
| 440 | 217 |
| 218 #endif /* INCLUDED_console_x_h_ */ |