From 998e8e71ba8a69ac3c47db47521aa769a091cb34 Mon Sep 17 00:00:00 2001
From: Ivan Kanakarakis <ivan.kanak@gmail.com>
Date: Thu, 12 Jan 2012 22:35:14 +0200
Subject: rework grabkeys() function

---
 monsterwm.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/monsterwm.c b/monsterwm.c
index f7f510a..26f72d3 100644
--- a/monsterwm.c
+++ b/monsterwm.c
@@ -295,13 +295,12 @@ unsigned long getcolor(const char* color) {
 void grabkeys(void) {
     KeyCode code;
     XUngrabKey(dis, AnyKey, AnyModifier, root);
-    for (unsigned int i=0; i<LENGTH(keys); i++) {
-        code = XKeysymToKeycode(dis, keys[i].keysym);
-        XGrabKey(dis, code, keys[i].mod,                          root, True, GrabModeAsync, GrabModeAsync);
-        XGrabKey(dis, code, keys[i].mod |               LockMask, root, True, GrabModeAsync, GrabModeAsync);
-        XGrabKey(dis, code, keys[i].mod | numlockmask,            root, True, GrabModeAsync, GrabModeAsync);
-        XGrabKey(dis, code, keys[i].mod | numlockmask | LockMask, root, True, GrabModeAsync, GrabModeAsync);
-    }
+
+    unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+    for (unsigned int k=0; k<LENGTH(keys); k++)
+        if ((code = XKeysymToKeycode(dis, keys[k].keysym)))
+            for (unsigned int m=0; m<LENGTH(modifiers); m++)
+                XGrabKey(dis, code, keys[k].mod|modifiers[m], root, True, GrabModeAsync, GrabModeAsync);
 }
 
 void keypress(XEvent *e) {
-- 
cgit v1.3.1