Adjust to new, split-up raw event types.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/configure.ac b/configure.ac
index 78a95f8733fcc2978c841ee23a36e420a85f1f98..b4ca28b931436f374d86a24a3e933ee100557e8c 100644 (file)
--- 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(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" ])
                   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 cef019c969f1c32d11ae37d3621b224953508728..aa1a9a8fc31dcb294000545651997f9c1f0e19b7 100644 (file)
--- 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;
 
     /* 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);
     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_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);
         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);
 
     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);
     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_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:
                     print_rawevent(cookie->data);
                     break;
                 case XI_Enter: