Mercurial > hg > xemacs-beta
annotate src/input-method-motif.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 | 04bc9d2f42c7 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* Various functions for X11R5+ input methods, using the Motif XmIm* functions. |
| 2 input-method-xlib.c provides a lower-level implementation. | |
| 3 Copyright (C) 1996 Sun Microsystems. | |
| 4 | |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 24 /* Written by Martin Buchholz. */ | |
| 25 | |
| 26 #include <config.h> | |
| 27 #include <X11/Xlocale.h> /* More portable than <locale.h> ? */ | |
| 28 #include "lisp.h" | |
| 897 | 29 #include "frame-impl.h" |
| 30 #include "console-x-impl.h" | |
| 428 | 31 #include "device.h" |
| 32 #include "frame.h" | |
| 33 #include "EmacsFrame.h" | |
| 1315 | 34 #include "xmotif.h" |
| 428 | 35 |
| 36 #ifndef XIM_MOTIF | |
| 37 #error XIM_MOTIF is not defined?? | |
| 38 #endif | |
| 39 | |
| 40 | |
| 41 /* Create X input method for device */ | |
| 42 void | |
| 2286 | 43 XIM_init_device (struct device *UNUSED (d)) |
| 428 | 44 { |
| 45 /* Nothing to do */ | |
| 46 } | |
| 47 | |
| 651 | 48 /* Callback for the deleting frame. */ |
| 49 static void | |
| 2286 | 50 XIM_delete_frame (Widget UNUSED (w), XtPointer client_data, |
| 51 XtPointer UNUSED (call_data)) | |
| 651 | 52 { |
| 53 XmImUnregister ((Widget) client_data); | |
| 54 } | |
| 55 | |
| 428 | 56 void |
| 57 XIM_init_frame (struct frame *f) | |
| 58 { | |
| 59 Widget w = FRAME_X_TEXT_WIDGET (f); | |
| 60 XPoint spot = {0,0}; | |
| 61 XmFontList fontlist; | |
| 62 XmFontListEntry fontlistEntry; | |
| 63 | |
| 64 typedef struct | |
| 65 { | |
| 66 XFontSet fontset; | |
| 67 Pixel fg; | |
| 68 Pixel bg; | |
| 69 } xim_resources_t; | |
| 70 | |
| 71 xim_resources_t xim_resources; | |
| 72 | |
| 73 /* mrb: #### Fix so that background and foreground is set from | |
| 74 default face, rather than foreground and background resources, or | |
| 75 that the user can use set-frame-parameters to set xic attributes */ | |
| 76 | |
| 1204 | 77 #define res(name, class_, representation, field, default_value) \ |
| 78 { name, class_, representation, sizeof(xim_resources.field), \ | |
| 438 | 79 XtOffsetOf(xim_resources_t, field), \ |
| 80 XtRString, (XtPointer) (default_value) } | |
| 428 | 81 |
| 82 static XtResource resources[] = | |
| 83 { | |
| 84 /* name class represent'n field default value */ | |
| 85 res(XtNfontSet, XtCFontSet, XtRFontSet, fontset, XtDefaultFontSet), | |
| 86 res(XtNximForeground, XtCForeground, XtRPixel, fg, XtDefaultForeground), | |
| 87 res(XtNximBackground, XtCBackground, XtRPixel, bg, XtDefaultBackground) | |
| 88 }; | |
| 89 | |
| 90 XtGetApplicationResources (w, &xim_resources, | |
| 91 resources, XtNumber (resources), | |
| 92 NULL, 0); | |
| 93 | |
| 94 if (! xim_resources.fontset) | |
| 95 { | |
| 96 stderr_out ("Can't get fontset resource for Input Method\n"); | |
| 97 return; | |
| 98 } | |
| 99 | |
| 100 fontlistEntry = XmFontListEntryCreate(XmFONTLIST_DEFAULT_TAG, | |
| 101 XmFONT_IS_FONTSET, | |
| 102 (XtPointer) xim_resources.fontset); | |
| 103 fontlist = XmFontListAppendEntry (NULL, fontlistEntry); | |
| 104 XmImRegister (w, 0); | |
| 105 XmImVaSetValues (w, | |
| 106 XmNfontList, fontlist, | |
| 107 XmNforeground, xim_resources.fg, | |
| 108 XmNbackground, xim_resources.bg, | |
| 109 XmNspotLocation, &spot, | |
| 110 /* XmNlineSpace, 0, */ | |
| 111 NULL); | |
| 112 | |
| 113 XmFontListEntryFree (&fontlistEntry); | |
| 651 | 114 |
| 115 XtAddCallback (w, XmNdestroyCallback, XIM_delete_frame, (XtPointer) w); | |
| 428 | 116 } |
| 117 | |
| 118 void | |
| 2286 | 119 XIM_SetGeometry (struct frame *UNUSED (f)) |
| 428 | 120 { |
| 121 } | |
| 122 | |
| 123 void | |
| 124 XIM_SetSpotLocation (struct frame *f, int x, int y) | |
| 125 { | |
| 440 | 126 /* #### FIX: Must make sure spot fits within Preedit Area */ |
| 428 | 127 XPoint *spot = &(FRAME_X_XIC_SPOT (f)); |
| 128 if (spot->x == (short) x && | |
| 129 spot->y == (short) y) | |
| 130 return; | |
| 131 | |
| 132 spot->x = (short) x; | |
| 133 spot->y = (short) y; | |
| 134 | |
| 135 XmImVaSetValues (FRAME_X_TEXT_WIDGET (f), XmNspotLocation, spot, NULL); | |
| 136 } | |
| 137 | |
| 138 void | |
| 139 XIM_focus_event (struct frame *f, int in_p) | |
| 140 { | |
| 141 if (in_p) | |
| 142 XmImVaSetFocusValues (FRAME_X_TEXT_WIDGET (f), NULL); | |
| 143 else | |
| 144 XmImUnsetFocus (FRAME_X_TEXT_WIDGET (f)); | |
| 145 } | |
| 146 | |
| 147 void | |
| 148 vars_of_input_method_motif (void) | |
| 149 { | |
| 150 Fprovide (intern ("xim")); | |
| 151 } |