From 8aa21b03114a62f4113d0b9410649ca13692886e Mon Sep 17 00:00:00 2001 From: bakkeby Date: Fri, 18 Sep 2020 10:39:07 +0200 Subject: [PATCH] XKeycodeToKeysym --> XGetKeyboardMapping (XKeycodeToKeysym is allegedly deprecated) --- dwm.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dwm.c b/dwm.c index d9776f6..55d825f 100644 --- a/dwm.c +++ b/dwm.c @@ -2054,16 +2054,18 @@ keypress(XEvent *e) #endif // KEYMODES_PATCH { unsigned int i; - KeySym keysym; + int keysyms_return; + KeySym* keysym; XKeyEvent *ev; ev = &e->xkey; - keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); + keysym = XGetKeyboardMapping(dpy, (KeyCode)ev->keycode, 1, &keysyms_return); for (i = 0; i < LENGTH(keys); i++) - if (keysym == keys[i].keysym - && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) - && keys[i].func) + if (*keysym == keys[i].keysym + && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) + && keys[i].func) keys[i].func(&(keys[i].arg)); + XFree(keysym); } void