From ec7333262c7838cbfe2490d704f53de385dbace2 Mon Sep 17 00:00:00 2001 From: okan Date: Wed, 16 May 2012 01:04:36 +0000 Subject: convert from deprecated XKeycodeToKeysym to XkbKeycodeToKeysym ok sthen@ --- xutil.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'xutil.c') diff --git a/xutil.c b/xutil.c index 8b0704c..bcd85fb 100644 --- a/xutil.c +++ b/xutil.c @@ -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 @@ -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++) -- cgit v1.2.3-2-gb3c3