diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-13 16:05:25 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-07-13 16:05:38 +1000 |
| commit | 9a20ce005c12cea9cf215125c96a00c7cbe988c7 (patch) | |
| tree | cb88613d6a873fdc584772dc9c2a357a573f51a5 | |
| parent | 7baaba9fbef48b1f45a51c1654e605df074800b8 (diff) | |
Adjust to new, split-up raw event types.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/test_xi2.c | 15 |
2 files changed, 13 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 78a95f8..b4ca28b 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.13], +PKG_CHECK_MODULES(XI2, [xi >= 1.2.99.2] [inputproto >= 1.9.99.14], 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 cef019c..aa1a9a8 100644 --- a/src/test_xi2.c +++ b/src/test_xi2.c @@ -269,7 +269,7 @@ test_xi2(Display *display, /* Select for motion events */ mask.deviceid = XIAllDevices; - mask.mask_len = 2; + mask.mask_len = XIMaskLen(XI_RawMotion); mask.mask = calloc(mask.mask_len, sizeof(char)); XISetMask(mask.mask, XI_ButtonPress); XISetMask(mask.mask, XI_ButtonRelease); @@ -296,6 +296,7 @@ test_xi2(Display *display, XISetMask(mask.mask, XI_KeyPress); XISetMask(mask.mask, XI_KeyRelease); XISetMask(mask.mask, XI_ButtonPress); + XISetMask(mask.mask, XI_ButtonRelease); XISetMask(mask.mask, XI_Motion); XIGrabButton(display, 2, 1, win, None, GrabModeAsync, GrabModeAsync, False, &mask, nmods, modifiers); @@ -307,7 +308,11 @@ test_xi2(Display *display, mask.deviceid = XIAllMasterDevices; memset(mask.mask, 0, 2); - XISetMask(mask.mask, XI_RawEvent); + XISetMask(mask.mask, XI_RawKeyPress); + XISetMask(mask.mask, XI_RawKeyRelease); + XISetMask(mask.mask, XI_RawButtonPress); + XISetMask(mask.mask, XI_RawButtonRelease); + XISetMask(mask.mask, XI_RawMotion); XISelectEvents(display, DefaultRootWindow(display), &mask, 1); free(mask.mask); @@ -341,7 +346,11 @@ test_xi2(Display *display, case XI_HierarchyChanged: print_hierarchychangedevent(cookie->data); break; - case XI_RawEvent: + case XI_RawKeyPress: + case XI_RawKeyRelease: + case XI_RawButtonPress: + case XI_RawButtonRelease: + case XI_RawMotion: print_rawevent(cookie->data); break; case XI_Enter: |