diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2012-05-16 01:04:37 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2012-05-16 01:04:37 +0000 |
| commit | 802381203f7aae4457dc912781b8c3aceed69bac (patch) | |
| tree | 75ec4877c9a3d4e5c114cf8584db229a01f8be3b /app/cwm/xutil.c | |
| parent | 02cf4038d22a75dd5e33cfd73c782a3f674494c8 (diff) | |
convert from deprecated XKeycodeToKeysym to XkbKeycodeToKeysym
ok sthen@
Diffstat (limited to 'app/cwm/xutil.c')
| -rw-r--r-- | app/cwm/xutil.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/cwm/xutil.c b/app/cwm/xutil.c index 8b0704c91..bcd85fbfc 100644 --- a/app/cwm/xutil.c +++ b/app/cwm/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 <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++) |