X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=2bf0ba0be8a365cc81480c554af3404c7f84707a;hb=85da53785614bcaa626cd1346ce8753291b01760;hp=ec872285a4c05c8b8de3e71d6f4259fc2f3e22a3;hpb=0f26de991f742d548e024a2dadcbfa3a7db8d4b2;p=dwm.git

diff --git a/dwm.c b/dwm.c
index ec87228..2bf0ba0 100644
--- a/dwm.c
+++ b/dwm.c
@@ -751,25 +751,27 @@ grabbuttons(Client *c, Bool focused) {
 void
 grabkeys(void) {
 	unsigned int i, j;
-	unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
-	KeyCode code;
 	XModifierKeymap *modmap;
 
-	/* init modifier map */
+	/* update modifier map */
 	modmap = XGetModifierMapping(dpy);
 	for(i = 0; i < 8; i++)
-		for(j = 0; j < modmap->max_keypermod; j++) {
+		for(j = 0; j < modmap->max_keypermod; j++)
 			if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock))
 				numlockmask = (1 << i);
-		}
 	XFreeModifiermap(modmap);
 
-	XUngrabKey(dpy, AnyKey, AnyModifier, root);
-	for(i = 0; i < LENGTH(keys); i++) {
-		code = XKeysymToKeycode(dpy, keys[i].keysym);
-		for(j = 0; j < LENGTH(modifiers); j++)
-			XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True,
-			         GrabModeAsync, GrabModeAsync);
+	{ /* grab keys */
+		unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+		KeyCode code;
+
+		XUngrabKey(dpy, AnyKey, AnyModifier, root);
+		for(i = 0; i < LENGTH(keys); i++) {
+			code = XKeysymToKeycode(dpy, keys[i].keysym);
+			for(j = 0; j < LENGTH(modifiers); j++)
+				XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True,
+					 GrabModeAsync, GrabModeAsync);
+		}
 	}
 }
 
@@ -1373,8 +1375,6 @@ setup(void) {
 	XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
 	XSelectInput(dpy, root, wa.event_mask);
 
-
-	/* grab keys */
 	grabkeys();
 }