From: Peter Hutterer Date: Tue, 21 Jul 2009 06:20:03 +0000 (+1000) Subject: test-xi2: Update to keycode grabs instead of keysym grabs. X-Git-Url: https://diplodocus.org/git/xorg-xinput/commitdiff_plain/10a5596e9cd6dbca0826929e03e9495703279822?ds=sidebyside;hp=6aa2dbd555ca4d659acbebffabe28bf648eed32d test-xi2: Update to keycode grabs instead of keysym grabs. Signed-off-by: Peter Hutterer --- diff --git a/configure.ac b/configure.ac index b4ca28b..13fffed 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ XORG_CWARNFLAGS PKG_CHECK_MODULES(XINPUT, x11 xext [xi >= 1.2] [inputproto >= 1.5]) # XI2 support -PKG_CHECK_MODULES(XI2, [xi >= 1.2.99.2] [inputproto >= 1.9.99.14], +PKG_CHECK_MODULES(XI2, [xi >= 1.2.99.2] [inputproto >= 1.9.99.15], HAVE_XI2="yes"; AC_DEFINE(HAVE_XI2, 1, [XI2 available]), HAVE_XI2="no"); AM_CONDITIONAL(HAVE_XI2, [ test "$HAVE_XI2" = "yes" ]) diff --git a/src/test_xi2.c b/src/test_xi2.c index 6dab0dc..8c96191 100644 --- a/src/test_xi2.c +++ b/src/test_xi2.c @@ -303,10 +303,10 @@ test_xi2(Display *display, XISetMask(mask.mask, XI_Motion); XIGrabButton(display, 2, 1, win, None, GrabModeAsync, GrabModeAsync, False, &mask, nmods, modifiers); - XIGrabKeysym(display, 3, 0x71, win, GrabModeAsync, GrabModeAsync, + XIGrabKeycode(display, 3, 24 /* q */, win, GrabModeAsync, GrabModeAsync, False, &mask, nmods, modifiers); XIUngrabButton(display, 3, 1, win, nmods - 2, &modifiers[2]); - XIUngrabKeysym(display, 3, 0x71, win, nmods - 2, &modifiers[2]); + XIUngrabKeycode(display, 3, 24 /* q */, win, nmods - 2, &modifiers[2]); } mask.deviceid = XIAllMasterDevices;