summaryrefslogtreecommitdiff
path: root/openbox/menuframe.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2010-02-11 13:23:54 -0500
committerDana Jansens <danakj@orodu.net>2010-02-11 13:34:46 -0500
commit43d62990e407f409f76f60a405c529f9b15d33f6 (patch)
tree66f551a32e8b8afb1764c28ab49308f042f26d35 /openbox/menuframe.c
parent8f1ea42bb147e2a65cf43dfe7aea864d01faedcd (diff)
don't strip the state for keyboard events
this allows translation of keys not in the base keyboard layout
Diffstat (limited to 'openbox/menuframe.c')
-rw-r--r--openbox/menuframe.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 4ee5d31e..b80bac91 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -27,6 +27,7 @@
#include "openbox.h"
#include "config.h"
#include "obt/prop.h"
+#include "obt/keyboard.h"
#include "obrender/theme.h"
#define PADDING 2
@@ -1262,9 +1263,10 @@ void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state)
GSList *acts = self->entry->data.normal.actions;
ObClient *client = self->frame->client;
ObMenuFrame *frame = self->frame;
+ guint mods = obt_keyboard_only_modmasks(state);
/* release grabs before executing the shit */
- if (!(state & ControlMask)) {
+ if (!(mods & ControlMask)) {
event_cancel_all_key_grabs();
frame = NULL;
}