treverting the xkb dependency, I don't care if this function is deprecated, it … | |
git clone git://src.adamsgaard.dk/dwm | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 3aabc08ede9c6496720124be8ee34c8b39735239 | |
parent d456617f0eb93df0ec8eb81ff6e04ca988c09c60 | |
Author: [email protected] <unknown> | |
Date: Sun, 18 Nov 2012 16:39:56 +0100 | |
reverting the xkb dependency, I don't care if this function is deprecated, it s… | |
Diffstat: | |
M dwm.c | 11 ++--------- | |
1 file changed, 2 insertions(+), 9 deletions(-) | |
--- | |
diff --git a/dwm.c b/dwm.c | |
t@@ -36,7 +36,6 @@ | |
#include <X11/Xlib.h> | |
#include <X11/Xproto.h> | |
#include <X11/Xutil.h> | |
-#include <X11/XKBlib.h> | |
#ifdef XINERAMA | |
#include <X11/extensions/Xinerama.h> | |
#endif /* XINERAMA */ | |
t@@ -281,7 +280,7 @@ static void (*handler[LASTEvent]) (XEvent *) = { | |
[UnmapNotify] = unmapnotify | |
}; | |
static Atom wmatom[WMLast], netatom[NetLast]; | |
-static Bool running = True, usexkb; | |
+static Bool running = True; | |
static Cursor cursor[CurLast]; | |
static Display *dpy; | |
static DC dc; | |
t@@ -1093,10 +1092,7 @@ keypress(XEvent *e) { | |
XKeyEvent *ev; | |
ev = &e->xkey; | |
- if(usexkb) | |
- keysym = XkbKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0, 0); | |
- else | |
- keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); | |
+ keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); | |
for(i = 0; i < LENGTH(keys); i++) | |
if(keysym == keys[i].keysym | |
&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) | |
t@@ -1606,7 +1602,6 @@ setmfact(const Arg *arg) { | |
void | |
setup(void) { | |
XSetWindowAttributes wa; | |
- int dummy = 0, xkbmajor = XkbMajorVersion, xkbminor = XkbMinorVersion; | |
/* clean up any zombies immediately */ | |
sigchld(0); | |
t@@ -1661,8 +1656,6 @@ setup(void) { | |
|EnterWindowMask|LeaveWindowMask|StructureNotifyMask|P… | |
XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa); | |
XSelectInput(dpy, root, wa.event_mask); | |
- /* init xkb */ | |
- usexkb = XkbQueryExtension(dpy, &dummy, &dummy, &dummy, &xkbmajor, &xk… | |
grabkeys(); | |
} | |