Mercurial > hg > xemacs-beta

comparison src/ui-gtk.c @ 5013:ae48681c47fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 16112448d484
children b5df3737028a 8b2f75cecb89
comparison
equal deleted inserted replaced
5012:f68b2ec914e3 5013:ae48681c47fa
1014 static void 1014 static void
1015 __internal_callback_destroy (gpointer data) 1015 __internal_callback_destroy (gpointer data)
1016 { 1016 {
1017 Lisp_Object lisp_data; 1017 Lisp_Object lisp_data;
1018 1018
1019 lisp_data = VOID_TO_LISP (data); 1019 lisp_data = GET_LISP_FROM_VOID (data);
1020 1020
1021 ungcpro_popup_callbacks (XINT (XCAR (lisp_data))); 1021 ungcpro_popup_callbacks (XINT (XCAR (lisp_data)));
1022 } 1022 }
1023 1023
1024 static void 1024 static void
1030 Lisp_Object newargs[3]; 1030 Lisp_Object newargs[3];
1031 Lisp_Object rval = Qnil; 1031 Lisp_Object rval = Qnil;
1032 struct gcpro gcpro1; 1032 struct gcpro gcpro1;
1033 int i; 1033 int i;
1034 1034
1035 callback_fn = VOID_TO_LISP (data); 1035 callback_fn = GET_LISP_FROM_VOID (data);
1036 1036
1037 /* Nuke the GUI_ID off the front */ 1037 /* Nuke the GUI_ID off the front */
1038 callback_fn = XCDR (callback_fn); 1038 callback_fn = XCDR (callback_fn);
1039 1039
1040 callback_data = XCAR (callback_fn); 1040 callback_data = XCAR (callback_fn);
1096 func = Fcons (make_int (id), func); 1096 func = Fcons (make_int (id), func);
1097 1097
1098 gcpro_popup_callbacks (id, func); 1098 gcpro_popup_callbacks (id, func);
1099 1099
1100 gtk_signal_connect_full (XGTK_OBJECT (obj)->object, (char *) XSTRING_DATA (name), 1100 gtk_signal_connect_full (XGTK_OBJECT (obj)->object, (char *) XSTRING_DATA (name),
1101 NULL, __internal_callback_marshal, LISP_TO_VOID (func), 1101 NULL, __internal_callback_marshal, STORE_LISP_IN_VOID (func),
1102 __internal_callback_destroy, c_object_signal, c_after); 1102 __internal_callback_destroy, c_object_signal, c_after);
1103 return (Qt); 1103 return (Qt);
1104 } 1104 }
1105 1105
1106 1106
1514 case GTK_TYPE_POINTER: 1514 case GTK_TYPE_POINTER:
1515 if (GTK_VALUE_POINTER (*arg)) 1515 if (GTK_VALUE_POINTER (*arg))
1516 { 1516 {
1517 Lisp_Object rval; 1517 Lisp_Object rval;
1518 1518
1519 rval = VOID_TO_LISP (GTK_VALUE_POINTER (*arg)); 1519 rval = GET_LISP_FROM_VOID (GTK_VALUE_POINTER (*arg));
1520 return (rval); 1520 return (rval);
1521 } 1521 }
1522 else 1522 else
1523 return (Qnil); 1523 return (Qnil);
1524 case GTK_TYPE_OBJECT: 1524 case GTK_TYPE_OBJECT:
1529 1529
1530 case GTK_TYPE_CALLBACK: 1530 case GTK_TYPE_CALLBACK:
1531 { 1531 {
1532 Lisp_Object rval; 1532 Lisp_Object rval;
1533 1533
1534 rval = VOID_TO_LISP (GTK_VALUE_CALLBACK (*arg).data); 1534 rval = GET_LISP_FROM_VOID (GTK_VALUE_CALLBACK (*arg).data);
1535 1535
1536 return (rval); 1536 return (rval);
1537 } 1537 }
1538 1538
1539 default: 1539 default:
1750 1750
1751 case GTK_TYPE_POINTER: 1751 case GTK_TYPE_POINTER:
1752 if (NILP (obj)) 1752 if (NILP (obj))
1753 GTK_VALUE_POINTER(*arg) = NULL; 1753 GTK_VALUE_POINTER(*arg) = NULL;
1754 else 1754 else
1755 GTK_VALUE_POINTER(*arg) = LISP_TO_VOID (obj); 1755 GTK_VALUE_POINTER(*arg) = STORE_LISP_IN_VOID (obj);
1756 break; 1756 break;
1757 1757
1758 /* structured types */ 1758 /* structured types */
1759 case GTK_TYPE_SIGNAL: 1759 case GTK_TYPE_SIGNAL:
1760 case GTK_TYPE_ARGS: /* This we can do as a list of values */ 1760 case GTK_TYPE_ARGS: /* This we can do as a list of values */
2030 2030
2031 case GTK_TYPE_POINTER: 2031 case GTK_TYPE_POINTER:
2032 if (NILP (obj)) 2032 if (NILP (obj))
2033 *(GTK_RETLOC_POINTER(*arg)) = NULL; 2033 *(GTK_RETLOC_POINTER(*arg)) = NULL;
2034 else 2034 else
2035 *(GTK_RETLOC_POINTER(*arg)) = LISP_TO_VOID (obj); 2035 *(GTK_RETLOC_POINTER(*arg)) = STORE_LISP_IN_VOID (obj);
2036 break; 2036 break;
2037 2037
2038 /* structured types */ 2038 /* structured types */
2039 case GTK_TYPE_SIGNAL: 2039 case GTK_TYPE_SIGNAL:
2040 case GTK_TYPE_ARGS: /* This we can do as a list of values */ 2040 case GTK_TYPE_ARGS: /* This we can do as a list of values */