Mercurial > hg > xemacs-beta
annotate lwlib/lwlib-utils.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 | 04bc9d2f42c7 |
| children | ade4c7e2c6cb |
| rev | line source |
|---|---|
| 428 | 1 /* Defines some widget utility functions. |
| 2 Copyright (C) 1992 Lucid, Inc. | |
| 3 | |
| 4 This file is part of the Lucid Widget Library. | |
| 5 | |
| 6 The Lucid Widget Library is free software; you can redistribute it and/or | |
| 7 modify it under the terms of the GNU General Public License as published by | |
| 8 the Free Software Foundation; either version 1, or (at your option) | |
| 9 any later version. | |
| 10 | |
| 11 The Lucid Widget Library is distributed in the hope that it will be useful, | |
| 12 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 14 GNU General Public License for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 #include <config.h> | |
| 22 #include <stdlib.h> | |
| 23 #include <string.h> | |
| 24 #include <memory.h> | |
| 25 #ifdef HAVE_UNISTD_H | |
| 26 #include <unistd.h> | |
| 27 #endif | |
| 28 | |
| 29 #include <X11/Xatom.h> | |
| 30 #include <X11/IntrinsicP.h> | |
| 31 #include <X11/ObjectP.h> | |
| 32 #include "lwlib-utils.h" | |
| 33 | |
| 34 void | |
| 35 destroy_all_children (Widget widget) | |
| 36 { | |
| 37 Widget* children; | |
| 38 unsigned int number; | |
| 39 int i; | |
| 40 | |
| 41 children = XtCompositeChildren (widget, &number); | |
| 42 if (children) | |
| 43 { | |
| 44 /* Unmanage all children and destroy them. They will only be | |
| 45 * really destroyed when we get out of DispatchEvent. */ | |
| 487 | 46 for (i = 0; i < (int) number; i++) |
| 428 | 47 { |
| 48 Widget child = children [i]; | |
| 49 if (!child->core.being_destroyed) | |
| 50 { | |
| 51 XtUnmanageChild (child); | |
| 52 XtDestroyWidget (child); | |
| 53 } | |
| 54 } | |
| 55 XtFree ((char *) children); | |
| 56 } | |
| 57 } | |
| 58 | |
| 59 /* Redisplay the contents of the widget, without first clearing it. */ | |
| 60 void | |
| 61 XtNoClearRefreshWidget (Widget widget) | |
| 62 { | |
| 63 XEvent event; | |
| 64 XExposeEvent* ev = &event.xexpose; | |
| 65 | |
| 66 ev->type = Expose; | |
| 67 ev->serial = 0; | |
| 68 ev->send_event = 0; | |
| 69 ev->display = XtDisplay (widget); | |
| 70 ev->window = XtWindow (widget); | |
| 71 ev->x = 0; | |
| 72 ev->y = 0; | |
| 73 ev->width = widget->core.width; | |
| 74 ev->height = widget->core.height; | |
| 75 ev->count = 0; | |
| 76 | |
| 77 (*widget->core.widget_class->core_class.expose) | |
| 78 (widget, &event, (Region)NULL); | |
| 79 } | |
| 80 | |
| 81 | |
| 82 /* | |
| 83 * Apply a function to all the subwidgets of a given widget recursively. | |
| 84 */ | |
| 85 void | |
| 86 XtApplyToWidgets (Widget w, XtApplyToWidgetsProc proc, XtPointer arg) | |
| 87 { | |
| 88 if (XtIsComposite (w)) | |
| 89 { | |
| 90 CompositeWidget cw = (CompositeWidget) w; | |
| 91 /* We have to copy the children list before mapping over it, because | |
| 92 the procedure might add/delete elements, which would lose badly. */ | |
| 93 int nkids = cw->composite.num_children; | |
| 94 Widget *kids = (Widget *) malloc (sizeof (Widget) * nkids); | |
| 95 int i; | |
| 96 memcpy (kids, cw->composite.children, sizeof (Widget) * nkids); | |
| 97 for (i = 0; i < nkids; i++) | |
| 98 /* This prevent us from using gadgets, why is it here? */ | |
| 99 /* if (XtIsWidget (kids [i])) */ | |
| 100 { | |
| 101 /* do the kiddies first in case we're destroying */ | |
| 102 XtApplyToWidgets (kids [i], proc, arg); | |
| 103 proc (kids [i], arg); | |
| 104 } | |
| 105 free (kids); | |
| 106 } | |
| 107 } | |
| 108 | |
| 109 | |
| 110 /* | |
| 111 * Apply a function to all the subwidgets of a given widget recursively. | |
| 112 * Stop as soon as the function returns non NULL and returns this as a value. | |
| 113 */ | |
| 114 void * | |
| 115 XtApplyUntilToWidgets (Widget w, XtApplyUntilToWidgetsProc proc, XtPointer arg) | |
| 116 { | |
| 117 void* result; | |
| 118 if (XtIsComposite (w)) | |
| 119 { | |
| 120 CompositeWidget cw = (CompositeWidget)w; | |
| 121 int i; | |
| 647 | 122 for (i = 0; i < (int) cw->composite.num_children; i++) |
| 123 if (XtIsWidget (cw->composite.children[i])) | |
| 124 { | |
| 125 result = proc (cw->composite.children[i], arg); | |
| 126 if (result) | |
| 127 return result; | |
| 128 result = XtApplyUntilToWidgets (cw->composite.children[i], proc, | |
| 129 arg); | |
| 130 if (result) | |
| 131 return result; | |
| 132 } | |
| 428 | 133 } |
| 134 return NULL; | |
| 135 } | |
| 136 | |
| 137 | |
| 138 /* | |
| 139 * Returns a copy of the list of all children of a composite widget | |
| 140 */ | |
| 141 Widget * | |
| 142 XtCompositeChildren (Widget widget, unsigned int* number) | |
| 143 { | |
| 144 CompositeWidget cw = (CompositeWidget)widget; | |
| 145 Widget* result; | |
| 146 int n; | |
| 147 int i; | |
| 148 | |
| 149 if (!XtIsComposite (widget)) | |
| 150 { | |
| 151 *number = 0; | |
| 152 return NULL; | |
| 153 } | |
| 154 n = cw->composite.num_children; | |
| 155 result = (Widget*)XtMalloc (n * sizeof (Widget)); | |
| 156 *number = n; | |
| 157 for (i = 0; i < n; i++) | |
| 158 result [i] = cw->composite.children [i]; | |
| 159 return result; | |
| 160 } | |
| 161 | |
| 162 Boolean | |
| 163 XtWidgetBeingDestroyedP (Widget widget) | |
| 164 { | |
| 165 return widget->core.being_destroyed; | |
| 166 } | |
| 167 | |
| 168 void | |
| 2286 | 169 XtSafelyDestroyWidget (Widget UNUSED (widget)) |
| 428 | 170 { |
| 171 #if 0 | |
| 172 | |
| 173 /* this requires IntrinsicI.h (actually, InitialI.h) */ | |
| 174 | |
| 175 XtAppContext app = XtWidgetToApplicationContext(widget); | |
| 176 | |
| 177 if (app->dispatch_level == 0) | |
| 178 { | |
| 179 app->dispatch_level = 1; | |
| 180 XtDestroyWidget (widget); | |
| 181 /* generates an event so that the event loop will be called */ | |
| 182 XChangeProperty (XtDisplay (widget), XtWindow (widget), | |
| 183 XA_STRING, XA_STRING, 32, PropModeAppend, NULL, 0); | |
| 184 app->dispatch_level = 0; | |
| 185 } | |
| 186 else | |
| 187 XtDestroyWidget (widget); | |
| 188 | |
| 189 #else | |
| 190 abort (); | |
| 191 #endif | |
| 192 } |