grabkeys: Grab all keycodesHEADmaster

1 files changed, 20 insertions, 6 deletions

diff --git a/dwm.c b/dwm.c
index 42c43f6..dccbc0a 100644
--- a/dwm.c
+++ b/dwm.c
@@ -1205,14 +1205,28 @@ grabkeys(void)
 	{
 		unsigned int i, j;
 		unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
-		KeyCode code;
+		int kc, kcmin, kcmax, kcper;
+		KeySym keysym, *keysyms;
 
 		XUngrabKey(dpy, AnyKey, AnyModifier, root);
-		for (i = 0; i < LENGTH(keys); i++)
-			if ((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);
+
+		/* retrieve all the keycode -> keysym mappings */
+		XDisplayKeycodes(dpy, &kcmin, &kcmax);
+		keysyms = XGetKeyboardMapping(dpy, kcmin, kcmax - kcmin + 1, &kcper);
+
+		/* only look at the first keysym for each keycode as we handle shifted states */
+		for (kc = kcmin; kc <= kcmax; kc++) {
+			keysym = keysyms[(kc - kcmin) * kcper];
+			for (i = 0; i < LENGTH(keys); i++) {
+				if (keys[i].keysym == keysym) {
+					for (j = 0; j < LENGTH(modifiers); j++) {
+						XGrabKey(dpy, kc, keys[i].mod | modifiers[j], root, True, GrabModeAsync, GrabModeAsync);
+					}
+				}
+			}
+		}
+
+		XFree(keysyms);
 	}
 }