diff options
| author | Po Lu <luangruo@yahoo.com> | 2022-01-29 18:53:28 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2022-01-29 18:57:08 +0800 |
| commit | e380fb509b1c506e5745eafc61e053ca6455fe62 (patch) | |
| tree | 1f265140fe9b966361fbf4b3a9f39cbbc584e5f9 /src/menu.c | |
| parent | 0a5ece3da157c5a33023dfdf6211fc34015f197d (diff) | |
| download | emacs-e380fb509b1c506e5745eafc61e053ca6455fe62.tar.gz emacs-e380fb509b1c506e5745eafc61e053ca6455fe62.tar.bz2 emacs-e380fb509b1c506e5745eafc61e053ca6455fe62.zip | |
Fix unrelated help text tooltips if a popup is shown during the delay
* doc/lispref/frames.texi (Pop-Up Menus): Document new hook.
* etc/NEWS: Announce `x-pre-popup-menu-hook'.
* lisp/tooltip.el (tooltip-mode): Make sure `tooltip-hide' is
run before any popup menu is displayed to prevent unrelated help
text from obscuring the popup menu if it pops up during the
tooltip delay.
* src/menu.c (x_popup_menu_1): Run said hook right before the
popup menu is displayed.
(syms_of_menu): New hook `x-pre-popup-menu-hook'.
Diffstat (limited to 'src/menu.c')
| -rw-r--r-- | src/menu.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/menu.c b/src/menu.c index 18ecaf0b0ba..449f0b44aec 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1395,6 +1395,8 @@ x_popup_menu_1 (Lisp_Object position, Lisp_Object menu) record_unwind_protect_void (discard_menu_items); #endif + run_hook (Qx_pre_popup_menu_hook); + /* Display them in a menu, but not if F is the initial frame that doesn't have its hooks set (e.g., in a batch session), because such a frame cannot display menus. */ @@ -1408,7 +1410,11 @@ x_popup_menu_1 (Lisp_Object position, Lisp_Object menu) discard_menu_items (); #endif -#ifdef HAVE_NTGUI /* FIXME: Is it really w32-specific? --Stef */ +#ifdef HAVE_NTGUI /* W32 specific because other terminals clear + the grab inside their `menu_show_hook's if + it's actually required (i.e. there isn't a + way to query the buttons currently held down + after XMenuActivate). */ if (FRAME_W32_P (f)) FRAME_DISPLAY_INFO (f)->grabbed = 0; #endif @@ -1602,6 +1608,14 @@ syms_of_menu (void) staticpro (&menu_items); DEFSYM (Qhide, "hide"); + DEFSYM (Qx_pre_popup_menu_hook, "x-pre-popup-menu-hook"); + + DEFVAR_LISP ("x-pre-popup-menu-hook", Vx_pre_popup_menu_hook, + doc: /* Hook run before `x-popup-menu' displays a popup menu. +It is only run before the menu is really going to be displayed. It +won't be run if `x-popup-menu' fails or returns for some other reason +(such as the keymap is invalid). */); + Vx_pre_popup_menu_hook = Qnil; defsubr (&Sx_popup_menu); defsubr (&Sx_popup_dialog); |