Adjust to xi2 api changes

The touch event types have new names since February 2011. Modify
accordingly.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

2 files changed, 3 insertions, 3 deletions

diff --git a/src/frame-xi2.c b/src/frame-xi2.c
index bead751..7fc38fd 100644
--- a/src/frame-xi2.c
+++ b/src/frame-xi2.c
@@ -274,7 +274,7 @@ utouch_frame_pump_xi2(utouch_frame_handle fh, const XIDeviceEvent *ev)
 
         switch (ev->evtype) {
         case XI_TouchBegin:
-        case XI_TouchMotion:
+        case XI_TouchUpdate:
         case XI_TouchEnd:
                 value = ev->valuators.values;
                 mask = ev->valuators.mask;
diff --git a/tools/utouch-frame-test-xi2.c b/tools/utouch-frame-test-xi2.c
index 015c119..2f4e10b 100644
--- a/tools/utouch-frame-test-xi2.c
+++ b/tools/utouch-frame-test-xi2.c
@@ -126,11 +126,11 @@ static void loop_device(struct frame_test *test)
         XIEventMask mask;
 
         mask.deviceid = XIAllDevices;
-        mask.mask_len = XIMaskLen(XI_TouchMotion);
+        mask.mask_len = XIMaskLen(XI_LASTEVENT);
         mask.mask = calloc(mask.mask_len, sizeof(char));
 
         XISetMask(mask.mask, XI_TouchBegin);
-        XISetMask(mask.mask, XI_TouchMotion);
+        XISetMask(mask.mask, XI_TouchUpdate);
         XISetMask(mask.mask, XI_TouchEnd);
         XISetMask(mask.mask, XI_PropertyEvent);
         XISelectEvents(test->display, test->win, &mask, 1);