diff options
| -rw-r--r-- | calmwm.h | 3 | ||||
| -rw-r--r-- | menu.c | 4 | ||||
| -rw-r--r-- | xevents.c | 8 | ||||
| -rw-r--r-- | xutil.c | 10 |
4 files changed, 13 insertions, 12 deletions
@@ -15,12 +15,13 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: calmwm.h,v 1.143 2012/05/13 15:17:13 okan Exp $ + * $OpenBSD: calmwm.h,v 1.144 2012/05/16 01:04:36 okan Exp $ */ #ifndef _CALMWM_H_ #define _CALMWM_H_ +#include <X11/XKBlib.h> #include <X11/Xatom.h> #include <X11/Xft/Xft.h> #include <X11/Xlib.h> @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: menu.c,v 1.33 2011/09/08 12:00:50 okan Exp $ + * $OpenBSD: menu.c,v 1.34 2012/05/16 01:04:36 okan Exp $ */ #include <sys/param.h> @@ -466,7 +466,7 @@ menu_keycode(KeyCode kc, u_int state, enum ctltype *ctl, char *chr) *ctl = CTL_NONE; *chr = '\0'; - ks = XKeycodeToKeysym(X_Dpy, kc, (state & ShiftMask) ? 1 : 0); + ks = XkbKeycodeToKeysym(X_Dpy, kc, 0, (state & ShiftMask) ? 1 : 0); /* Look for control characters. */ switch (ks) { @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: xevents.c,v 1.57 2012/05/13 15:17:13 okan Exp $ + * $OpenBSD: xevents.c,v 1.58 2012/05/16 01:04:36 okan Exp $ */ /* @@ -278,8 +278,8 @@ xev_handle_keypress(XEvent *ee) KeySym keysym, skeysym; int modshift; - keysym = XKeycodeToKeysym(X_Dpy, e->keycode, 0); - skeysym = XKeycodeToKeysym(X_Dpy, e->keycode, 1); + keysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 0); + skeysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 1); /* we don't care about caps lock and numlock here */ e->state &= ~(LockMask | Mod2Mask); @@ -327,7 +327,7 @@ xev_handle_keyrelease(XEvent *ee) sc = screen_fromroot(e->root); cc = client_current(); - keysym = XKeycodeToKeysym(X_Dpy, e->keycode, 0); + keysym = XkbKeycodeToKeysym(X_Dpy, e->keycode, 0, 0); if (keysym != XK_Alt_L && keysym != XK_Alt_R) return; @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: xutil.c,v 1.38 2012/05/13 15:15:54 okan Exp $ + * $OpenBSD: xutil.c,v 1.39 2012/05/16 01:04:36 okan Exp $ */ #include <sys/param.h> @@ -94,8 +94,8 @@ xu_key_grab(Window win, int mask, int keysym) int i; code = XKeysymToKeycode(X_Dpy, keysym); - if ((XKeycodeToKeysym(X_Dpy, code, 0) != keysym) && - (XKeycodeToKeysym(X_Dpy, code, 1) == keysym)) + if ((XkbKeycodeToKeysym(X_Dpy, code, 0, 0) != keysym) && + (XkbKeycodeToKeysym(X_Dpy, code, 0, 1) == keysym)) mask |= ShiftMask; for (i = 0; i < nitems(ign_mods); i++) @@ -110,8 +110,8 @@ xu_key_ungrab(Window win, int mask, int keysym) int i; code = XKeysymToKeycode(X_Dpy, keysym); - if ((XKeycodeToKeysym(X_Dpy, code, 0) != keysym) && - (XKeycodeToKeysym(X_Dpy, code, 1) == keysym)) + if ((XkbKeycodeToKeysym(X_Dpy, code, 0, 0) != keysym) && + (XkbKeycodeToKeysym(X_Dpy, code, 0, 1) == keysym)) mask |= ShiftMask; for (i = 0; i < nitems(ign_mods); i++) |