diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-11-20 11:38:39 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-12 17:25:16 +1000 |
| commit | a7c97d737ef0d14ec97869082decd049637cfe7a (patch) | |
| tree | ef0e41f67f81da0370a8a256c7dc0bcd532897ed /test | |
| parent | b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3 (diff) | |
dix: split xi2_mask_isset into a per-device function
For touch selection conflicts, we need to check not only if the mask is set
for the device, but if it is set for only that specific device (regardless
of XIAll*Devices)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'test')
| -rw-r--r-- | test/xi2/xi2.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/test/xi2/xi2.c b/test/xi2/xi2.c index 6ee705293..1cdad1dbd 100644 --- a/test/xi2/xi2.c +++ b/test/xi2/xi2.c @@ -36,8 +36,14 @@ xi2mask_test(void) XI2Mask *xi2mask = NULL, *mergemask = NULL; unsigned char *mask; DeviceIntRec dev; + DeviceIntRec all_devices, all_master_devices; int i; + all_devices.id = XIAllDevices; + inputInfo.all_devices = &all_devices; + all_master_devices.id = XIAllMasterDevices; + inputInfo.all_master_devices = &all_master_devices; + /* size >= nmasks * 2 for the test cases below */ xi2mask = xi2mask_new_with_size(MAXDEVICES + 2, (MAXDEVICES + 2) * 2); assert(xi2mask); |