mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 02:31:03 -08:00
Code Issues Projects Releases Wiki Activity

* xmenu.c (popup_get_selection): Only pop down dialogs

Browse source 
on C-g and Escape.
This commit is contained in:
Jan Djärv 2004-12-27 20:34:03 +00:00
parent e2a57f2890
commit 33385c6fa0
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2004-12-27 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* xmenu.c (popup_get_selection): Only pop down dialogs
on C-g and Escape.
2004-12-27 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* dispextern.h: Change HAVE_CARBON to MAC_OS.

15
src/xmenu.c
View file

@ -1232,25 +1232,16 @@ popup_get_selection (initial_event, dpyinfo, id, do_timers, down_on_keypress)
event.xbutton.state = 0;
#endif
}
/* If the user presses a key that doesn't go to the menu,
deactivate the menu.
The user is likely to do that if we get wedged.
All toolkits now pop down menus on ESC.
For dialogs however, the focus may not be on the dialog, so
in that case, we pop down. */
/* Pop down on C-g and Escape. */
else if (event.type == KeyPress
&& down_on_keypress
&& dpyinfo->display == event.xbutton.display)
{
KeySym keysym = XLookupKeysym (&event.xkey, 0);
/* Pop down on C-g. */
if (keysym == XK_g && (event.xkey.state & ControlMask) != 0)
if ((keysym == XK_g && (event.xkey.state & ControlMask) != 0)
|| keysym == XK_Escape) /* Any escape, ignore modifiers. */
popup_activated_flag = 0;
if (!IsModifierKey (keysym)
&& x_any_window_to_frame (dpyinfo, event.xany.window) != NULL)
popup_activated_flag = 0;
}
x_dispatch_event (&event, event.xany.display);