changes to VOID_TO_LISP et al. -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-08 Ben Wing <ben@xemacs.org> * casetab.c (compute_canon_mapper): * casetab.c (initialize_identity_mapper): * casetab.c (compute_up_or_eqv_mapper): * casetab.c (recompute_case_table): * casetab.c (set_case_table): * chartab.c (copy_mapper): * chartab.c (copy_char_table_range): * chartab.c (get_range_char_table_1): * console.c (find_nonminibuffer_frame_not_on_console_predicate): * console.c (find_nonminibuffer_frame_not_on_console): * console.c (nuke_all_console_slots): * device.c: * device.c (find_nonminibuffer_frame_not_on_device_predicate): * device.c (find_nonminibuffer_frame_not_on_device): * dialog-msw.c (dialog_proc): * dialog-msw.c (handle_question_dialog_box): * dialog-x.c (maybe_run_dbox_text_callback): * eval.c: * eval.c (safe_run_hook_trapping_problems_1): * eval.c (safe_run_hook_trapping_problems): * event-msw.c: * event-msw.c (mswindows_wnd_proc): * event-msw.c (mswindows_find_frame): * faces.c (update_face_inheritance_mapper): * frame-msw.c (mswindows_init_frame_1): * frame-msw.c (mswindows_get_mouse_position): * frame-msw.c (mswindows_get_frame_parent): * glade.c (connector): * glade.c (Fglade_xml_signal_connect): * glade.c (Fglade_xml_signal_autoconnect): * glade.c (Fglade_xml_textdomain): * glyphs-msw.c (mswindows_subwindow_instantiate): * glyphs-msw.c (mswindows_widget_instantiate): * glyphs.c (check_instance_cache_mapper): * glyphs.c (check_window_subwindow_cache): * glyphs.c (check_image_instance_structure): * gui-x.c (snarf_widget_value_mapper): * gui-x.c (popup_selection_callback): * gui-x.c (button_item_to_widget_value): * keymap.c (map_keymap_mapper): * keymap.c (Fmap_keymap): * menubar-gtk.c (__torn_off_sir): * menubar-gtk.c (__activate_menu): * menubar-gtk.c (menu_convert): * menubar-gtk.c (__generic_button_callback): * menubar-gtk.c (menu_descriptor_to_widget_1): * menubar-msw.c: * menubar-msw.c (EMPTY_ITEM_ID): * menubar-x.c (menu_item_descriptor_to_widget_value_1): * menubar-x.c (pre_activate_callback): * menubar-x.c (command_builder_operate_menu_accelerator): * menubar-x.c (command_builder_find_menu_accelerator): * print.c (print_internal): * process-unix.c (close_process_descs_mapfun): * process.c (get_process_from_usid): * process.c (init_process_io_handles): * profile.c (sigprof_handler): * profile.c (get_profiling_info_timing_maphash): * profile.c (Fget_profiling_info): * profile.c (set_profiling_info_timing_maphash): * profile.c (mark_profiling_info_maphash): * scrollbar-msw.c (mswindows_create_scrollbar_instance): * scrollbar-msw.c (mswindows_free_scrollbar_instance): * scrollbar-msw.c (mswindows_handle_scrollbar_event): * specifier.c (recompute_cached_specifier_everywhere_mapfun): * specifier.c (recompute_cached_specifier_everywhere): * syntax.c (copy_to_mirrortab): * syntax.c (copy_if_not_already_present): * syntax.c (update_just_this_syntax_table): * text.c (new_dfc_convert_now_damn_it): * text.h (LISP_STRING_TO_EXTERNAL): * tooltalk.c: * tooltalk.c (tooltalk_message_callback): * tooltalk.c (tooltalk_pattern_callback): * tooltalk.c (Fcreate_tooltalk_message): * tooltalk.c (Fcreate_tooltalk_pattern): * ui-byhand.c (__generic_toolbar_callback): * ui-byhand.c (generic_toolbar_insert_item): * ui-byhand.c (__emacs_gtk_ctree_recurse_internal): * ui-byhand.c (Fgtk_ctree_recurse): * ui-gtk.c (__internal_callback_destroy): * ui-gtk.c (__internal_callback_marshal): * ui-gtk.c (Fgtk_signal_connect): * ui-gtk.c (gtk_type_to_lisp): * ui-gtk.c (lisp_to_gtk_type): * ui-gtk.c (lisp_to_gtk_ret_type): * lisp-disunion.h: * lisp-disunion.h (NON_LVALUE): * lisp-union.h: * lisp.h (LISP_HASH): Rename: LISP_TO_VOID -> STORE_LISP_IN_VOID VOID_TO_LISP -> GET_LISP_FROM_VOID These new names are meant to clearly identify that the Lisp object is the source and void the sink, and that they can't be used the other way around -- they aren't exact opposites despite the old names. The names are also important given the new functions created just below. Also, clarify comments in lisp-union.h and lisp-disunion.h about the use of the functions. * lisp.h: New functions STORE_VOID_IN_LISP and GET_VOID_FROM_LISP. These are different from the above in that the source is a void * (previously, you had to use make_opaque_ptr()). * eval.c (restore_lisp_object): * eval.c (record_unwind_protect_restoring_lisp_object): * eval.c (struct restore_int): * eval.c (restore_int): * eval.c (record_unwind_protect_restoring_int): * eval.c (free_pointer): * eval.c (record_unwind_protect_freeing): * eval.c (free_dynarr): * eval.c (record_unwind_protect_freeing_dynarr): * eval.c (unbind_to_1): Use STORE_VOID_IN_LISP and GET_VOID_FROM_LISP to eliminate the use of make_opaque_ptr() and mostly eliminate Lisp consing entirely in the use of these various record_unwind_protect_* functions as well as internal_bind_* (e.g. internal_bind_int). * tests.c: * tests.c (Ftest_store_void_in_lisp): * tests.c (syms_of_tests): * tests.c (vars_of_tests): Add an C-assert-style test to test STORE_VOID_IN_LISP and GET_VOID_FROM_LISP to make sure the same value comes back that was put in.

;;; gtk-extra.el --- Import `GTK+ Extra' widgets into XEmacs

;; Copyright (C) 2000 Free Software Foundation

;; Maintainer: William Perry <wmperry@gnu.org>
;; Keywords: extensions, dumped

;; 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

;;; Commentary:

;; GTK+ Extra can be retrieved from http://magnet.fsu.edu/~feiguin/gtk

(eval-and-compile
  (require 'gtk-ffi))

(globally-declare-fboundp
 '(gtk-import-function-internal gtk-call-function))

;;; gtkbordercombo.h
(gtk-import-function GtkType gtk_border_combo_get_type)
(gtk-import-function GtkWidget gtk_border_combo_new)

;;; gtkcheckitem.h
(gtk-import-function GtkType gtk_check_item_get_type)
(gtk-import-function GtkWidget gtk_check_item_new)
(gtk-import-function GtkWidget gtk_check_item_new_with_label
		     (GtkString . label))

;;; gtkcolorcombo.h
(gtk-import-function GtkType gtk_color_combo_get_type)
(gtk-import-function GtkWidget gtk_color_combo_new)
(gtk-import-function GtkWidget gtk_color_combo_new_with_values
		     (gint . nrows)
		     (gint . ncols)
		     (GtkArrayOfString . color_names))
(gtk-import-function GtkString gtk_color_combo_get_color_at
		     (GtkColorCombo . combo)
		     (gint          . row)
		     (gint          . col))
;;;(gtk-import-function none gtk_color_combo_find_color
;;;		     (GtkColorCombo . combo)
;;;		     (GdkColor      . color)
;;;		     ((gint . out)  . row)
;;;		     ((gint . out)  . col))

;;; gtkcombobox.h
(gtk-import-function GtkType gtk_combobox_get_type)
(gtk-import-function GtkWidget gtk_combobox_new)
(gtk-import-function none gtk_combobox_hide_popdown_window)

;;; gtkdirtree.h
(gtk-import-function GtkType gtk_dir_tree_get_type)
(gtk-import-function GtkWidget gtk_dir_tree_new)
(gtk-import-function gint gtk_dir_tree_open_dir
		     (GtkDirTree . tree)
		     (GtkString  . path))

;;; gtkfilelist.h
(gtk-import-function GtkType gtk_file_list_get_type)
(gtk-import-function GtkWidget gtk_file_list_new
		     (guint . icon_width)
		     (gint  . mode)
		     (GtkString . path))
(gtk-import-function none gtk_file_list_set_filter
		     (GtkFileList . file_list)
		     (GtkString   . filter))
(gtk-import-function none gtk_file_list_open_dir
		     (GtkFileList . file_list)
		     (GtkString   . path))
(gtk-import-function GtkString gtk_file_list_get_path
		     (GtkFileList . file_list))
(gtk-import-function GtkString gtk_file_list_get_filename
		     (GtkFileList . file_list))

;;; gtkfontcombo.h
(gtk-import-function GtkType gtk_font_combo_get_type)
(gtk-import-function GtkWidget gtk_font_combo_new)
(gtk-import-function none gtk_font_combo_select
		     (GtkFontCombo . font_combo)
		     (GtkString    . family)
		     (gboolean     . bold)
		     (gboolean     . italic)
		     (gint         . height))
(gtk-import-function none gtk_font_combo_select_nth
		     (GtkFontCombo . font_combo)
		     (gint         . n)
		     (gboolean     . bold)
		     (gboolean     . italic)
		     (gint         . height))

;;; gtkiconfilesel.h
;;; gtkiconlist.h
;;; gtkitementry.h
;;; gtkplot.h
;;; gtkplotcanvas.h
;;; gtkplotpc.h
;;; gtkplotprint.h
;;; gtkplotps.h
;;; gtkpsfont.h
;;; gtksheet.h

(provide 'gtk-extra)