diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-10-31 16:13:49 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-11-02 10:45:35 +1000 |
| commit | 0d7bf0f2ee31ef6be2c2b189e8fd59d1759b5f1f (patch) | |
| tree | bcd337d8fed6a65c4bcbba384d3b7048ddfff613 | |
| parent | a2b6c0cbb57fd25cde5a1334f347c3d258560858 (diff) | |
server/touch: drop unnecessary use of HierarchyMask
Not required anymore, WaitForDevice will set the mask as appropriate.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | tests/server/touch.cpp | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/tests/server/touch.cpp b/tests/server/touch.cpp index 30168ad..e11b136 100644 --- a/tests/server/touch.cpp +++ b/tests/server/touch.cpp @@ -46,7 +46,7 @@ TEST_P(TouchTest, XITouchscreenPointerEmulation) XIEventMask mask; mask.deviceid = XIAllMasterDevices; - mask.mask_len = XIMaskLen(XI_HierarchyChanged); + mask.mask_len = XIMaskLen(XI_Motion); mask.mask = reinterpret_cast<unsigned char*>(calloc(mask.mask_len, 1)); XISetMask(mask.mask, XI_ButtonPress); XISetMask(mask.mask, XI_ButtonRelease); @@ -274,24 +274,16 @@ TEST_P(TouchTest, XIQueryPointerTouchscreen) "XInput 2.2 and later clients, the first button should not be\n" "reported."); XIEventMask mask; - mask.deviceid = XIAllDevices; - mask.mask_len = XIMaskLen(XI_HierarchyChanged); - mask.mask = reinterpret_cast<unsigned char*>(calloc(mask.mask_len, 1)); - XISetMask(mask.mask, XI_HierarchyChanged); - - ASSERT_EQ(Success, - XISelectEvents(Display(), DefaultRootWindow(Display()), &mask, - 1)); - mask.deviceid = XIAllMasterDevices; - XIClearMask(mask.mask, XI_HierarchyChanged); + mask.mask_len = XIMaskLen(XI_ButtonPress); + mask.mask = new unsigned char[mask.mask_len](); XISetMask(mask.mask, XI_ButtonPress); ASSERT_EQ(Success, XISelectEvents(Display(), DefaultRootWindow(Display()), &mask, 1)); - free(mask.mask); + delete[] mask.mask; XFlush(Display()); @@ -347,17 +339,9 @@ TEST_P(TouchTest, DisableDeviceEndTouches) return; XIEventMask mask; - mask.deviceid = XIAllDevices; - mask.mask_len = XIMaskLen(XI_TouchEnd); - mask.mask = reinterpret_cast<unsigned char*>(calloc(mask.mask_len, 1)); - XISetMask(mask.mask, XI_HierarchyChanged); - - ASSERT_EQ(Success, - XISelectEvents(Display(), DefaultRootWindow(Display()), &mask, - 1)); - mask.deviceid = XIAllMasterDevices; - XIClearMask(mask.mask, XI_HierarchyChanged); + mask.mask_len = XIMaskLen(XI_TouchEnd); + mask.mask = new unsigned char[mask.mask_len](); XISetMask(mask.mask, XI_TouchBegin); XISetMask(mask.mask, XI_TouchUpdate); XISetMask(mask.mask, XI_TouchEnd); @@ -366,7 +350,7 @@ TEST_P(TouchTest, DisableDeviceEndTouches) XISelectEvents(Display(), DefaultRootWindow(Display()), &mask, 1)); - free(mask.mask); + delete[] mask.mask; XFlush(Display()); |