summaryrefslogtreecommitdiff
path: root/openbox/event.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-04-25 18:26:02 +0000
committerDana Jansens <danakj@orodu.net>2007-04-25 18:26:02 +0000
commitb5dbe857db4d691b5a909a1e596f15cdc80c633a (patch)
treed7602f0b0f4cba0610b4f774e0996b98b40f7a4e /openbox/event.c
parent0c41ab3c208970a68e9d0e0d0471c450542e23a3 (diff)
dont go to disabled menu entries with keyboard shortcuts
fix some rendering of shortcuts
Diffstat (limited to 'openbox/event.c')
-rw-r--r--openbox/event.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/openbox/event.c b/openbox/event.c
index 4a60194b..10b7816c 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1331,7 +1331,8 @@ static void event_handle_menu_shortcut(XEvent *ev)
ObMenuEntryFrame *e = it->data;
gunichar entrykey = 0;
- if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL)
+ if (e->entry->type == OB_MENU_ENTRY_TYPE_NORMAL &&
+ e->entry->data.normal.enabled)
entrykey = e->entry->data.normal.shortcut;
else if (e->entry->type == OB_MENU_ENTRY_TYPE_SUBMENU)
entrykey = e->entry->data.submenu.submenu->shortcut;