From 6f57b704e7fc8c6b0b74f34a7e150e920d0b65f4 Mon Sep 17 00:00:00 2001 From: tsxv478 Date: Fri, 14 Mar 2025 20:00:02 +0300 Subject: grabkeys: Grab all keycodes --- dwm.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'dwm.c') 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); } } -- cgit v1.2.3