1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-04 14:40:54 -08:00
Commit graph

316 commits

Author SHA1 Message Date
Andreas Schwab
9397721973 (Fx_popup_menu): Initialize selection. 2006-11-19 01:24:41 +00:00
Chong Yidong
b79b8a1c52 (popup_activated): Define outside HAVE_MENUS. 2006-11-12 17:52:29 +00:00
Chong Yidong
e3135734b2 (Fmenu_or_popup_active_p): Define outside HAVE_MENUS.
Return nil if building without menus.
2006-11-06 16:47:33 +00:00
Chong Yidong
718aeeb80f Add a comment. 2006-11-05 17:30:30 +00:00
Eli Zaretskii
508fb067d7 (Fmenu_or_popup_active_p): New function.
(syms_of_xmenu): Defsubr it.
2006-11-05 12:18:47 +00:00
Chong Yidong
8630721ec9 * xmenu.c (Fmenu_bar_open): Declare variable before BLOCK_INPUT to
avoid gcc 2.95 error.
2006-11-04 03:21:40 +00:00
Stefan Monnier
de9855d5a3 (syms_of_xmenu): Use Ffset rather than Fdefalias, since
Fdefalias is not declared in any *.h file.
2006-10-10 14:22:46 +00:00
Chong Yidong
98a20c65df * xterm.c (x_initialize): Don't install Xt event timer here.
(x_timeout_atimer_activated_flag): New var.
	(x_activate_timeout_atimer): New function to install Xt timer.
	(x_send_scroll_bar_event, x_process_timeouts): Use it.

	* xmenu.c (x_menu_set_in_use, popup_activate_callback)
	(create_and_show_popup_menu, create_and_show_dialog): Use it.

	* xterm.h (x_activate_timeout_atimer): prototype.
2006-09-13 22:39:23 +00:00
Richard M. Stallman
4248ca0c2f (Vmenu_updating_frame): Don't define here.
(syms_of_xmenu): Don't DEFVAR it here.
2006-09-09 17:51:17 +00:00
Jan Djärv
2e92a7cbd6 * xmenu.c (syms_of_xmenu): Make accelerate-menu an alias for
menu-bar-open.
2006-06-01 08:57:37 +00:00
Jan Djärv
ebe80e837d * xmenu.c (Fmenu_bar_open, syms_of_xmenu): Change menu-bar-start to
menu-bar-open.
2006-06-01 06:39:44 +00:00
Andreas Schwab
57d671b4c7 (Fmenu_bar_start): Return a value. 2006-05-30 16:12:49 +00:00
Jan Djärv
22badffeec (Fmenu_bar_start): New function for USE_GTK and USE_X_TOOLKIT. 2006-05-29 07:11:35 +00:00
Andreas Schwab
64ec8b2f3d (restore_menu_items): Return a value. 2006-05-01 22:58:47 +00:00
Richard M. Stallman
510d5bf659 Comment changes. 2006-04-18 21:05:45 +00:00
Richard M. Stallman
1fc4d4635c (restore_menu_items, save_menu_items): New fns.
(set_frame_menubar): Use save_menu_items.  Save updated vector in
the frame before unwinding it.  Don't use unuse_menu_items.  Don't
use discard_menu_items.
(digest_single_submenu): Abort if an item is not in a pane.
(init_menu_items): Put the error check at the top.
2006-04-18 21:01:16 +00:00
Richard M. Stallman
e33c22a563 (digest_single_submenu): When pane_string is empty, do initialize save_wv. 2006-02-19 23:41:31 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
Richard M. Stallman
d130d1298b (xmenu_show): Call inhibit_garbage_collection. 2005-12-22 23:30:36 +00:00
Juri Linkov
76a3c2cda5 (Fx_popup_menu): Set Vmenu_updating_frame to f if
position is non-nil, else set it to nil.
2005-12-20 21:37:36 +00:00
Jan Djärv
b79c8219e8 * xmenu.c (menubar_selection_callback): Do nothing if the callback
is for an unselected radio menu item.
2005-12-12 08:08:43 +00:00
Thien-Thi Nguyen
0b5538bd85 Update years in copyright notice; nfc. 2005-08-07 12:33:19 +00:00
Lute Kamstra
4fc5845fe8 Update FSF's address. 2005-07-04 16:49:24 +00:00
Kim F. Storm
89f2614d96 * composite.c (compose_chars_in_text):
* eval.c (do_autoload):
* macmenu.c (set_frame_menubar):
* process.c (read_process_output, exec_sentinel):
* xmenu.c (set_frame_menubar):
* xdisp.c (prepare_menu_bars, update_menu_bar, update_tool_bar):
* w32menu.c (set_frame_menubar):
Use record_unwind_save_match_data.
Rename restore_match_data to restore_search_regs.
2005-06-08 22:33:36 +00:00
Richard M. Stallman
1ca1f3f6c9 (popup_get_selection): Undo previous change. 2005-06-06 12:56:53 +00:00
Richard M. Stallman
196ac78ce1 (popup_get_selection): Click not in menu deactivates menu. 2005-06-04 18:09:16 +00:00
Nick Roberts
6a040d6a2c (Fx_popup_dialog): Add a third boolean argument to
select frame title ("Question"/"Information").
(xdialog_show): Use it.
2005-05-24 03:45:42 +00:00
Richard M. Stallman
8faf605706 Don't include signal.h. 2005-05-10 09:18:02 +00:00
Luc Teirlinck
c05fe5d549 (Fx_popup_menu, Fx_popup_dialog): Doc fixes. 2005-05-05 22:31:36 +00:00
Luc Teirlinck
e3fbac653d (Fx_popup_menu): Doc fix. 2005-05-02 01:39:30 +00:00
Richard M. Stallman
be6ed24aba [not HAVE_X_TOOLKIT] (xmenu_show):
If user cancels the menu, quit unless FOR_CLICK.
2005-05-01 18:49:28 +00:00
Thien-Thi Nguyen
999cdb8fc7 (Fx_popup_menu): Initialize error_name to NULL. 2005-04-18 09:41:15 +00:00
Thien-Thi Nguyen
59cfb104f6 Remove eol whitespace; nfc. 2005-04-18 09:36:06 +00:00
Jan Djärv
ff18668fa0 * xmenu.c (create_and_show_popup_menu): Just remove menu and return
if it failed to pop up (Gnome "show pointer on ctrl" option makes
menus fail to pop up).
2005-03-24 18:53:43 +00:00
Stefan Monnier
b64b78ccfc (ENCODE_MENU_STRING) [HAVE_X_I18N]: Use ENCODE_SYSTEM. 2005-03-17 01:37:31 +00:00
Stefan Monnier
8af9fa555a (ENCODE_MENU_STRING): Explicitly use string_make_unibyte.
(list_of_panes, list_of_items, Fx_popup_menu): Use XCAR/XCDR.
(digest_single_submenu, xmenu_show): Use ENCODE_MENU_STRING.
2005-03-12 23:29:04 +00:00
Jan Djärv
96ff33d606 Forgot to remove debug code. 2005-02-03 19:57:33 +00:00
Jan Djärv
81f098775c * xmenu.c (menubar_selection_callback): Force out GTK buffered
events so the menu event comes after them.  This is to prevent sit-for
	from exiting on buffered events directly after a menu selection,
	lisp code for Help => About Emacs uses sit-for.
2005-02-03 19:49:43 +00:00
Jan Djärv
9b85e63d34 * xmenu.c (create_and_show_popup_menu): Pass zero as button to
gtk_menu_popup if not for_click, so callbacks for the menu are called.
2005-01-07 20:50:46 +00:00
Jan Djärv
95bdef2ed4 (popup_get_selection): Remove parameter down_on_keypress.
(create_and_show_popup_menu, create_and_show_dialog): Remove
parameter down_on_keypress to popup_get_selection.
2004-12-27 20:56:56 +00:00
Jan Djärv
33385c6fa0 * xmenu.c (popup_get_selection): Only pop down dialogs
on C-g and Escape.
2004-12-27 20:34:03 +00:00
Richard M. Stallman
c0b0f54b8c Indentation fix. 2004-12-27 15:58:25 +00:00
Jan Djärv
9f6fcdc516 * xmenu.c (popup_get_selection): Pop down on C-g.
(set_frame_menubar): Install translations for Lucid/Motif/Lesstif that
pops down menu on C-g.
(xdialog_show): If dialog popped down and no button in the dialog was
pushed, call Fsignal to quit.
(xmenu_show): In no toolkit version, if menu returns NO_SELECT call
Fsignal to quit.

* xfns.c (Fx_file_dialog): Motif/Lesstif version:  Pop down on C-g.

* gtkutil.c (xg_initialize): Install bindings for C-g so that
dialogs and menus pop down.
2004-12-27 15:24:12 +00:00
Jan Djärv
453a4f1b8a * xmenu.c (Fx_popup_menu): Correct documentation about position.
(xmenu_show): Do not call XTranslateCoordinates.  Adjust position
if not given by a mouse click to correspond with x-popup-menu
documentation.
2004-12-07 13:11:59 +00:00
Jan Djärv
5ae53dcfca * xmenu.c (x_menu_in_use): Removed.
(x_menu_set_in_use): Also set popup_activated_flag.

* xfns.c (Fx_file_dialog): Call popup_activated instead of
x_menu_in_use.  Call x_menu_set_in_use in Motif version also.

* xterm.h: (x_menu_in_use): Removed.
2004-11-16 20:52:32 +00:00
Jan Djärv
234abfce95 Removed fprintf 2004-11-14 10:59:31 +00:00
Jan Djärv
a130b9017f * xmenu.c (pop_down_menu): Remove global variable current_menu,
extract pointer from arg with XSAVE_VALUE.
(create_and_show_popup_menu, create_and_show_dialog,
xmenu_show): Construct arg to record_unwind_protect with
make_save_value.
2004-11-14 10:55:45 +00:00
Jan Djärv
b393528900 * xfns.c (Fx_file_dialog): Call x_menu_in_use and x_menu_set_in_use.
Record unwind with clean_up_file_dialog.

* xterm.h: Declare x_menu_in_use, x_menu_set_in_use,
x_menu_wait_for_event.

* xmenu.c (x_menu_in_use, x_menu_set_in_use): New functions.
2004-11-13 23:29:11 +00:00
Jan Djärv
af89e87102 * xmenu.c (unuse_menu_items, pop_down_menu): Arg is of type
Lisp_Object.
(popup_get_selection): Move unwind protect ...
(create_and_show_popup_menu, create_and_show_dialog): ... to here.
Move destroy of widget to pop_down_menu.
(popup_widget_loop): Move unwind protect ...
(create_and_show_popup_menu, create_and_show_dialog): ... to here.
Move destroy of widget to pop_down_menu.
(pop_down_menu): BLOCK_INPUT and destroy widget/window.
(xmenu_show): record unwind pop_down_menu.  Move XMenuDestroy,
x_mouse_leave and grabbed = 0 to pop_down_menu.
2004-11-13 20:18:21 +00:00
Kim F. Storm
b9de078aa6 (pop_down_menu): Return nil. 2004-11-12 13:47:13 +00:00