Mercurial > hg > xemacs-beta
view src/intl.c @ 4477:e34711681f30
Don't determine whether to call general device-type code at startup,
rather decide in the device-specific code itself.
lisp/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* startup.el (command-line):
Use initial-device-type, not initial-window-system; just call
#'make-device, leave the special behaviour to be done the first
time a console type is initialised to be decided on by the
respective console code.
* x-init.el (x-app-defaults-directory): Declare that it should be
bound.
(x-define-dead-key): Have the macro take a DEVICE argument.
(x-initialize-compose): Have the function take a DEVICE argument,
and use it when checking if various keysyms are available on the
keyboard.
(x-initialize-keyboard): Have the function take a DEVICE argument,
allowing device-specific keyboard initialisation.
(make-device-early-x-entry-point-called-p): New.
(make-device-late-x-entry-point-called-p): New. Rename
pre-x-win-initted, x-win-initted.
(make-device-early-x-entry-point): Rename init-pre-x-win, take the
call to make-x-device out (it should be called from the
device-creation code, not vice-versa).
(make-device-late-x-entry-point): Rename init-post-x-win, have it
take a DEVICE argument, use that DEVICE argument when working out
what device-specific things need doing. Don't use
create-console-hook in core code.
* x-win-xfree86.el (x-win-init-xfree86): Take a DEVICE argument;
use it.
* x-win-sun.el (x-win-init-sun): Take a DEVICE argument; use it.
* mule/mule-x-init.el: Remove #'init-mule-x-win, an empty
function.
* tty-init.el (make-device-early-tty-entry-point-called-p): New.
Rename pre-tty-win-initted.
(make-device-early-tty-entry-point): New.
Rename init-pre-tty-win.
(make-frame-after-init-entry-point): New.
Rename init-post-tty-win to better reflect when it's called.
* gtk-init.el (gtk-early-lisp-options-file): New.
Move this path to a documented variable.
(gtk-command-switch-alist): Wrap the docstring to fewer than 79
columns.
(make-device-early-gtk-entry-point-called-p): New.
(make-device-late-gtk-entry-point-called-p): New.
Renamed gtk-pre-win-initted, gtk-post-win-initted to these.
(make-device-early-gtk-entry-point): New.
(make-device-late-gtk-entry-point): New.
Renamed init-pre-gtk-win, init-post-gtk-win to these.
Have make-device-late-gtk-entry-point take a device argument, and use
it; have make-device-early-gtk-entry-point load the GTK-specific
startup code, instead of doing that in C.
(init-gtk-win): Deleted, functionality moved to the GTK device
creation code.
(gtk-define-dead-key): Have it take a DEVICE argument; use this
argument.
(gtk-initialize-compose): Ditto.
* coding.el (set-terminal-coding-system):
Correct the docstring; the function isn't broken.
src/ChangeLog addition:
2008-07-07 Aidan Kehoe <kehoea@parhasard.net>
Patch to make it up to the device-specific code whether
various Lisp functions should be called during device creation,
not relying on the startup code to decide this. Also, rename
initial-window-system to initial-device-type (which makes more
sense in this scheme), always set it.
* redisplay.c (Vinitial_device_type): New.
(Vinitial_window_system): Removed.
Rename initial-window-system to initial-device type, making it
a stream if we're noninteractive. Update its docstring.
* device-x.c (Qmake_device_early_x_entry_point,
Qmake_device_late_x_entry_point): New.
Rename Qinit_pre_x_win, Qinit_post_x_win.
(x_init_device): Call #'make-device-early-x-entry-point earlier,
now we rely on it to find the application class and the
app-defaults directory.
(x_finish_init_device): Call #'make-device-late-x-entry-point with
the created device.
(Vx_app_defaults_directory): Always make this available, to
simplify code in x-init.el.
* device-tty.c (Qmake_device_early_tty_entry_point): New.
Rename Qinit_pre_tty_win, rename Qinit_post_tty_win and move to
frame-tty.c as Qmake_frame_after_init_entry_point.
(tty_init_device): Call #'make-device-early-tty-entry-point before
doing anything.
* frame-tty.c (Qmake_frame_after_init_entry_point): New.
* frame-tty.c (tty_after_init_frame): Have it call the
better-named #'make-frame-after-init-entry-point function
instead of #'init-post-tty-win (since it's called after frame, not
device, creation).
* device-msw.c (Qmake_device_early_mswindows_entry_point,
Qmake_device_late_mswindows_entry_point): New.
Rename Qinit_pre_mswindows_win, Qinit_post_mswindows_win.
(mswindows_init_device): Call
#'make-device-early-mswindows-entry-point here, instead of having
its predecessor call us.
(mswindows_finish_init_device): Call
#'make-device-early-mswindows-entry-point, for symmetry with the
other device types (though it's an empty function).
* device-gtk.c (Qmake_device_early_gtk_entry_point,
Qmake_device_late_gtk_entry_point): New.
Rename Qinit_pre_gtk_win, Qinit_post_gtk_win.
(gtk_init_device): Call #'make-device-early-gtk-entry-point; don't
load ~/.xemacs/gtk-options.el ourselves, leave that to lisp.
(gtk_finish_init_device): Call #'make-device-late-gtk-entry-point
with the created device as an argument.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 09 Jul 2008 20:46:22 +0200 |
parents | 98af8a976fc3 |
children | 304aebb79cd3 |
line wrap: on
line source
/* Various functions for internationalizing XEmacs. Copyright (C) 1993, 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 2000, 2001, 2002 Ben Wing. 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. */ #include <config.h> #include "lisp.h" #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11_XLOCALE_H) #include <X11/Xlocale.h> #else #ifdef HAVE_LOCALE_H #include <locale.h> #endif #endif #ifdef HAVE_X_WINDOWS int init_x_locale (Lisp_Object locale); #endif DEFUN ("current-locale", Fcurrent_locale, 0, 0, 0, /* Return the current locale. This is of the form LANG_COUNTRY.ENCODING, or LANG_COUNTRY, or LANG, or .ENCODING. Unfortunately, the meanings of these three values are system-dependent, and there is no universal agreement. */ ()) { Extbyte *loc; loc = setlocale (LC_CTYPE, NULL); if (!loc) return Qnil; return build_ext_string (loc, Qctext); } DEFUN ("set-current-locale", Fset_current_locale, 1, 1, 0, /* Set the user's current locale. Takes a string, the value passed to setlocale(). This is of the form LANG_COUNTRY.ENCODING, or LANG_COUNTRY, or LANG, or .ENCODING. Unfortunately, the meanings of these three values are system-dependent, and there is no universal agreement. This function is meant to be called only from `set-language-environment', which keeps tables to figure out the values to use for particular systems. If the empty string is passed in, the locale is initialized from environment variables. Returns nil if the call failed (typically, an invalid locale was given). Otherwise, returns the locale, or possibly a more-specified version. */ (locale)) { Extbyte *loc; Lisp_Object str; CHECK_STRING (locale); /* RedHat 6.2 contains a locale called "Francais" with the C-cedilla encoded in ISO2022! */ LISP_STRING_TO_EXTERNAL (locale, loc, Qctext); loc = setlocale (LC_ALL, loc); if (!loc) return Qnil; loc = xstrdup (loc); setlocale (LC_NUMERIC, "C"); #ifdef HAVE_X_WINDOWS if (!init_x_locale (locale)) { /* Locale not supported under X. Put it back. */ setlocale (LC_ALL, loc); setlocale (LC_NUMERIC, "C"); free (loc); return Qnil; } #endif str = build_ext_string (loc, Qctext); xfree (loc, Extbyte *); return str; } #if 0 /* #### some old code that I really want to nuke, but I'm not completely sure what it did, so I'll leave it until we get around to implementing message-translation and decide whether the functionality that this is trying to support makes any sense. --ben */ Lisp_Object Qdefer_gettext; DEFUN ("ignore-defer-gettext", Fignore_defer_gettext, 1, 1, 0, /* If OBJECT is of the form (defer-gettext "string"), return the string. The purpose of the defer-gettext symbol is to identify strings which are translated when they are referenced instead of when they are defined. */ (object)) { if (CONSP (object) && SYMBOLP (Fcar (object)) && EQ (Fcar (object), Qdefer_gettext)) return Fcar (Fcdr (object)); else return object; } #endif /* 0 */ DEFUN ("gettext", Fgettext, 1, 1, 0, /* Look up STRING in the default message domain and return its translation. This function does nothing if I18N3 was not enabled when Emacs was compiled. */ (string)) { #ifdef I18N3 /* #### What should happen here is: 1) If the string has no `string-translatable' property or its value is nil, no translation takes place. The `string-translatable' property only gets added when a constant string is read in from a .el or .elc file, to avoid excessive translation. (The user can also explicitly add this property to a string.) 2) If the string's `string-translatable' property is a string, that string should be returned. `format' add this property. This allows translation to take place at the proper time but avoids excessive translation if the string is not destined for a translating stream. (See print_internal().) 3) If gettext() returns the same string, then Fgettext() should return the same object, minus the 'string-translatable' property. */ #endif return string; } #ifdef I18N3 /* #### add the function `force-gettext', perhaps in Lisp. This ignores the `string-translatable' property and simply calls gettext() on the string. Add the functions `set-string-translatable' and `set-stream-translating'. */ #endif /************************************************************************/ /* initialization */ /************************************************************************/ void init_intl (void) { /* This function cannot GC, because it explicitly prevents it. */ if (initialized) { int count = begin_gc_forbidden (); Lisp_Object args[2]; specbind (Qinhibit_quit, Qt); args[0] = Qreally_early_error_handler; args[1] = intern ("init-locale-at-early-startup"); Fcall_with_condition_handler (2, args); /* Should be calling this here, but problems with `data-directory' and locating the files. See comment in mule-cmds.el:`init-mule-at-startup'. args[1] = intern ("init-unicode-at-early-startup"); Fcall_with_condition_handler (2, args); */ unbind_to (count); } } void syms_of_intl (void) { DEFSUBR (Fgettext); DEFSUBR (Fset_current_locale); DEFSUBR (Fcurrent_locale); } void vars_of_intl (void) { #ifdef I18N3 Fprovide (intern ("i18n3")); #endif #ifdef MULE Fprovide (intern ("mule")); #endif /* MULE */ }