Mercurial > hg > xemacs-beta
annotate src/intl.c @ 4981:4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_lo_import):
* postgresql/postgresql.c (Fpq_lo_export):
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* ldap/eldap.c (Fldap_add):
* ldap/eldap.c (Fldap_modify):
* ldap/eldap.c (Fldap_delete):
* canna/canna_api.c (Fcanna_initialize):
* canna/canna_api.c (Fcanna_store_yomi):
* canna/canna_api.c (Fcanna_parse):
* canna/canna_api.c (Fcanna_henkan_begin):
EXTERNAL_TO_C_STRING returns its argument instead of storing it
in a parameter, and is renamed to EXTERNAL_TO_ITEXT. Similar
things happen to related macros. See entry in src/ChangeLog.
More Mule-izing of postgresql.c. Extract out common code
between `pq-connectdb' and `pq-connect-start'. Fix places
that signal an error string using a formatted string to instead
follow the standard and have a fixed reason followed by the
particular error message stored as one of the frobs.
src/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* console-msw.c (write_string_to_mswindows_debugging_output):
* console-msw.c (Fmswindows_message_box):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* console.c:
* database.c (dbm_get):
* database.c (dbm_put):
* database.c (dbm_remove):
* database.c (berkdb_get):
* database.c (berkdb_put):
* database.c (berkdb_remove):
* database.c (Fopen_database):
* device-gtk.c (gtk_init_device):
* device-msw.c (msprinter_init_device_internal):
* device-msw.c (msprinter_default_printer):
* device-msw.c (msprinter_init_device):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (Fmsprinter_select_settings):
* device-x.c (sanity_check_geometry_resource):
* device-x.c (Dynarr_add_validified_lisp_string):
* device-x.c (x_init_device):
* device-x.c (Fx_put_resource):
* device-x.c (Fx_valid_keysym_name_p):
* device-x.c (Fx_set_font_path):
* dialog-msw.c (push_lisp_string_as_unicode):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-x.c (dbox_descriptor_to_widget_value):
* editfns.c (Fformat_time_string):
* editfns.c (Fencode_time):
* editfns.c (Fset_time_zone_rule):
* emacs.c (make_argc_argv):
* emacs.c (Fdump_emacs):
* emodules.c (emodules_load):
* eval.c:
* eval.c (maybe_signal_error_1):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* fileio.c (report_error_with_errno):
* fileio.c (Fsysnetunam):
* fileio.c (Fdo_auto_save):
* font-mgr.c (extract_fcapi_string):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_filename):
* frame-gtk.c (gtk_set_frame_text_value):
* frame-gtk.c (gtk_create_widgets):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_title_from_ibyte):
* frame-msw.c (msprinter_init_frame_3):
* frame-x.c (x_set_frame_text_value):
* frame-x.c (x_set_frame_properties):
* frame-x.c (start_drag_internal_1):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (x_create_widgets):
* glyphs-eimage.c (my_jpeg_output_message):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (gif_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (xbm_instantiate_1):
* glyphs-gtk.c (gtk_xbm_instantiate):
* glyphs-gtk.c (gtk_xpm_instantiate):
* glyphs-gtk.c (gtk_xface_instantiate):
* glyphs-gtk.c (cursor_font_instantiate):
* glyphs-gtk.c (gtk_redisplay_widget):
* glyphs-gtk.c (gtk_widget_instantiate_1):
* glyphs-gtk.c (gtk_add_tab_item):
* glyphs-msw.c (mswindows_xpm_instantiate):
* glyphs-msw.c (bmp_instantiate):
* glyphs-msw.c (mswindows_resource_instantiate):
* glyphs-msw.c (xbm_instantiate_1):
* glyphs-msw.c (mswindows_xbm_instantiate):
* glyphs-msw.c (mswindows_xface_instantiate):
* glyphs-msw.c (mswindows_redisplay_widget):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs-msw.c (add_tree_item):
* glyphs-msw.c (add_tab_item):
* glyphs-msw.c (mswindows_combo_box_instantiate):
* glyphs-msw.c (mswindows_widget_query_string_geometry):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (xbm_instantiate_1):
* glyphs-x.c (x_xbm_instantiate):
* glyphs-x.c (extract_xpm_color_names):
* glyphs-x.c (x_xpm_instantiate):
* glyphs-x.c (x_xface_instantiate):
* glyphs-x.c (autodetect_instantiate):
* glyphs-x.c (safe_XLoadFont):
* glyphs-x.c (cursor_font_instantiate):
* glyphs-x.c (x_redisplay_widget):
* glyphs-x.c (Fchange_subwindow_property):
* glyphs-x.c (x_widget_instantiate):
* glyphs-x.c (x_tab_control_redisplay):
* glyphs.c (pixmap_to_lisp_data):
* gui-x.c (menu_separator_style_and_to_external):
* gui-x.c (add_accel_and_to_external):
* gui-x.c (button_item_to_widget_value):
* hpplay.c (player_error_internal):
* hpplay.c (play_sound_file):
* hpplay.c (play_sound_data):
* intl.c (Fset_current_locale):
* lisp.h:
* menubar-gtk.c (gtk_xemacs_set_accel_keys):
* menubar-msw.c (populate_menu_add_item):
* menubar-msw.c (populate_or_checksum_helper):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* nt.c (init_user_info):
* nt.c (get_long_basename):
* nt.c (nt_get_resource):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_readdir):
* nt.c (read_unc_volume):
* nt.c (mswindows_stat):
* nt.c (mswindows_getdcwd):
* nt.c (mswindows_executable_type):
* nt.c (Fmswindows_short_file_name):
* ntplay.c (nt_play_sound_file):
* objects-gtk.c:
* objects-gtk.c (gtk_valid_color_name_p):
* objects-gtk.c (gtk_initialize_font_instance):
* objects-gtk.c (gtk_font_list):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (parse_font_spec):
* objects-x.c (x_parse_nearest_color):
* objects-x.c (x_valid_color_name_p):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_list):
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_create_process):
* process-nt.c (get_internet_address):
* process-nt.c (nt_open_network_stream):
* process-unix.c:
* process-unix.c (allocate_pty):
* process-unix.c (get_internet_address):
* process-unix.c (unix_canonicalize_host_name):
* process-unix.c (unix_open_network_stream):
* realpath.c:
* select-common.h (lisp_data_to_selection_data):
* select-gtk.c (symbol_to_gtk_atom):
* select-gtk.c (atom_to_symbol):
* select-msw.c (symbol_to_ms_cf):
* select-msw.c (mswindows_register_selection_data_type):
* select-x.c (symbol_to_x_atom):
* select-x.c (x_atom_to_symbol):
* select-x.c (hack_motif_clipboard_selection):
* select-x.c (Fx_store_cutbuffer_internal):
* sound.c (Fplay_sound_file):
* sound.c (Fplay_sound):
* sound.h (sound_perror):
* sysdep.c:
* sysdep.c (qxe_allocating_getcwd):
* sysdep.c (qxe_execve):
* sysdep.c (copy_in_passwd):
* sysdep.c (qxe_getpwnam):
* sysdep.c (qxe_ctime):
* sysdll.c (dll_open):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (search_linked_libs):
* sysdll.c (dll_error):
* sysfile.h:
* sysfile.h (PATHNAME_CONVERT_OUT_TSTR):
* sysfile.h (PATHNAME_CONVERT_OUT_UTF_8):
* sysfile.h (PATHNAME_CONVERT_OUT):
* sysfile.h (LISP_PATHNAME_CONVERT_OUT):
* syswindows.h (ITEXT_TO_TSTR):
* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
* syswindows.h (TSTR_TO_LOCAL_FILE_FORMAT):
* syswindows.h (LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN):
* syswindows.h (LISP_LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR):
* text.h:
* text.h (eicpy_ext_len):
* text.h (enum new_dfc_src_type):
* text.h (EXTERNAL_TO_ITEXT):
* text.h (GET_STRERROR):
* tooltalk.c (check_status):
* tooltalk.c (Fadd_tooltalk_message_arg):
* tooltalk.c (Fadd_tooltalk_pattern_attribute):
* tooltalk.c (Fadd_tooltalk_pattern_arg):
* win32.c (tstr_to_local_file_format):
* win32.c (mswindows_lisp_error_1):
* win32.c (mswindows_report_process_error):
* win32.c (Fmswindows_shell_execute):
* win32.c (mswindows_read_link_1):
Changes involving external/internal format conversion,
mostly code cleanup and renaming.
1. Eliminate the previous macros like LISP_STRING_TO_EXTERNAL
that stored its result in a parameter. The new version of
LISP_STRING_TO_EXTERNAL returns its result through the
return value, same as the previous NEW_LISP_STRING_TO_EXTERNAL.
Use the new-style macros throughout the code.
2. Rename C_STRING_TO_EXTERNAL and friends to ITEXT_TO_EXTERNAL,
in keeping with overall naming rationalization involving
Itext and related types.
Macros involved in previous two:
EXTERNAL_TO_C_STRING -> EXTERNAL_TO_ITEXT
EXTERNAL_TO_C_STRING_MALLOC -> EXTERNAL_TO_ITEXT_MALLOC
SIZED_EXTERNAL_TO_C_STRING -> SIZED_EXTERNAL_TO_ITEXT
SIZED_EXTERNAL_TO_C_STRING_MALLOC -> SIZED_EXTERNAL_TO_ITEXT_MALLOC
C_STRING_TO_EXTERNAL -> ITEXT_TO_EXTERNAL
C_STRING_TO_EXTERNAL_MALLOC -> ITEXT_TO_EXTERNAL_MALLOC
LISP_STRING_TO_EXTERNAL
LISP_STRING_TO_EXTERNAL_MALLOC
LISP_STRING_TO_TSTR
C_STRING_TO_TSTR -> ITEXT_TO_TSTR
TSTR_TO_C_STRING -> TSTR_TO_ITEXT
The following four still return their values through parameters,
since they have more than one value to return:
C_STRING_TO_SIZED_EXTERNAL -> ITEXT_TO_SIZED_EXTERNAL
LISP_STRING_TO_SIZED_EXTERNAL
C_STRING_TO_SIZED_EXTERNAL_MALLOC -> ITEXT_TO_SIZED_EXTERNAL_MALLOC
LISP_STRING_TO_SIZED_EXTERNAL_MALLOC
Sometimes additional casts had to be inserted, since the old
macros played strange games and completely defeated the type system
of the store params.
3. Rewrite many places where direct calls to TO_EXTERNAL_FORMAT
occurred with calls to one of the convenience macros listed above,
or to make_extstring().
4. Eliminate SIZED_C_STRING macros (they were hardly used, anyway)
and use a direct call to TO_EXTERNAL_FORMAT or TO_INTERNAL_FORMAT.
4. Use LISP_PATHNAME_CONVERT_OUT in many places instead of something
like LISP_STRING_TO_EXTERNAL(..., Qfile_name).
5. Eliminate some temporary variables that are no longer necessary
now that we return a value rather than storing it into a variable.
6. Some Mule-izing in database.c.
7. Error functions:
-- A bit of code cleanup in maybe_signal_error_1.
-- Eliminate report_file_type_error; it's just an alias for
signal_error_2 with params in a different order.
-- Fix some places in the hostname-handling code that directly
inserted externally-retrieved error strings into the
supposed ASCII "reason" param instead of doing the right thing
and sticking text descriptive of what was going on in "reason"
and putting the external message in a frob.
8. Use Ascbyte instead of CIbyte in process-unix.c and maybe one
or two other places.
9. Some code cleanup in copy_in_passwd() in sysdep.c.
10. Fix a real bug due to accidental variable shadowing in
tstr_to_local_file_format() in win32.c.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Feb 2010 11:02:24 -0600 |
| parents | 304aebb79cd3 |
| children | 3c3c1d139863 |
| rev | line source |
|---|---|
| 771 | 1 /* Various functions for internationalizing XEmacs. |
| 428 | 2 Copyright (C) 1993, 1994, 1995 Board of Trustees, University of Illinois. |
| 826 | 3 Copyright (C) 2000, 2001, 2002 Ben Wing. |
| 428 | 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 #include <config.h> | |
| 25 #include "lisp.h" | |
| 26 | |
| 27 #if defined (HAVE_X_WINDOWS) && defined (HAVE_X11_XLOCALE_H) | |
| 28 #include <X11/Xlocale.h> | |
| 29 #else | |
| 30 #ifdef HAVE_LOCALE_H | |
| 31 #include <locale.h> | |
| 32 #endif | |
| 33 #endif | |
| 34 | |
| 771 | 35 #ifdef HAVE_X_WINDOWS |
| 36 int init_x_locale (Lisp_Object locale); | |
| 37 #endif | |
| 428 | 38 |
| 771 | 39 DEFUN ("current-locale", Fcurrent_locale, 0, 0, 0, /* |
| 40 Return the current locale. | |
| 41 This is of the form LANG_COUNTRY.ENCODING, or LANG_COUNTRY, or LANG, | |
| 42 or .ENCODING. Unfortunately, the meanings of these three values are | |
| 43 system-dependent, and there is no universal agreement. | |
| 44 */ | |
| 45 ()) | |
| 46 { | |
| 47 Extbyte *loc; | |
| 428 | 48 |
| 771 | 49 loc = setlocale (LC_CTYPE, NULL); |
| 50 if (!loc) | |
| 51 return Qnil; | |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3659
diff
changeset
|
52 return build_extstring (loc, Qctext); |
| 428 | 53 } |
| 54 | |
| 771 | 55 DEFUN ("set-current-locale", Fset_current_locale, 1, 1, 0, /* |
| 56 Set the user's current locale. | |
| 57 Takes a string, the value passed to setlocale(). | |
| 58 This is of the form LANG_COUNTRY.ENCODING, or LANG_COUNTRY, or LANG, | |
| 59 or .ENCODING. Unfortunately, the meanings of these three values are | |
| 60 system-dependent, and there is no universal agreement. This function | |
| 61 is meant to be called only from `set-language-environment', which | |
| 62 keeps tables to figure out the values to use for particular systems. | |
| 428 | 63 |
| 771 | 64 If the empty string is passed in, the locale is initialized from |
| 65 environment variables. | |
| 428 | 66 |
| 771 | 67 Returns nil if the call failed (typically, an invalid locale was given). |
| 68 Otherwise, returns the locale, or possibly a more-specified version. | |
| 428 | 69 */ |
| 771 | 70 (locale)) |
| 428 | 71 { |
| 771 | 72 Extbyte *loc; |
| 2946 | 73 Lisp_Object str; |
| 428 | 74 |
| 771 | 75 CHECK_STRING (locale); |
| 76 /* RedHat 6.2 contains a locale called "Francais" with the C-cedilla | |
| 77 encoded in ISO2022! */ | |
|
4981
4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
Ben Wing <ben@xemacs.org>
parents:
4953
diff
changeset
|
78 loc = LISP_STRING_TO_EXTERNAL (locale, Qctext); |
| 771 | 79 loc = setlocale (LC_ALL, loc); |
| 80 if (!loc) | |
| 81 return Qnil; | |
| 2946 | 82 loc = xstrdup (loc); |
| 83 setlocale (LC_NUMERIC, "C"); | |
| 771 | 84 #ifdef HAVE_X_WINDOWS |
| 85 if (!init_x_locale (locale)) | |
| 428 | 86 { |
| 771 | 87 /* Locale not supported under X. Put it back. */ |
| 88 setlocale (LC_ALL, loc); | |
| 89 setlocale (LC_NUMERIC, "C"); | |
| 2946 | 90 free (loc); |
| 771 | 91 return Qnil; |
| 428 | 92 } |
| 771 | 93 #endif |
| 428 | 94 |
|
4953
304aebb79cd3
function renamings to track names of char typedefs
Ben Wing <ben@xemacs.org>
parents:
3659
diff
changeset
|
95 str = build_extstring (loc, Qctext); |
| 2946 | 96 xfree (loc, Extbyte *); |
| 97 return str; | |
| 428 | 98 } |
| 771 | 99 |
| 100 #if 0 | |
| 428 | 101 |
| 771 | 102 /* #### some old code that I really want to nuke, but I'm not completely |
| 103 sure what it did, so I'll leave it until we get around to implementing | |
| 104 message-translation and decide whether the functionality that this | |
| 105 is trying to support makes any sense. --ben */ | |
| 428 | 106 |
| 107 Lisp_Object Qdefer_gettext; | |
| 108 | |
| 826 | 109 DEFUN ("ignore-defer-gettext", Fignore_defer_gettext, 1, 1, 0, /* |
| 444 | 110 If OBJECT is of the form (defer-gettext "string"), return the string. |
| 428 | 111 The purpose of the defer-gettext symbol is to identify strings which |
| 112 are translated when they are referenced instead of when they are defined. | |
| 113 */ | |
| 444 | 114 (object)) |
| 428 | 115 { |
| 444 | 116 if (CONSP (object) |
| 117 && SYMBOLP (Fcar (object)) | |
| 118 && EQ (Fcar (object), Qdefer_gettext)) | |
| 119 return Fcar (Fcdr (object)); | |
| 428 | 120 else |
| 444 | 121 return object; |
| 428 | 122 } |
| 123 | |
| 771 | 124 #endif /* 0 */ |
| 125 | |
| 428 | 126 DEFUN ("gettext", Fgettext, 1, 1, 0, /* |
| 127 Look up STRING in the default message domain and return its translation. | |
| 128 This function does nothing if I18N3 was not enabled when Emacs was compiled. | |
| 129 */ | |
| 130 (string)) | |
| 131 { | |
| 132 #ifdef I18N3 | |
| 133 /* #### What should happen here is: | |
| 134 | |
| 135 1) If the string has no `string-translatable' property or its value | |
| 136 is nil, no translation takes place. The `string-translatable' property | |
| 137 only gets added when a constant string is read in from a .el or .elc | |
| 138 file, to avoid excessive translation. (The user can also explicitly | |
| 139 add this property to a string.) | |
| 140 2) If the string's `string-translatable' property is a string, | |
| 141 that string should be returned. `format' add this property. | |
| 142 This allows translation to take place at the proper time but | |
| 143 avoids excessive translation if the string is not destined for | |
| 144 a translating stream. (See print_internal().) | |
| 145 3) If gettext() returns the same string, then Fgettext() should return | |
| 146 the same object, minus the 'string-translatable' property. */ | |
| 147 | |
| 148 #endif | |
| 149 return string; | |
| 150 } | |
| 151 | |
| 152 #ifdef I18N3 | |
| 153 | |
| 154 /* #### add the function `force-gettext', perhaps in Lisp. This | |
| 155 ignores the `string-translatable' property and simply calls gettext() | |
| 156 on the string. Add the functions `set-string-translatable' and | |
| 157 `set-stream-translating'. */ | |
| 158 | |
| 159 #endif | |
| 160 | |
| 161 | |
| 162 | |
| 163 /************************************************************************/ | |
| 164 /* initialization */ | |
| 165 /************************************************************************/ | |
| 166 | |
| 167 void | |
| 771 | 168 init_intl (void) |
| 428 | 169 { |
| 3659 | 170 /* This function cannot GC, because it explicitly prevents it. */ |
| 771 | 171 if (initialized) |
| 172 { | |
| 173 int count = begin_gc_forbidden (); | |
| 853 | 174 Lisp_Object args[2]; |
| 175 | |
| 771 | 176 specbind (Qinhibit_quit, Qt); |
| 853 | 177 args[0] = Qreally_early_error_handler; |
| 178 args[1] = intern ("init-locale-at-early-startup"); | |
| 179 Fcall_with_condition_handler (2, args); | |
| 180 | |
| 771 | 181 /* Should be calling this here, but problems with |
| 182 `data-directory' and locating the files. See comment in | |
| 183 mule-cmds.el:`init-mule-at-startup'. | |
| 428 | 184 |
| 853 | 185 args[1] = intern ("init-unicode-at-early-startup"); |
| 186 Fcall_with_condition_handler (2, args); | |
| 771 | 187 */ |
| 188 unbind_to (count); | |
| 189 } | |
| 428 | 190 } |
| 191 | |
| 192 void | |
| 193 syms_of_intl (void) | |
| 194 { | |
| 195 DEFSUBR (Fgettext); | |
| 771 | 196 DEFSUBR (Fset_current_locale); |
| 197 DEFSUBR (Fcurrent_locale); | |
| 428 | 198 } |
| 199 | |
| 200 void | |
| 201 vars_of_intl (void) | |
| 202 { | |
| 203 #ifdef I18N3 | |
| 204 Fprovide (intern ("i18n3")); | |
| 205 #endif | |
| 771 | 206 |
| 207 #ifdef MULE | |
| 208 Fprovide (intern ("mule")); | |
| 209 #endif /* MULE */ | |
| 428 | 210 } |