Mercurial > hg > xemacs-beta
view src/intl.c @ 502:7039e6323819
[xemacs-hg @ 2001-05-04 22:41:46 by ben]
----------------------- byte-comp warning fixes -----------------
New functions for cleanly eliminating byte-compiler warnings.
Their definitions require no changes at all in bytecomp.el,
meaning that any package that wants to use them and be compatible
with older versions of XEmacs need only copy the code and rename
the functions (i.e. prefix them with the package name).
Eliminate byte-compiler warnings using the new functions in
bytecomp-runtime.el.
Move coding-system-put,get,category, since they're not
Mule-specific and are used in prefer-coding-system.
font.el was incredibly ugly. Clean it up. Avoid using defsubst
for any exported functions, to avoid possible compatibility
problems if we later change the internal interface. (It happened
before, with face accessors, between 19.8 and 19.9). Fix tons
of warnings.
Clean up (new function gpm-is-supported-p eliminates duplicate
code in gpm-create/delete-device-hook) and eliminate warnings.
---------- make byte-recompile-directory work in the ---------
core `lisp' dir, even in the absence of
a Mule XEmacs (i.e. make it skip the Mule
files rather than trying to compile them).
now you should be able to do `touch *.el'
in the `lisp' dir, then
M-x byte-recompile-directory, and get no
warnings.
Avoid trying to compile Mule files in byte-recompile-directory
when we're not in a Mule XEmacs, since we're highly likely to get
syntax errors.
Add a coding-system cookie to all Mule files so that
byte-recompile-directory ignores them.
Magic cookie function moved to files.el from code-files.el (for
use by bytecomp even in a non-coding-system XEmacs), and changed
names and semantics for use by bytecomp. NOTE: IMO this is an
internal function that we can change as we like (and there is
absolutely no code anywhere else using the function).
---------------- GUI improvements: menus, help -------------------
Rearrange order of keymap declarations to be alphabetical.
Improve help on help to include all bindings, and group by
category. Add bindings for new Info commands. Remove
warnings. Use command-hyper-apropos in place of command-apropos.
Add a function to do the equivalent of command-apropos.
Evals its help-text argument so you can put expressions there.
Used now by help-for-help.
Add binding to continue text searches. Expand index searches to
work over multiple info documents. Add commands to search
text/index in User and Lispref.
Add new entry, "Uncomment Region" (parallels "Comment Out Region").
Redo Help menu; add bindings for new Info commands to search the
index or text of the User and Lispref manuals. Add command for
mark-paragraph, activate-region. Make Edit->R accelerator be
rectangle, not register (more commonly used), and put rectangle
first. Fix the Edit Init File entry to never load the .elc file.
Simplify the default-popup-menu. Add Cmds->Tabs menu.
Use kp-left not kp_left, etc.
---------------- Miscellaneous bug fixes/cleanup -------------------
byte-compiler-options: Correct doc string.
easy-menu-do-define: fix extra quote.
fill-paragraph-or-region:Rewrite to be more correct -- use
call-interactively so that we always get exactly the same
behavior as if the functions were called directly.
No need to fiddle with zmacs-region-stays, now that bogus
clearing of it (2001-04-28 src/ChangeLog) is removed.
Put dialog titles back in -- this time correctly. Fix various
other problems with leaks and such.
key-sequence-list-description:
Clean up fun to always correctly canonicalize.
Clean up Kinsoku comments, synch comment-region with FSF 20.7.
* simple.el (region-exists-p):
* simple.el (region-active-p):
Add comment about which one is correct to use in menu specs.
* sound.el (load-sound-file):
Minor code clean up.
* startup.el:
* startup.el (command-line-early):
* startup.el (initial-scratch-message):
Comment changes. Add info about sample.init.el to splash screen.
Improve initial-scratch-message and clarify purpose of Scratch
buffer. Fix byte-compile warning.
------------------------ Added features -------------------------
Add new variable to control whether etags checks all parent
directories for tag files. (On by default.)
* hash-table.el: New file, useful utility functions.
* dumped-lisp.el (preloaded-file-list): Dump hash-table.el.
------------ notable bug fix: Windows event code --------------
Get critical quit working.
------------ notable bug fix and new feature: regex code --------------
Shy groups were implemented in a horrible, half-assed way that
would cause them to screw up regex searching in most cases.
Fixed to work correctly.
Also extended back-reference syntax past 9. Only is recognized
as such if there are at least that many non-shy groups; and
optionally will warn about such uses, to catch old code that
might be using them differently. (Added variable to control
this in search.c -- `warn-about-possibly-incompatible-back-
references', on by default for the moment. Declared in lisp.h.
---------------- process/SIGIO improvements -------------------
define USE_GETADDRINFO to replace more complex conditional,
and use it. the code conditionalized on this in
unix_open_network_stream had *serious* problems handling errors.
it's now fixed, and major amounts of duplicate code between
the two versions were combined.
don't disable SIGIO and other interrupts unless
CONNECT_NEEDS_SLOWED_INTERRUPTS is defined -- don't penalize OS's
without bugs. similarly for a freebsd bug that was affecting all
OS's.
* s\ultrix.h:
define CONNECT_NEEDS_SLOWED_INTERRUPTS, since that's the OS
mentioned as having a kernel bug.
* sysdep.c (request_sigio_on_device):
* sysdep.c (unrequest_sigio_on_device):
fix SIGIO problems on Linux. add check for O_ASYNC in case it's
defined and FASYNC isn't. add comment about other ways to do
SIGIO on Linux.
* callproc.c (Fold_call_process_internal):
* process.c (Fstart_process_internal):
Deal with the possibility that `default-directory' doesn't
have terminating slash. Correct comments about vfork.
---------------- Miscellaneous bug fixes/cleanup -------------------
* callint.c (Finteractive):
Add lots of documentation -- exactly what the Lisp equivalents of
all the interactive specs are.
* console.h (struct console): change type of quit_char to Emchar.
* event-msw.c (lstream_type_create_mswindows_selectable): spacing
change.
Eliminate events-mod.h and combine into events.h.
* emacs.c:
* emacs.c (make_arg_list_1):
* emacs.c (main_1):
A couple of char->Extbyte changes, add a comment.
* glyphs-msw.c:
Correct indentation of function defns to not exceed 80 cols.
Try (sort of) to fix some code that sets the colors of the
progress gauge. (Commented out)
* keymap.c (syms_of_keymap):
use DEFSYMBOL.
* process.c (read_process_output):
No need to fiddle with zmacs_region_stays, now that bogus
clearing of it (see below) is removed.
* search.c (Freplace_match): warning fix.
author | ben |
---|---|
date | Fri, 04 May 2001 22:42:35 +0000 |
parents | 576fb035e263 |
children | 183866b06e0b |
line wrap: on
line source
/* Various functions for internationalizing XEmacs Copyright (C) 1993, 1994, 1995 Board of Trustees, University of Illinois. 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. */ /* This stuff is far, far from working. */ #include <config.h> #include "lisp.h" #include "bytecode.h" #include "device.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 I18N4 #include <X11/Xlib.h> unsigned long input_method_event_mask; Atom wc_atom; /* init_input -- Set things up for i18n level 4 input. */ void init_input (const char *res_name, const char *res_class, Display *display) { XIMStyles *styles; unsigned short i; input_method = 0; input_method_style = 0; initial_input_context = 0; input_method_event_mask = 0; input_method = XOpenIM (display, NULL, (char *) res_name, (char *) res_class); if (!input_method) { stderr_out ("WARNING: XOpenIM() failed...no input server\n"); return; } /* Query input method for supported input styles and pick one. Right now, we choose a style which supports root-window preediting. */ XGetIMValues (input_method, XNQueryInputStyle, &styles, NULL); for (i = 0; i < styles->count_styles; i++) { if (styles->supported_styles[i] == (XIMPreeditNothing|XIMStatusNothing)) { input_method_style= styles->supported_styles[i]; break; } } if (!input_method_style) { stderr_out ("WARNING: Could not find suitable input style.\n"); return; } initial_input_context = XCreateIC (input_method, XNInputStyle, input_method_style, NULL); if (!initial_input_context) { stderr_out ("WARNING: Could not create input context.\n"); return; } XGetICValues (initial_input_context, XNFilterEvents, &input_method_event_mask, NULL); /* Get a new atom for wide character client messages. */ wc_atom = XInternAtom (display, "Wide Character Event", False); } /*static widechar_string composed_input_buf = EMPTY_WIDECHAR_STRING;*/ #define XIM_Composed_Text_BUFSIZE 64 typedef struct XIM_Composed_Text { int size; wchar_t data [XIM_Composed_Text_BUFSIZE]; } XIM_Composed_Text; static XIM_Composed_Text composed_input_buf = {XIM_Composed_Text_BUFSIZE, {0}}; /*static wcidechar composed_input_buf [64] = {0};*/ Window main_window; /* Convenient way to refer to main Era window. */ /* x_get_composed_input -- Process results of input method composition. This function copies the results of the input method composition to composed_input_buf. Then for each character, a custom event of type wc_atom is sent with the character as its data. It is probably more efficient to copy the composition results to some allocated memory and send a single event pointing to that memory. That would cut down on the event processing as well as allow quick insertion into the buffer of the whole string. It might require some care, though, to avoid fragmenting memory through the allocation and freeing of many small chunks. Maybe the existing system for (single-byte) string allocation can be used, multiplying the length by sizeof (wchar_t) to get the right size. */ void x_get_composed_input (XKeyPressedEvent *x_key_event, XIC context, Display *display) { KeySym keysym; Status status; int len; int i; XClientMessageEvent new_event; retry: len = XwcLookupString (context, x_key_event, composed_input_buf.data, composed_input_buf.size, &keysym, &status); switch (status) { case XBufferOverflow: /* GROW_WC_STRING (&composed_input_buf, 32); mrb */ goto retry; case XLookupChars: break; default: abort (); } new_event.type = ClientMessage; new_event.display = x_key_event->display; new_event.window = x_key_event->window; new_event.message_type = wc_atom; new_event.format = 32; /* 32-bit wide data */ new_event.data.l[2] = new_event.data.l[3] = new_event.data.l[4] = 0L; new_event.data.l[0] = x_key_event->time; for (i = 0; i < len; i++) { new_event.data.l[1] = ((wchar_t *) composed_input_buf.data)[i]; XSendEvent (display, main_window, False, 0L, (XEvent *) &new_event); } } #endif /* I18N4 */ 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; } 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. */ if (STRINGP (string)) { #ifdef DEBUG_XEMACS stderr_out ("\nFgettext (%s) called.\n", XSTRING_DATA (string)); #endif return build_string (gettext ((char *) XSTRING_DATA (string))); } else { return string; } #else return string; #endif } #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 DEFUN ("dgettext", Fdgettext, 2, 2, 0, /* Look up STRING in the specified message domain and return its translation. This function does nothing if I18N3 was not enabled when Emacs was compiled. */ (domain, string)) { CHECK_STRING (domain); CHECK_STRING (string); #ifdef I18N3 return build_string (dgettext ((char *) XSTRING_DATA (domain), (char *) XSTRING_DATA (string))); #else return string; #endif } DEFUN ("bind-text-domain", Fbind_text_domain, 2, 2, 0, /* Associate a pathname with a message domain. Here's how the path to message files is constructed under SunOS 5.0: {pathname}/{LANG}/LC_MESSAGES/{domain}.mo This function does nothing if I18N3 was not enabled when Emacs was compiled. */ (domain, pathname)) { CHECK_STRING (domain); CHECK_STRING (pathname); #ifdef I18N3 return build_string (bindtextdomain ((char *) XSTRING_DATA (domain), (char *) XSTRING_DATA (pathname))); #else return Qnil; #endif } extern int load_in_progress; DEFUN ("set-domain", Fset_domain, 1, 1, 0, /* Specify the domain used for translating messages in this source file. The domain declaration may only appear at top-level, and should precede all function and variable definitions. The presence of this declaration in a compiled file effectively sets the domain of all functions and variables which are defined in that file. Bug: it has no effect on source (.el) files, only compiled (.elc) files. */ (domain_name)) { CHECK_STRING (domain_name); if (load_in_progress) return (domain_name); else return Qnil; } /************************************************************************/ /* initialization */ /************************************************************************/ void init_intl_very_early (void) { #if defined (I18N2) || defined (I18N3) || defined (I18N4) setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C"); #endif #ifdef I18N3 textdomain ("emacs"); #endif } void syms_of_intl (void) { /* defer-gettext is defined as a symbol because when it is used in menu specification strings, it is not evaluated as a function by menu_item_descriptor_to_widget_value(). */ defsymbol (&Qdefer_gettext, "defer-gettext"); DEFSUBR (Fignore_defer_gettext); DEFSUBR (Fgettext); DEFSUBR (Fdgettext); DEFSUBR (Fbind_text_domain); DEFSUBR (Fset_domain); } void vars_of_intl (void) { #ifdef I18N2 Fprovide (intern ("i18n2")); #endif #ifdef I18N3 Fprovide (intern ("i18n3")); #endif }