test-xi2: group event selection down

No real functional changes, just group the two selection requests together.

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

diff --git a/src/test_xi2.c b/src/test_xi2.c
index b64368e2df3ff2976d96cfbb3a22c29f662475c4..40cc76e21ff504e05023df05a86027ed3ccaf2ea 100644 (file)
--- a/src/test_xi2.c
+++ b/src/test_xi2.c
@@ -363,9 +363,6 @@ test_xi2(Display    *display,
     if (m->deviceid == XIAllDevices)
         XISetMask(m->mask, XI_HierarchyChanged);
     XISetMask(m->mask, XI_PropertyEvent);
     if (m->deviceid == XIAllDevices)
         XISetMask(m->mask, XI_HierarchyChanged);
     XISetMask(m->mask, XI_PropertyEvent);

-    XISelectEvents(display, win, m, 1);
-    XMapWindow(display, win);
-    XSync(display, False);

 
     m = &mask[1];
     m->deviceid = (deviceid == -1) ? XIAllMasterDevices : deviceid;
 
     m = &mask[1];
     m->deviceid = (deviceid == -1) ? XIAllMasterDevices : deviceid;


@@ -381,7 +378,11 @@ test_xi2(Display   *display,
     XISetMask(m->mask, XI_RawTouchUpdate);
     XISetMask(m->mask, XI_RawTouchEnd);
 #endif
     XISetMask(m->mask, XI_RawTouchUpdate);
     XISetMask(m->mask, XI_RawTouchEnd);
 #endif

-    XISelectEvents(display, DefaultRootWindow(display), m, 1);
+
+    XISelectEvents(display, win, &mask[0], 1);
+    XISelectEvents(display, DefaultRootWindow(display), &mask[1], 1);
+    XMapWindow(display, win);
+    XSync(display, False);

 
     free(mask[0].mask);
     free(mask[1].mask);
 
     free(mask[0].mask);
     free(mask[1].mask);