Commit graph

142 commits

Author SHA1 Message Date
Erik Naggum
3b7ad313e0 Update FSF's address in the preamble. 1996-01-15 09:18:04 +00:00
Karl Heuer
8e6208c5d2 Comment fixes. 1996-01-05 10:03:17 +00:00
Richard M. Stallman
f56e7ad2ac Comment change. 1995-12-23 07:17:48 +00:00
Richard M. Stallman
62555c22ca (set_frame_menubar): When called with deep_p == 0,
that invalidates the previous f->menu_bar_vector.
1995-11-26 20:50:52 +00:00
Richard M. Stallman
5ee80bd3d0 Don't include Xaw/Paned.h unless USE_LUCID is defined.
(set_frame_menubar): Conditionalized some code on USE_LUCID that
depends on the fact that the parent widget of the menu bar is an Xaw
"Paned" widget.
1995-11-10 18:55:48 +00:00
Richard M. Stallman
d31d42cc68 (popup_get_selection): Pop menu down if button is pressed
outside the menu.

(xmenu_show): Ignore `quote' when looking up the result.
1995-09-24 23:33:06 +00:00
Richard M. Stallman
ffcb5a5127 [USE_X_TOOLKIT] (xmenu_show): Compute root-based
coordinates.  Make a dummy event to pass them to lw_popup_menu.

(single_submenu): Only ignore 1st char of pane name if that is an @.
1995-08-02 08:17:20 +00:00
Karl Heuer
54e9e9537a Do renamings:
frame->display => frame->output, struct x_display -> struct x_output.
1995-07-26 00:04:12 +00:00
Richard M. Stallman
7556890b58 Renamings: frame->display => frame->output, struct x_display -> sruct x_output. 1995-07-25 21:55:50 +00:00
Richard M. Stallman
88766961a3 Include buffer.h.
(x_activate_menubar): New function.
(set_frame_menubar): New arg deep_p.  Callers changed.
Run various hooks here when deep_p is true.
(frame_vector): Variable deleted.
(syms_of_xmenu): Don't staticpro it.
(frame_vector_add_frame): Function deleted.
(menubar_id_to_frame): New function.
(menubar_selection_callback): Use menubar_id_to_frame.
(next_menubar_widget_id): New variable.
(set_frame_menubar): Use next_menubar_widget_id.
(free_frame_menubar): Get id from f->display.x->id.
1995-07-25 20:26:10 +00:00
Richard M. Stallman
8d8a349485 (set_frame_menubar): If the Lisp-level menu bar menus
are unchanged, don't recompute the widgets.
1995-07-21 08:31:15 +00:00
Richard M. Stallman
0314aacb41 (syms_of_xmenu): Set up Qdebug_on_next_call.
(set_frame_menubar): Bind it to nil.
1995-07-21 02:05:20 +00:00
Richard M. Stallman
71dca3e3da (single_submenu): Handle commands appearing directly in the menu bar. 1995-06-29 18:43:24 +00:00
Richard M. Stallman
37a985474f (menu_item_enabled_p_1): Special handling for quit.
(set_frame_menubar): Inhibit quitting.
1995-06-22 19:25:20 +00:00
Richard M. Stallman
8fbc986d86 (menu_item_equiv_key): Do reconsider a command that had
no equivalent before, if it is in Vdefine_key_rebound_commands.
1995-06-17 23:48:10 +00:00
Karl Heuer
8a44285875 (frame_vector_add_frame): Don't forget to store
the longer vector.
1995-06-12 00:55:33 +00:00
Karl Heuer
21af8a68c8 (xmenu_show): Do call lw_destroy_all_widgets.
(xdialog_show): Likewise.
(popup_get_selection): Don't call it here.
1995-06-09 01:11:36 +00:00
Karl Heuer
f1df80a88f (xmenu_show): If !HAVE_X_WINDOWS, don't reference X display. 1995-06-08 19:14:45 +00:00
Karl Heuer
4bcdbab193 (set_frame_menubar): Always call update_frame_menubar. 1995-05-30 18:46:49 +00:00
Karl Heuer
2e2b8e220e (popup_get_selection): Force deactivation if key pressed.
New arg `id'.
(xdialog_show, xmenu_show): Pass new arg to popup_get_selection.
1995-05-26 22:47:07 +00:00
Karl Heuer
cc17e9bf31 (xmenu_show, xdialog_show): Increment widget_id_tick
in the same was as in xfns.c.  Use LWLIB_ID type where appropriate.
(set_frame_menubar, free_frame_menubar): Add casts to LWLIB_ID.
1995-05-25 16:01:12 +00:00
Karl Heuer
88d4f6ec12 (Fx_popup_dialog): Treat (menu-bar) like t, for POSITION. 1995-05-24 21:43:00 +00:00
Karl Heuer
1d1c15673e (set_frame_menubar): Set menubar_height field. 1995-05-24 04:42:52 +00:00
Karl Heuer
c63f695277 (xmenu_show, menubar_selection_callback): Move declaration
of entry to an outer block, to guarantee its value is preserved.
1995-05-02 04:50:07 +00:00
Karl Heuer
9572375bcc (popup_get_selection): Use x_non_menubar_window_to_frame.
Either queue or dispatch the event, but not both.
(dialog_selection_callback): Clear popup_activated_flag.

(Fx_popup_menu): If POSITION is just (menu-bar), use the
current mouse position.
(menubar_selection_callback): Use (menu-bar) instead of 'menu-bar.
1995-04-29 04:21:23 +00:00
Karl Heuer
29e460bd82 (xmenu_show): x_mouse_leave needs an arg. 1995-04-24 16:55:03 +00:00
Karl Heuer
f8c2630dfb (Fx_popup_dialog): Don't pass menubarp arg to xdialog_show. 1995-04-20 18:37:39 +00:00
Richard M. Stallman
673a6211ed (xmenu_show, xdialog_show): Delete menubarp arg.
(Fx_popup_menu): Don't compute menubarp.
1995-04-19 06:09:42 +00:00
Richard M. Stallman
aa669defdd (popup_get_selection): Queue up events that aren't
for the menu, and process them afterward.  New arg dpyinfo.
(set_frame_menubar): Use inhibit_garbage_collection.
[USE_X_TOOLKIT] (xmenu_show): Delete the queue code here.
Pass dpyinfo to popup_get_selection.
Don't call lw_destroy_all_widgets.
[USE_X_TOOLKIT] (xdialog_show): Simplify using popup_get_selection.
1995-04-14 18:36:40 +00:00
Richard M. Stallman
01d5e8928a (menubar_selection_callback, dialog_selection_callback)
(single_submenu): Cast pointer to int by way of EMACS_INT.
1995-04-07 19:02:49 +00:00
Richard M. Stallman
bd3a4da283 (frame_vector): New static variable.
(syms_of_xmenu): staticpro it.
(frame_vector_add_frame): New function.
(set_frame_menubar): Use frame_vector; use index as the widget id.
(free_frame_menubar): Likewise.  Remove the frame from frame_vector.
(menubar_selection_callback): Use frame_vector to turn id into frame.
1995-04-07 03:39:07 +00:00
Richard M. Stallman
46b657e232 (Fx_popup_menu): Pass 1 for `insist' arg.
(Fx_popup_dialog): Likewise.
1995-03-26 21:13:19 +00:00
Richard M. Stallman
ac8f8f7d8c (Fx_popup_menu): Init f from selected_frame
before calling mouse_position_hook.
1995-02-25 21:28:36 +00:00
Richard M. Stallman
9257760577 (menu_item_equiv_key): Delete the code that rejected
menu bindings returned by Fwhere_is_internal.
1995-02-23 09:05:08 +00:00
Karl Heuer
4cb35c394a (menubar_selection_callback): frame_or_window field of a menu-bar event now
includes both the frame and the magic cookie.
1995-02-22 06:07:20 +00:00
Richard M. Stallman
9685a93f32 (xmenu_show, both versions): New arg for_click.
(Fx_popup_menu): Compute it and pass it.
1995-02-15 08:06:32 +00:00
Richard M. Stallman
86e00a8a09 (menu_item_equiv_key): If command is an alias,
check only the underlying command for a keyboard equivalent.
1995-02-12 01:22:28 +00:00
Richard M. Stallman
eeee31128d [MSDOS]: #include msdos.h. 1995-01-20 23:37:41 +00:00
Richard M. Stallman
a352a815c4 Don't include ../oldXMenu/XMenu.h if USE_X_TOOLKIT.
(push_menu_item): New arg DEF.
(single_keymap_panes, list_of_items): Pass new arg.
(MENU_ITEMS_ITEM_DEFINITION): New macro.
(MENU_ITEMS_ITEM_LENGTH): Now 5.
[USE_X_TOOLKIT] (xmenu_show): Store 0 in call_data if item def is 0.
(single_submenu): Likewise.

(xmenu_show): Call x_mouse_leave.
1994-12-15 12:16:00 +00:00
Karl Heuer
4d19cb8e06 (set_frame_menubar): Don't copy string during GC risk. 1994-10-27 18:44:47 +00:00
Richard M. Stallman
f1847de368 (xmenu_show): Get the screen number for DisplayHeight
and DisplayWidth.  Use root_window slot in the x_display_info.
1994-10-22 03:51:12 +00:00
Richard M. Stallman
e9a79fb23e (xdialog_show, xmenu_show): Use grabbed field instead of x_mouse_grabbed.
(xmenu_show): Use the screen in FRAME_X_DISPLAY_INFO,
not the display's default screen.
1994-10-20 06:39:00 +00:00
Richard M. Stallman
92280f6793 Use FRAME_X_DISPLAY, not XDISPLAY or x_current_display.
(menu_item_equiv_key): Reject equiv sequences
that start with mouse clicks.
1994-10-19 09:56:48 +00:00
Morten Welinder
87485d6fc9 *** empty log message *** 1994-10-17 08:42:36 +00:00
Richard M. Stallman
3ca702ec5a Delete HAVE_X11 conditionals. 1994-10-15 23:51:54 +00:00
Karl Heuer
33b43fa6ee (single_keymap_panes, Fx_popup_menu): Don't use XFASTINT as an lvalue. 1994-10-04 19:49:16 +00:00
Karl Heuer
a39f04772b (Fx_popup_menu, Fx_popup_dialog): Use new accessor macros instead of calling
XSET directly.
1994-10-04 19:47:37 +00:00
Richard M. Stallman
8ed87156cf (widget_id_tick): Move definition into conditional.
(syms_of_xmenu): Conditionalize initialization of widget_id_tick.

(last_menu_bar_item_end): Var deleted.
(this_menu_bar_item_beg, this_menu_bar_item_end): Vars deleted.
(other_menu_bar_item_p, unread_menu_bar_button)
(check_mouse_other_menu_bar): Functions deleted.
(last_event_timestamp, Vdouble_click_time, Vmouse_depressed): Decls deleted.
(xmenu_show): XMENU_FOO conditional and its contets deleted.
1994-10-04 19:37:55 +00:00
Paul Reilly
c98fcf4b7e (popup_get_selection): Remove BLOCK_INPUT, UNBLOCK_INPUT since the
calls to popup_get_selection() provide the protection.
1994-10-02 21:23:53 +00:00
Paul Reilly
4dedbfe0bf (widget_id_tick): Renamed from popup_id_tick.
(popup_get_selection, popup_activated, popup_activate_callback,
menubar_selection_callback, popup_deactivate_callback,
single_submenu): New or replaced functions.

(popup_activated_flag): New variable.

(dispatch_dummy_expose, event_is_in_menu_item, map_event_to_object):
Removed.

(update_frame_menubar): Use lw_refigure_widget to provide widget set
independence.

(set_frame_menubar): Use lw_allow_resizing to control unsightly Motif
menubar resizing in a widget set independent fashion.

(xmenu_show): Removed menubar handling code, since that is now done in
lwlib.  Display a popup menu title centered and followed by two
separators.  Use lw_popup_menu() to display the menu.  Use
popup_get_selection() to deal with X11 event handling while the menu
is posted.
1994-10-02 15:51:13 +00:00