reverting the xkb dependency, I don't care if this function is deprecated, it seems it breaks other stuff instead.
3aabc08e
1 file(s) · +2 −9
| 36 | 36 | #include <X11/Xlib.h> |
|
| 37 | 37 | #include <X11/Xproto.h> |
|
| 38 | 38 | #include <X11/Xutil.h> |
|
| 39 | - | #include <X11/XKBlib.h> |
|
| 40 | 39 | #ifdef XINERAMA |
|
| 41 | 40 | #include <X11/extensions/Xinerama.h> |
|
| 42 | 41 | #endif /* XINERAMA */ |
|
| 281 | 280 | [UnmapNotify] = unmapnotify |
|
| 282 | 281 | }; |
|
| 283 | 282 | static Atom wmatom[WMLast], netatom[NetLast]; |
|
| 284 | - | static Bool running = True, usexkb; |
|
| 283 | + | static Bool running = True; |
|
| 285 | 284 | static Cursor cursor[CurLast]; |
|
| 286 | 285 | static Display *dpy; |
|
| 287 | 286 | static DC dc; |
|
| 1093 | 1092 | XKeyEvent *ev; |
|
| 1094 | 1093 | ||
| 1095 | 1094 | ev = &e->xkey; |
|
| 1096 | - | if(usexkb) |
|
| 1097 | - | keysym = XkbKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0, 0); |
|
| 1098 | - | else |
|
| 1099 | - | keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); |
|
| 1095 | + | keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); |
|
| 1100 | 1096 | for(i = 0; i < LENGTH(keys); i++) |
|
| 1101 | 1097 | if(keysym == keys[i].keysym |
|
| 1102 | 1098 | && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) |
|
| 1606 | 1602 | void |
|
| 1607 | 1603 | setup(void) { |
|
| 1608 | 1604 | XSetWindowAttributes wa; |
|
| 1609 | - | int dummy = 0, xkbmajor = XkbMajorVersion, xkbminor = XkbMinorVersion; |
|
| 1610 | 1605 | ||
| 1611 | 1606 | /* clean up any zombies immediately */ |
|
| 1612 | 1607 | sigchld(0); |
|
| 1661 | 1656 | |EnterWindowMask|LeaveWindowMask|StructureNotifyMask|PropertyChangeMask; |
|
| 1662 | 1657 | XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa); |
|
| 1663 | 1658 | XSelectInput(dpy, root, wa.event_mask); |
|
| 1664 | - | /* init xkb */ |
|
| 1665 | - | usexkb = XkbQueryExtension(dpy, &dummy, &dummy, &dummy, &xkbmajor, &xkbminor); |
|
| 1666 | 1659 | grabkeys(); |
|
| 1667 | 1660 | } |
|
| 1668 | 1661 | ||