Mercurial > hg > xemacs-beta
annotate src/intl-x.c @ 5529:3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
src/ChangeLog addition:
2011-06-25 Aidan Kehoe <kehoea@parhasard.net>
* console.c:
* console.c (allocate_console):
* console.c (vars_of_console):
* console.c (complex_vars_of_console):
* lisp.h:
Add a new keymap variable, function-key-map-parent; use it as the
parent of each console-specific function-key-map. This is
appropriate for things like x-compose processing.
lisp/ChangeLog addition:
2011-06-25 Aidan Kehoe <kehoea@parhasard.net>
* gtk-init.el:
* gtk-init.el (make-device-late-gtk-entry-point):
* gtk-init.el (gtk-initialize-compose): Removed.
* keymap.el:
* keymap.el (function-key-map-parent):
* x-init.el (x-initialize-compose): Removed.
* x-init.el (make-device-late-x-entry-point):
Make the bindings for dead-acute and friends in
function-key-map-parent, rather than function-key-map; do this in
keymap.el rather than in window-system-specific code, since the
compose processing is generally useful and not X11-specific.
It's probably reasonable to rename x-compose.el to compose.el at
this point, but I haven't done that.
man/ChangeLog addition:
2011-06-25 Aidan Kehoe <kehoea@parhasard.net>
* lispref/os.texi (Translating Input):
Document the just-added function-key-map-parent.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 25 Jun 2011 14:00:48 +0100 |
| parents | 2aa9cd456ae7 |
| children |
| rev | line source |
|---|---|
| 771 | 1 /* X-specific functions for internationalizing XEmacs. |
| 2 Copyright (C) 1996 Sun Microsystems. | |
| 3 Copyright (C) 2000, 2001 Ben Wing. | |
| 4 | |
|
5405
2aa9cd456ae7
Move src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
2333
diff
changeset
|
5 This file is part of XEmacs. |
| 771 | 6 |
|
5405
2aa9cd456ae7
Move src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
2333
diff
changeset
|
7 XEmacs is free software: you can redistribute it and/or modify it |
| 771 | 8 under the terms of the GNU General Public License as published by the |
|
5405
2aa9cd456ae7
Move src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
2333
diff
changeset
|
9 Free Software Foundation, either version 3 of the License, or (at your |
|
2aa9cd456ae7
Move src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
2333
diff
changeset
|
10 option) any later version. |
| 771 | 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 | |
|
5405
2aa9cd456ae7
Move src/ to GPLv3.
Mike Sperber <sperber@deinprogramm.de>
parents:
2333
diff
changeset
|
18 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 771 | 19 |
| 20 #include <config.h> | |
| 21 #include "lisp.h" | |
| 22 | |
| 23 #include "console-x.h" | |
| 24 #include <X11/Xlocale.h> /* More portable than <locale.h> ? */ | |
| 25 | |
| 26 Lisp_Object Qxintl; | |
| 27 | |
| 28 int init_x_locale (Lisp_Object locale); | |
| 29 | |
| 30 int | |
| 2333 | 31 init_x_locale (Lisp_Object USED_IF_MULE (locale)) |
| 771 | 32 { |
| 33 #ifdef MULE | |
| 34 /* dverna - Nov. 98: #### DON'T DO THIS !!! The default XtLanguageProc | |
| 35 routine calls setlocale(LC_ALL, lang) which fucks up our lower-level | |
| 36 locale management, and especially the value of LC_NUMERIC. Anyway, since | |
| 37 at this point, we don't know yet whether we're gonna need an X11 frame, | |
| 38 we should really do it manually and not use Xlib's dumb default routine */ | |
| 39 /*XtSetLanguageProc (NULL, (XtLanguageProc) NULL, NULL);*/ | |
| 40 | |
| 41 if (!XSupportsLocale ()) | |
| 42 { | |
| 43 warn_when_safe (Qxintl, Qwarning, | |
| 44 "System supports locale `%s' but X Windows does not", | |
| 45 XSTRING_DATA (locale)); | |
| 46 return 0; | |
| 47 } | |
| 48 | |
| 49 if (XSetLocaleModifiers ("") == NULL) | |
| 50 { | |
| 51 warn_when_safe (Qxintl, Qwarning, | |
| 52 "XSetLocaleModifiers(\"\") failed. Check the value\n" | |
| 53 "of the XMODIFIERS environment variable."); | |
| 54 return 0; | |
| 55 } | |
| 56 #endif /* MULE */ | |
| 57 | |
| 58 return 1; | |
| 59 } | |
| 60 | |
| 61 void | |
| 62 syms_of_intl_x (void) | |
| 63 { | |
| 64 DEFSYMBOL (Qxintl); | |
| 65 } |