Mercurial > hg > xemacs-beta

comparison src/menubar-x.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 4aebb0131297
children 6f2158fa75ed
comparison
equal deleted inserted replaced
5012:f68b2ec914e3 5013:ae48681c47fa
126 wv->enabled = 1; 126 wv->enabled = 1;
127 /* dverna Dec. 98: command_builder_operate_menu_accelerator will 127 /* dverna Dec. 98: command_builder_operate_menu_accelerator will
128 manipulate the accel as a Lisp_Object if the widget has a name. 128 manipulate the accel as a Lisp_Object if the widget has a name.
129 Since simple labels have a name, but no accel, we *must* set it 129 Since simple labels have a name, but no accel, we *must* set it
130 to nil */ 130 to nil */
131 wv->accel = LISP_TO_VOID (Qnil); 131 wv->accel = STORE_LISP_IN_VOID (Qnil);
132 } 132 }
133 } 133 }
134 else if (VECTORP (desc)) 134 else if (VECTORP (desc))
135 { 135 {
136 Lisp_Object gui_item = gui_parse_item_keywords (desc); 136 Lisp_Object gui_item = gui_parse_item_keywords (desc);
160 wv->type = CASCADE_TYPE; 160 wv->type = CASCADE_TYPE;
161 wv->enabled = 1; 161 wv->enabled = 1;
162 wv->name = add_accel_and_to_external (XCAR (desc)); 162 wv->name = add_accel_and_to_external (XCAR (desc));
163 163
164 accel = gui_name_accelerator (XCAR (desc)); 164 accel = gui_name_accelerator (XCAR (desc));
165 wv->accel = LISP_TO_VOID (accel); 165 wv->accel = STORE_LISP_IN_VOID (accel);
166 166
167 desc = Fcdr (desc); 167 desc = Fcdr (desc);
168 168
169 while (key = Fcar (desc), KEYWORDP (key)) 169 while (key = Fcar (desc), KEYWORDP (key))
170 { 170 {
184 active_p = val, active_spec = 1; 184 active_p = val, active_spec = 1;
185 else if (EQ (key, Q_accelerator)) 185 else if (EQ (key, Q_accelerator))
186 { 186 {
187 if ( SYMBOLP (val) 187 if ( SYMBOLP (val)
188 || CHARP (val)) 188 || CHARP (val))
189 wv->accel = LISP_TO_VOID (val); 189 wv->accel = STORE_LISP_IN_VOID (val);
190 else 190 else
191 invalid_argument ("bad keyboard accelerator", val); 191 invalid_argument ("bad keyboard accelerator", val);
192 } 192 }
193 else if (EQ (key, Q_label)) 193 else if (EQ (key, Q_label))
194 { 194 {
229 incr_wv->name = wv->name; 229 incr_wv->name = wv->name;
230 incr_wv->name = xstrdup (wv->name); 230 incr_wv->name = xstrdup (wv->name);
231 /* This is automatically GC protected through 231 /* This is automatically GC protected through
232 the call to lw_map_widget_values(); no need 232 the call to lw_map_widget_values(); no need
233 to worry. */ 233 to worry. */
234 incr_wv->call_data = LISP_TO_VOID (incremental_data); 234 incr_wv->call_data = STORE_LISP_IN_VOID (incremental_data);
235 goto menu_item_done; 235 goto menu_item_done;
236 } 236 }
237 #endif /* LWLIB_MENUBARS_LUCID || LWLIB_MENUBARS_MOTIF */ 237 #endif /* LWLIB_MENUBARS_LUCID || LWLIB_MENUBARS_MOTIF */
238 } 238 }
239 if (menu_type == POPUP_TYPE && popup_menu_titles && depth == 0) 239 if (menu_type == POPUP_TYPE && popup_menu_titles && depth == 0)
259 { 259 {
260 widget_value *dummy; 260 widget_value *dummy;
261 /* Add a fake entry so the menus show up */ 261 /* Add a fake entry so the menus show up */
262 wv->contents = dummy = xmalloc_widget_value (); 262 wv->contents = dummy = xmalloc_widget_value ();
263 dummy->name = xstrdup ("(inactive)"); 263 dummy->name = xstrdup ("(inactive)");
264 dummy->accel = LISP_TO_VOID (Qnil); 264 dummy->accel = STORE_LISP_IN_VOID (Qnil);
265 dummy->enabled = 0; 265 dummy->enabled = 0;
266 dummy->selected = 0; 266 dummy->selected = 0;
267 dummy->value = NULL; 267 dummy->value = NULL;
268 dummy->type = BUTTON_TYPE; 268 dummy->type = BUTTON_TYPE;
269 dummy->call_data = NULL; 269 dummy->call_data = NULL;
469 widget_value *hack_wv = (widget_value *) client_data; 469 widget_value *hack_wv = (widget_value *) client_data;
470 Lisp_Object submenu_desc; 470 Lisp_Object submenu_desc;
471 widget_value *wv; 471 widget_value *wv;
472 472
473 assert (hack_wv->type == INCREMENTAL_TYPE); 473 assert (hack_wv->type == INCREMENTAL_TYPE);
474 submenu_desc = VOID_TO_LISP (hack_wv->call_data); 474 submenu_desc = GET_LISP_FROM_VOID (hack_wv->call_data);
475 475
476 wv = (protected_menu_item_descriptor_to_widget_value 476 wv = (protected_menu_item_descriptor_to_widget_value
477 (submenu_desc, SUBMENU_TYPE, 1, 0)); 477 (submenu_desc, SUBMENU_TYPE, 1, 0));
478 478
479 if (!wv) 479 if (!wv)
480 { 480 {
481 wv = xmalloc_widget_value (); 481 wv = xmalloc_widget_value ();
482 wv->type = CASCADE_TYPE; 482 wv->type = CASCADE_TYPE;
483 wv->next = NULL; 483 wv->next = NULL;
484 wv->accel = LISP_TO_VOID (Qnil); 484 wv->accel = STORE_LISP_IN_VOID (Qnil);
485 wv->contents = xmalloc_widget_value (); 485 wv->contents = xmalloc_widget_value ();
486 wv->contents->type = TEXT_TYPE; 486 wv->contents->type = TEXT_TYPE;
487 wv->contents->name = xstrdup ("No menu"); 487 wv->contents->name = xstrdup ("No menu");
488 wv->contents->next = NULL; 488 wv->contents->next = NULL;
489 wv->contents->accel = LISP_TO_VOID (Qnil); 489 wv->contents->accel = STORE_LISP_IN_VOID (Qnil);
490 } 490 }
491 assert (wv && wv->type == CASCADE_TYPE && wv->contents); 491 assert (wv && wv->type == CASCADE_TYPE && wv->contents);
492 replace_widget_value_tree (hack_wv, wv->contents); 492 replace_widget_value_tree (hack_wv, wv->contents);
493 free_popup_widget_value_tree (wv); 493 free_popup_widget_value_tree (wv);
494 /* Now that we've destructively modified part of the widget value 494 /* Now that we've destructively modified part of the widget value
1030 entries=lw_get_entries (True); 1030 entries=lw_get_entries (True);
1031 1031
1032 while (entries) 1032 while (entries)
1033 { 1033 {
1034 Lisp_Object accel; 1034 Lisp_Object accel;
1035 accel = VOID_TO_LISP (entries->accel); 1035 accel = GET_LISP_FROM_VOID (entries->accel);
1036 if (entries->name && !NILP (accel)) 1036 if (entries->name && !NILP (accel))
1037 { 1037 {
1038 if (event_matches_key_specifier_p (evee, accel)) 1038 if (event_matches_key_specifier_p (evee, accel))
1039 { 1039 {
1040 /* a match! */ 1040 /* a match! */
1263 GCPRO1 (fake); 1263 GCPRO1 (fake);
1264 1264
1265 while (val) 1265 while (val)
1266 { 1266 {
1267 Lisp_Object accel; 1267 Lisp_Object accel;
1268 accel = VOID_TO_LISP (val->accel); 1268 accel = GET_LISP_FROM_VOID (val->accel);
1269 if (val->name && !NILP (accel)) 1269 if (val->name && !NILP (accel))
1270 { 1270 {
1271 Fsetcar (last, accel); 1271 Fsetcar (last, accel);
1272 Fsetcar (fake, event0); 1272 Fsetcar (fake, event0);
1273 matchp = condition_case_1 (Qerror, 1273 matchp = condition_case_1 (Qerror,