Mercurial > hg > xemacs-beta
annotate src/gui-gtk.c @ 5013:ae48681c47fa
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.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 08 Feb 2010 06:42:16 -0600 |
| parents | 166ed8151e62 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 2168 | 1 /* General GUI code -- GTK-specific. (menubars, scrollbars, toolbars, dialogs) |
| 462 | 2 Copyright (C) 1995 Board of Trustees, University of Illinois. |
| 872 | 3 Copyright (C) 1995, 1996, 2002 Ben Wing. |
| 462 | 4 Copyright (C) 1995 Sun Microsystems, Inc. |
| 5 Copyright (C) 1998 Free Software Foundation, Inc. | |
| 6 | |
| 7 This file is part of XEmacs. | |
| 8 | |
| 9 XEmacs is free software; you can redistribute it and/or modify it | |
| 10 under the terms of the GNU General Public License as published by the | |
| 11 Free Software Foundation; either version 2, or (at your option) any | |
| 12 later version. | |
| 13 | |
| 14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 You should have received a copy of the GNU General Public License | |
| 20 along with XEmacs; see the file COPYING. If not, write to | |
| 21 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 22 Boston, MA 02111-1307, USA. */ | |
| 23 | |
| 24 /* Synched up with: Not in FSF. */ | |
| 25 | |
| 26 #include <config.h> | |
| 27 #include "lisp.h" | |
| 28 | |
| 29 #include "buffer.h" | |
| 872 | 30 #include "device-impl.h" |
| 462 | 31 #include "frame.h" |
| 32 #include "gui.h" | |
| 33 #include "opaque.h" | |
| 34 | |
| 872 | 35 #include "console-gtk-impl.h" |
| 36 | |
| 462 | 37 static GUI_ID gui_id_ctr = 0; |
| 38 | |
| 39 GUI_ID | |
| 40 new_gui_id (void) | |
| 41 { | |
| 42 return (++gui_id_ctr); | |
| 43 } | |
| 44 | |
| 45 /* This is like FRAME_MENUBAR_DATA (f), but contains an alist of | |
| 46 (id . popup-data) for GCPRO'ing the callbacks of the popup menus | |
| 47 and dialog boxes. */ | |
| 48 static Lisp_Object Vpopup_callbacks; | |
| 49 | |
| 50 void | |
| 51 gcpro_popup_callbacks (GUI_ID id, Lisp_Object data) | |
| 52 { | |
| 53 Vpopup_callbacks = Fcons (Fcons (make_int (id), data), Vpopup_callbacks); | |
| 54 } | |
| 55 | |
| 56 void | |
| 57 ungcpro_popup_callbacks (GUI_ID id) | |
| 58 { | |
| 59 Lisp_Object lid = make_int (id); | |
| 2552 | 60 Lisp_Object this_callback = assq_no_quit (lid, Vpopup_callbacks); |
| 61 Vpopup_callbacks = delq_no_quit (this_callback, Vpopup_callbacks); | |
| 462 | 62 } |
| 63 | |
| 64 Lisp_Object | |
| 65 get_gcpro_popup_callbacks (GUI_ID id) | |
| 66 { | |
| 67 Lisp_Object lid = make_int (id); | |
| 2552 | 68 Lisp_Object this_callback = assq_no_quit (lid, Vpopup_callbacks); |
| 462 | 69 |
| 2552 | 70 if (!NILP (this_callback)) |
| 462 | 71 { |
| 2552 | 72 return (XCDR (this_callback)); |
| 462 | 73 } |
| 74 return (Qnil); | |
| 75 } | |
| 76 | |
| 77 void | |
| 78 syms_of_gui_gtk (void) | |
| 79 { | |
| 80 #ifdef HAVE_POPUPS | |
| 563 | 81 DEFSYMBOL (Qmenu_no_selection_hook); |
| 462 | 82 #endif |
| 83 } | |
| 84 | |
| 85 void | |
| 86 vars_of_gui_gtk (void) | |
| 87 { | |
| 88 staticpro (&Vpopup_callbacks); | |
| 89 Vpopup_callbacks = Qnil; | |
| 90 #ifdef HAVE_POPUPS | |
| 91 popup_up_p = 0; | |
| 92 | |
| 93 #if 0 | |
| 94 /* This DEFVAR_LISP is just for the benefit of make-docfile. */ | |
| 95 /* #### misnamed */ | |
| 96 DEFVAR_LISP ("menu-no-selection-hook", &Vmenu_no_selection_hook /* | |
| 97 Function or functions to call when a menu or dialog box is dismissed | |
| 98 without a selection having been made. | |
| 99 */ ); | |
| 100 #endif | |
| 101 | |
| 102 Fset (Qmenu_no_selection_hook, Qnil); | |
| 103 #endif /* HAVE_POPUPS */ | |
| 104 } |