Mercurial > hg > xemacs-beta
annotate etc/XKeysymDB @ 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 | 376386a54a3c |
| children |
| rev | line source |
|---|---|
| 0 | 1 ! $XConsortium: XKeysymDB,v 1.13 94/04/13 18:07:58 gildea Exp $ |
| 2 ! Copyright 1993 Massachusetts Institute of Technology | |
| 3 ! | |
| 4 ! Permission to use, copy, modify, distribute, and sell this software and | |
| 5 ! its documentation for any purpose is hereby granted without fee, provided | |
| 6 ! that the above copyright notice appear in all copies and that both that | |
| 7 ! copyright notice and this permission notice appear in supporting | |
| 8 ! documentation, and that the name of M.I.T. not be used in advertising or | |
| 9 ! publicity pertaining to distribution of the software without specific, | |
| 10 ! written prior permission. M.I.T. makes no representations about the | |
| 11 ! suitability of this software for any purpose. It is provided "as is" | |
| 12 ! without express or implied warranty. | |
| 13 | |
| 14 hpmute_acute :100000A8 | |
| 15 hpmute_grave :100000A9 | |
| 16 hpmute_asciicircum :100000AA | |
| 17 hpmute_diaeresis :100000AB | |
| 18 hpmute_asciitilde :100000AC | |
| 19 hplira :100000AF | |
| 20 hpguilder :100000BE | |
| 21 hpYdiaeresis :100000EE | |
| 22 hpIO :100000EE | |
| 23 hplongminus :100000F6 | |
| 24 hpblock :100000FC | |
| 25 apLineDel :1000FF00 | |
| 26 apCharDel :1000FF01 | |
| 27 apCopy :1000FF02 | |
| 28 apCut :1000FF03 | |
| 29 apPaste :1000FF04 | |
| 30 apMove :1000FF05 | |
| 31 apGrow :1000FF06 | |
| 32 apCmd :1000FF07 | |
| 33 apShell :1000FF08 | |
| 34 apLeftBar :1000FF09 | |
| 35 apRightBar :1000FF0A | |
| 36 apLeftBox :1000FF0B | |
| 37 apRightBox :1000FF0C | |
| 38 apUpBox :1000FF0D | |
| 39 apDownBox :1000FF0E | |
| 40 apPop :1000FF0F | |
| 41 apRead :1000FF10 | |
| 42 apEdit :1000FF11 | |
| 43 apSave :1000FF12 | |
| 44 apExit :1000FF13 | |
| 45 apRepeat :1000FF14 | |
| 46 hpModelock1 :1000FF48 | |
| 47 hpModelock2 :1000FF49 | |
| 48 hpReset :1000FF6C | |
| 49 hpSystem :1000FF6D | |
| 50 hpUser :1000FF6E | |
| 51 hpClearLine :1000FF6F | |
| 52 hpInsertLine :1000FF70 | |
| 53 hpDeleteLine :1000FF71 | |
| 54 hpInsertChar :1000FF72 | |
| 55 hpDeleteChar :1000FF73 | |
| 56 hpBackTab :1000FF74 | |
| 57 hpKP_BackTab :1000FF75 | |
| 58 apKP_parenleft :1000FFA8 | |
| 59 apKP_parenright :1000FFA9 | |
| 60 | |
| 61 I2ND_FUNC_L :10004001 | |
| 62 I2ND_FUNC_R :10004002 | |
| 63 IREMOVE :10004003 | |
| 64 IREPEAT :10004004 | |
| 65 IA1 :10004101 | |
| 66 IA2 :10004102 | |
| 67 IA3 :10004103 | |
| 68 IA4 :10004104 | |
| 69 IA5 :10004105 | |
| 70 IA6 :10004106 | |
| 71 IA7 :10004107 | |
| 72 IA8 :10004108 | |
| 73 IA9 :10004109 | |
| 74 IA10 :1000410A | |
| 75 IA11 :1000410B | |
| 76 IA12 :1000410C | |
| 77 IA13 :1000410D | |
| 78 IA14 :1000410E | |
| 79 IA15 :1000410F | |
| 80 IB1 :10004201 | |
| 81 IB2 :10004202 | |
| 82 IB3 :10004203 | |
| 83 IB4 :10004204 | |
| 84 IB5 :10004205 | |
| 85 IB6 :10004206 | |
| 86 IB7 :10004207 | |
| 87 IB8 :10004208 | |
| 88 IB9 :10004209 | |
| 89 IB10 :1000420A | |
| 90 IB11 :1000420B | |
| 91 IB12 :1000420C | |
| 92 IB13 :1000420D | |
| 93 IB14 :1000420E | |
| 94 IB15 :1000420F | |
| 95 IB16 :10004210 | |
| 96 | |
| 97 DRemove :1000FF00 | |
| 98 Dring_accent :1000FEB0 | |
| 99 Dcircumflex_accent :1000FE5E | |
| 100 Dcedilla_accent :1000FE2C | |
| 101 Dacute_accent :1000FE27 | |
| 102 Dgrave_accent :1000FE60 | |
| 103 Dtilde :1000FE7E | |
| 104 Ddiaeresis :1000FE22 | |
| 105 | |
| 106 osfCopy :1004FF02 | |
| 107 osfCut :1004FF03 | |
| 108 osfPaste :1004FF04 | |
| 109 osfBackTab :1004FF07 | |
| 110 osfBackSpace :1004FF08 | |
| 111 osfClear :1004FF0B | |
| 112 osfEscape :1004FF1B | |
| 113 osfAddMode :1004FF31 | |
| 114 osfPrimaryPaste :1004FF32 | |
| 115 osfQuickPaste :1004FF33 | |
| 116 osfPageLeft :1004FF40 | |
| 117 osfPageUp :1004FF41 | |
| 118 osfPageDown :1004FF42 | |
| 119 osfPageRight :1004FF43 | |
| 120 osfActivate :1004FF44 | |
| 121 osfMenuBar :1004FF45 | |
| 122 osfLeft :1004FF51 | |
| 123 osfUp :1004FF52 | |
| 124 osfRight :1004FF53 | |
| 125 osfDown :1004FF54 | |
| 126 osfPrior :1004FF55 | |
| 127 osfNext :1004FF56 | |
| 128 osfEndLine :1004FF57 | |
| 129 osfBeginLine :1004FF58 | |
| 130 osfEndData :1004FF59 | |
| 131 osfBeginData :1004FF5A | |
| 132 osfPrevMenu :1004FF5B | |
| 133 osfNextMenu :1004FF5C | |
| 134 osfPrevField :1004FF5D | |
| 135 osfNextField :1004FF5E | |
| 136 osfSelect :1004FF60 | |
| 137 osfInsert :1004FF63 | |
| 138 osfUndo :1004FF65 | |
| 139 osfMenu :1004FF67 | |
| 140 osfCancel :1004FF69 | |
| 141 osfHelp :1004FF6A | |
| 142 osfSelectAll :1004FF71 | |
| 143 osfDeselectAll :1004FF72 | |
| 144 osfReselect :1004FF73 | |
| 145 osfExtend :1004FF74 | |
| 146 osfRestore :1004FF78 | |
| 147 osfSwitchDirection :1004FF7E | |
| 148 osfPriorMinor :1004FFF5 | |
| 149 osfNextMinor :1004FFF6 | |
| 150 osfRightLine :1004FFF7 | |
| 151 osfLeftLine :1004FFF8 | |
| 152 osfDelete :1004FFFF | |
| 153 | |
| 154 SunFA_Grave :1005FF00 | |
| 155 SunFA_Circum :1005FF01 | |
| 156 SunFA_Tilde :1005FF02 | |
| 157 SunFA_Acute :1005FF03 | |
| 158 SunFA_Diaeresis :1005FF04 | |
| 159 SunFA_Cedilla :1005FF05 | |
| 160 SunF36 :1005FF10 | |
| 161 SunF37 :1005FF11 | |
| 162 SunSys_Req :1005FF60 | |
| 163 SunProps :1005FF70 | |
| 164 SunFront :1005FF71 | |
| 165 SunCopy :1005FF72 | |
| 166 SunOpen :1005FF73 | |
| 167 SunPaste :1005FF74 | |
| 168 SunCut :1005FF75 | |
| 169 SunPowerSwitch :1005FF76 | |
| 170 SunAudioLowerVolume :1005FF77 | |
| 171 SunAudioMute :1005FF78 | |
| 172 SunAudioRaiseVolume :1005FF79 | |
| 173 SunVideoDegauss :1005FF7A | |
| 174 SunVideoLowerBrightness :1005FF7B | |
| 175 SunVideoRaiseBrightness :1005FF7C | |
| 176 SunPowerSwitchShift :1005FF7D | |
| 177 | |
| 178 SunCompose :FF20 | |
| 179 SunPageUp :FF55 | |
| 180 SunPageDown :FF56 | |
| 181 SunPrint_Screen :FF61 | |
| 182 SunUndo :FF65 | |
| 183 SunAgain :FF66 | |
| 184 SunFind :FF68 | |
| 185 SunStop :FF69 | |
| 186 SunAltGraph :FF7E | |
| 187 | |
| 188 WYSetup :1006FF00 | |
| 189 | |
| 190 ncdSetup :1006FF00 | |
| 191 | |
| 192 XeroxPointerButton1 :10070001 | |
| 193 XeroxPointerButton2 :10070002 | |
| 194 XeroxPointerButton3 :10070003 | |
| 195 XeroxPointerButton4 :10070004 | |
| 196 XeroxPointerButton5 :10070005 | |
| 197 | |
| 198 usldead_acute :100000A8 | |
| 199 usldead_grave :100000A9 | |
| 200 usldead_diaeresis :100000AB | |
| 201 usldead_asciicircum :100000AA | |
| 202 usldead_asciitilde :100000AC | |
| 203 usldead_cedilla :1000FE2C | |
| 204 usldead_ring :1000FEB0 |