diff options
| author | okan | 2012-05-16 01:04:36 +0000 |
|---|---|---|
| committer | okan | 2012-05-16 01:04:36 +0000 |
| commit | ec7333262c7838cbfe2490d704f53de385dbace2 (patch) | |
| tree | 29088366d9a849cf921427b0552f558d5d4518d5 /xutil.c | |
| parent | c3c3502b6de9fecee3c432674128c3121bf83d34 (diff) | |
| download | cwm-ec7333262c7838cbfe2490d704f53de385dbace2.tar.gz | |
convert from deprecated XKeycodeToKeysym to XkbKeycodeToKeysym
ok sthen@
Diffstat (limited to 'xutil.c')
| -rw-r--r-- | xutil.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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++) |