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>
This commit is contained in:
Peter Hutterer
2012-11-20 11:38:39 +10:00
parent b51a1bd276
commit a7c97d737e
3 changed files with 28 additions and 9 deletions

View File

@@ -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);