summaryrefslogtreecommitdiff
path: root/oldXMenu
diff options
context:
space:
mode:
authorJan Djärv <jan.h.d@swipnet.se>2004-12-27 15:23:22 +0000
committerJan Djärv <jan.h.d@swipnet.se>2004-12-27 15:23:22 +0000
commitd41b00c7ca5f9c17e32e5d2a7186d0b226ef51a4 (patch)
tree3e15280c6547875311bcfa60f2fa84892a102f62 /oldXMenu
parent37337bd7bfcfc132f109beeffeded0653ca31dd8 (diff)
downloademacs-d41b00c7ca5f9c17e32e5d2a7186d0b226ef51a4.tar.gz
* Activate.c (XMenuActivate): Return XM_NO_SELECT if Escape or C-g
was pressed.
Diffstat (limited to 'oldXMenu')
-rw-r--r--oldXMenu/Activate.c14
-rw-r--r--oldXMenu/ChangeLog5
2 files changed, 19 insertions, 0 deletions
diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index 363b225a355..2f81299cbb6 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -81,6 +81,7 @@
#include <config.h>
#include "XMenuInt.h"
+#include <X11/keysym.h>
/* For debug, set this to 0 to not grab the keyboard on menu popup */
int x_menu_grab_keyboard = 1;
@@ -131,6 +132,7 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
Window root, child;
int root_x, root_y, win_x, win_y;
unsigned int mask;
+ KeySym keysym;
/*
* Define and allocate a foreign event queue to hold events
@@ -458,6 +460,18 @@ XMenuActivate(display, menu, p_num, s_num, x_pos, y_pos, event_mask, data,
}
selection = True;
break;
+ case KeyPress:
+ case KeyRelease:
+ keysym = XLookupKeysym (&event.xkey, 0);
+
+ /* Pop down on C-g and Escape. */
+ if ((keysym == XK_g && (event.xkey.state & ControlMask) != 0)
+ || keysym == XK_Escape) /* Any escape, ignore modifiers. */
+ {
+ ret_val = XM_NO_SELECT;
+ selection = True;
+ }
+ break;
default:
/*
* If AEQ mode is enabled then queue the event.
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index ab86c364736..31a786cc23a 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-27 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
+
+ * Activate.c (XMenuActivate): Return XM_NO_SELECT if Escape or C-g
+ was pressed.
+
2004-11-12 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* XMenu.h (XMenuActivateSetWaitFunction): New function.