diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-04-28 20:08:46 +0200 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-04-28 20:08:46 +0200 |
| commit | bf57c4cf3009102b60c00e53349becc7f2ba6911 (patch) | |
| tree | b88aed6ec3c8dfa1766908774b0fc7f15800166e /plugins/hotkeys | |
| parent | 491cf37413966c33b90edf59614665278011fa66 (diff) | |
handle all combinations of num/caps/scroll lock modifiers in hotkeys plugin
Diffstat (limited to 'plugins/hotkeys')
| -rw-r--r-- | plugins/hotkeys/hotkeys.c | 42 |
1 files changed, 32 insertions, 10 deletions
diff --git a/plugins/hotkeys/hotkeys.c b/plugins/hotkeys/hotkeys.c index 67024669..3a27b237 100644 --- a/plugins/hotkeys/hotkeys.c +++ b/plugins/hotkeys/hotkeys.c @@ -264,11 +264,22 @@ read_config (Display *disp) // need to grab it here to prevent gdk_x_error from being called while we're // doing it on other thread for (i = 0; i < command_count; i++) { - XGrabKey (disp, commands[i].keycode, commands[i].modifier, DefaultRootWindow (disp), False, GrabModeAsync, GrabModeAsync); - XGrabKey (disp, commands[i].keycode, commands[i].modifier|LockMask, DefaultRootWindow (disp), False, GrabModeAsync, GrabModeAsync); - XGrabKey (disp, commands[i].keycode, commands[i].modifier|Mod2Mask, DefaultRootWindow (disp), False, GrabModeAsync, GrabModeAsync); - XGrabKey (disp, commands[i].keycode, commands[i].modifier|Mod3Mask, DefaultRootWindow (disp), False, GrabModeAsync, GrabModeAsync); - XGrabKey (disp, commands[i].keycode, commands[i].modifier|Mod5Mask, DefaultRootWindow (disp), False, GrabModeAsync, GrabModeAsync); + for (int f = 0; f < 16; f++) { + uint32_t flags = 0; + if (f & 1) { + flags |= LockMask; + } + if (f & 2) { + flags |= Mod2Mask; + } + if (f & 4) { + flags |= Mod3Mask; + } + if (f & 8) { + flags |= Mod5Mask; + } + XGrabKey (disp, commands[i].keycode, commands[i].modifier | flags, DefaultRootWindow (disp), False, GrabModeAsync, GrabModeAsync); + } } } @@ -300,11 +311,22 @@ hotkeys_event_loop (void *unused) { trace ("hotkeys: reinitializing\n"); XSetErrorHandler (x_err_handler); for (int i = 0; i < command_count; i++) { - XUngrabKey (disp, commands[i].keycode, commands[i].modifier, DefaultRootWindow (disp)); - XUngrabKey (disp, commands[i].keycode, commands[i].modifier|LockMask, DefaultRootWindow (disp)); - XUngrabKey (disp, commands[i].keycode, commands[i].modifier|Mod2Mask, DefaultRootWindow (disp)); - XUngrabKey (disp, commands[i].keycode, commands[i].modifier|Mod3Mask, DefaultRootWindow (disp)); - XUngrabKey (disp, commands[i].keycode, commands[i].modifier|Mod5Mask, DefaultRootWindow (disp)); + for (int f = 0; f < 16; f++) { + uint32_t flags = 0; + if (f & 1) { + flags |= LockMask; + } + if (f & 2) { + flags |= Mod2Mask; + } + if (f & 4) { + flags |= Mod3Mask; + } + if (f & 8) { + flags |= Mod5Mask; + } + XUngrabKey (disp, commands[i].keycode, commands[i].modifier | flags, DefaultRootWindow (disp)); + } } memset (commands, 0, sizeof (commands)); command_count = 0; |