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.

2000-09-12  William M. Perry  <wmperry@aventail.com>

	* dialog-gtk.el (popup-builtin-open-dialog): Went back to
	using our lisp implementation of the file dialog.  Much more
	featureful.

	* ui/gtk-file-dialog.el: Reworked to use CList instead of Tree
	elements (more like the `real' GTK file selector.

2000-09-10  William M. Perry  <wmperry@aventail.com>

	* gtk-iso8859-1.el (gtk-iso8859-1): Need to actually provide
	the feature

2000-09-09  William M. Perry  <wmperry@aventail.com>

	* dialog-gtk.el (popup-builtin-open-dialog): Guard against
	calling gtk-main-quit too many times when destroying the
	file-selection dialog.

2000-09-08  William M. Perry  <wmperry@aventail.com>

	* gtk-init.el (gtk-initialize-compose): Initialize the compose
	map like X does.

2000-09-03  William M. Perry  <wmperry@aventail.com>

	* menubar-items.el (default-menubar): Include the font & size
	menus when running under GTK.

	* gtk-faces.el (x-font-regexp-*): Added variable aliases for
	the x-font-regexp-* variables.  x-font-menu works now.

	* x-font-menu.el (font-menu-set-font): When setting the font, make
	sure we don't set the type to 'x' blithely.  This code is shared
	with GTK now.

2000-08-30  William M. Perry  <wmperry@aventail.com>

	* dialog-gtk.el (popup-builtin-open-dialog): Signal 'quit' if the
	user hits the cancel button.  This gets rid of the 'wrong type
	argument: stringp, nil' error.

2000-08-28  William M. Perry  <wmperry@aventail.com>

	* menubar-items.el (default-menubar): Disable the GTK font menu
	item.

	* dialog-gtk.el (popup-builtin-open-dialog): Reimplemented the
	file-open dialog to use the normal GTK selector.

2000-07-26  William M. Perry  <wmperry@aventail.com>

	* gtk-init.el (init-post-gtk-win): Define the mule-fonts specifier
	tag and default fonts for it when mule is provided.  This will
	make x-symbol.el work.

2000-07-24  William M. Perry  <wmperry@aventail.com>

	* ui/gdk.el: Ditto.

	* ui/gnome-widgets.el: Ditto.

	* ui/gtk-widgets.el: Updated all gtk-import-function calls to pass
	a symbol instead of a quoted string.

	* ui/gtk-ffi.el (gtk-import-variable): Make gtk-import-variable
	able to take symbols instead of just strings.  More consistent
	with gtk-import-function this way.

2000-07-22  William M. Perry  <wmperry@aventail.com>

	* gtk-init.el (init-pre-gtk-win): Did not realize I had to do lisp
	hackery to get '-unmapped' to work.

2000-07-12  William M. Perry  <wmperry@aventail.com>

	* ui/gtk-widgets.el (gtk-ctree-post-recursive): 
	(gtk-ctree-post-recursive-to-depth): 
	(gtk-ctree-pre-recursive): 
	(gtk-ctree-pre-recursive-to-depth): Added wrappers around the
	combined gtk-ctree-recurse to make things easier on GTK authors
	porting other code.

2000-07-11  William M. Perry  <wmperry@aventail.com>

	* gtk-init.el (init-gtk-win): Set gtk-initial-geometry out of
	command-line-args-left.
	(gtk-filter-arguments): New function to filter out only GTK/GNOME
	approved command line arguments.
	(init-gtk-win): Set gtk-initial-argv-list by filtering it.  This
	way we get session management/etc from GNOME.

2000-07-07  William M. Perry  <wmperry@aventail.com>

	* gtk-faces.el (gtk-init-global-faces): Make sure to pass in a GTK
	device (any GTK device) try-font-name when initializing the global
	faces or it gets confused and cannot find a font, so the code in
	faces.el ends up setting device-specific faces, which are hard (or
	at least non-obvious) for users to work around.

2000-07-01  William M. Perry  <wmperry@aventail.com>

	* ui/gtk-widgets.el (GtkType): Added GtkCTree finally.

	* ui/gtk-ffi.el (gtk-ffi-check-function): New function that will
	try to call a newly defined FFI function and report on whether we
	need to define any new marshallers for it.
	(gtk-ffi-debug): If non-nil, then we will check ALL functions that
	come through gtk-import-function.  All existing imported functions
	have been checked, and a few missings ones were added.

	* ui/glade.el: New file to import libglade functions.

2000-06-30  William M. Perry  <wmperry@aventail.com>

	* ui/gdk.el: Added most of the GDK drawing primitives.

2000-06-27  William M. Perry  <wmperry@aventail.com>

	* ui/gtk-widgets.el: Import gtk-major-version, gtk-minor-version,
	gtk-micro-version, gtk-interface-age, and gtk-binary-age.

	* ui/gtk-ffi.el (gtk-import-variable): New macro to import a
	variable.  Needed to do it as a function, otherwise you could not
	byte compile / dump the file in a non-windowed XEmacs.

2000-06-23  William M. Perry  <wmperry@aventail.com>

	* menubar-items.el (default-menubar): Disable
	make-frame-on-display if the function is not available.

2000-06-02  William M. Perry  <wmperry@aventail.com>

	* gtk-mouse.el (gtk-init-pointers): Make sure we set a toolbar
	pointer.  Looked kind of silly to have the 'xterm' cursor in
	there by default.

2000-06-01  William M. Perry  <wmperry@aventail.com>

	* ui/gtk-widgets.el: Imported GtkStatusbar

	* ui/gtk-marshal.el (define-marshaller): All marshalling functions
	are now static.
	* ui/gtk-marshal.el: Now outputs a function to populate a
	hashtable with mappings from function name -> function pointer.
	Also emits the find_marshaller () function that looks at this
	hashtable.

2000-05-29  William M. Perry  <wmperry@aventail.com>

	* ui/gtk-ffi.el (gtk-import-function): Allow passing in of a
	symbol for the function name, as well as a string.

	* ui/gtk-widgets.el: Import the GtkSpinButton widget.

2000-05-26  William M. Perry  <wmperry@aventail.com>

	* ui/gtk-ffi.el (gtk-import-function): Rewrote as a macro so that
	teh file can be safely byte-compiled.  Argument values no longer
	need to be quoted, and the function is not actually imported until
	the function is called.  Should save even more on loadup time.
	(gtk-import-function): Do not defvar `lisp-name' - put the FFI
	object on the symbols plist.  Makes the lisp variable namespace
	that much cleaner.

	* ui/gtk-widgets.el: New uber-file containing all the GTK imported
	functions.  Load time is significantly faster than requiring ~90
	different (usually 5 line) .el files, and polluting the 'features'
	variable.

2000-05-23  William M. Perry  <wmperry@aventail.com>

	* ui/gtk-widget-accessors.el (define-widget-accessors): Fixed
	bogus handling of GTkListOfString and GtkListOfObject slots.
	These need to have the FULL type, not the fundamental type.  And
	_POINTER was just plain wrong for them - cause beautiful crashes
	on linux. :)

	* gtk-faces.el (gtk-choose-font): New function to change fonts
	based on a GTK font selection dialog.

	* menubar-items.el (default-menubar): Only show the font/size
	submenus when we are in an X frame.
	(default-menubar): Show a gtk-specific item when on GTK frames.

	* ui/gtk-marshal.el (define-marshaller): We need to special case
	anything with FLOAT in the argument list or the parameters get
	screwed up royally.

2000-05-21  William M. Perry  <wmperry@aventail.com>

	* ui/gtk-file-dialog.el (gtk-file-dialog-fill-file-list): New file
	dialog that is actually useful and much prettier than the default
	GTK one.

2000-05-20  William M. Perry  <wmperry@aventail.com>

	* ui/gtk-ffi.el (gtk-import-function): Auto-run gnome-*-get-type
	routines as well as the gtk-*-get-type ones.

	* minibuf.el (mouse-read-file-name-1): Now tries to use the new
	builtin dialog spec ben wrote about.  Uses the GTK file selection
	dialog.  We should be able to come up with something much sexier
	though - the default dialog box for GTK sucks hard.

2000-05-17  William M. Perry  <wmperry@aventail.com>

	* gtk-faces.el (gtk-init-device-faces): Make use of the extended
	return values of gtk-style-info.  Set the 'highlight' face to look
	like GTK_STATE_PRELIGHT and 'zmacs-region' to be
	GTK_STATE_SELECTED.  Unfortunately these two faces will not
	automatically be updated because they are not exposed to lisp
	like Vdefault_face and friends.

2000-05-16  William M. Perry  <wmperry@aventail.com>

	* gtk-faces.el (gtk-init-device-faces): Removed a whole bunch of
	face munging that is now done down in the guts of the GtkXEmacs
	widget.

	* gnuserv.el (gnuserv-edit-files): Handle GTK devices.

	* ui/gtk-ffi.el (gtk-import-function): Make this a noop if
	noninteractive.  This allows us to compile the files during the
	make process.

2000-05-10  William M. Perry  <wmperry@aventail.com>

	* dialog-gtk.el: New file implementing popup dialogs in Lisp using
	GTK primitives.  Called from dialog-gtk.c

	* dumped-lisp.el (preloaded-file-list): Make sure we load up
	menubar-items under GTK.
	(preloaded-file-list): Load up dialog-gtk when using GTK.

2000-05-08  William M. Perry  <wmperry@aventail.com>

	* ui/gtk-widget-accessors.el (define-widget-accessors): New file
	to define C functions that go into
	../../src/emacs-widget-accessors.c.  This is a hack to get around
	the lack of accessor/settor functions in GTK for a LOT of things
	that are required for full functionality (like dialogs)

2000-05-07  William M. Perry  <wmperry@aventail.com>

	* gtk-faces.el (gtk-init-face-from-resources): Set the highlight
	face as well.