sowm: swap to new keycode to keysym func

This commit is contained in:
Dylan Araps 2019-10-24 23:33:41 +03:00
parent e9df9ac570
commit 35b12c7969
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
2 changed files with 3 additions and 2 deletions

View File

@ -1,4 +1,4 @@
CFLAGS+= -std=c99 -Wall -Wextra -pedantic -Wno-deprecated-declarations CFLAGS+= -std=c99 -Wall -Wextra -pedantic
LDADD+= -lX11 LDADD+= -lX11
LDFLAGS= LDFLAGS=
PREFIX?= /usr PREFIX?= /usr

3
sowm.c
View File

@ -3,6 +3,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/XF86keysym.h> #include <X11/XF86keysym.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/XKBlib.h>
#include <stdlib.h> #include <stdlib.h>
#include <signal.h> #include <signal.h>
#include <unistd.h> #include <unistd.h>
@ -107,7 +108,7 @@ void notify_motion(XEvent *e) {
} }
void key_press(XEvent *e) { void key_press(XEvent *e) {
KeySym keysym = XKeycodeToKeysym(d, e->xkey.keycode, 0); KeySym keysym = XkbKeycodeToKeysym(d, e->xkey.keycode, 0, 0);
for (unsigned int i=0; i < sizeof(keys)/sizeof(*keys); ++i) for (unsigned int i=0; i < sizeof(keys)/sizeof(*keys); ++i)
if (keys[i].mod == e->xkey.state && keys[i].keysym == keysym) if (keys[i].mod == e->xkey.state && keys[i].keysym == keysym)