andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: update for touch support

Browse Source 
Touch event mask must be set for all three event types.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
Peter Hutterer 2011-12-14 12:15:29 +10:00
parent 731b1db2fc
commit 92c6c0c1d2
2 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/xi2/protocol-xipassivegrabdevice.c
View File

@ -180,7 +180,7 @@ static void test_XIPassiveGrabDevice(void)
request->deviceid = XIAllMasterDevices; request->deviceid = XIAllMasterDevices;
printf("Testing invalid grab types\n"); printf("Testing invalid grab types\n");
for (i = XIGrabtypeFocusIn + 1; i < 0xFF; i++) for (i = XIGrabtypeTouchBegin + 1; i < 0xFF; i++)
{ {
request->grab_type = i; request->grab_type = i;
request_XIPassiveGrabDevice(&client_request, request, BadValue, request->grab_type); request_XIPassiveGrabDevice(&client_request, request, BadValue, request->grab_type);

38
test/xi2/protocol-xiselectevents.c
View File

@ -125,6 +125,28 @@ static void request_XISelectEvent(xXISelectEventsReq *req, int error)
assert(rc == error); assert(rc == error);
} }
static void _set_bit(unsigned char *bits, int bit)
{
SetBit(bits, bit);
if (bit >= XI_TouchBegin && bit <= XI_TouchOwnership)
{
SetBit(bits, XI_TouchBegin);
SetBit(bits, XI_TouchUpdate);
SetBit(bits, XI_TouchEnd);
}
}
static void _clear_bit(unsigned char *bits, int bit)
{
ClearBit(bits, bit);
if (bit >= XI_TouchBegin && bit <= XI_TouchOwnership)
{
ClearBit(bits, XI_TouchBegin);
ClearBit(bits, XI_TouchUpdate);
ClearBit(bits, XI_TouchEnd);
}
}
static void request_XISelectEvents_masks(xXISelectEventsReq *req) static void request_XISelectEvents_masks(xXISelectEventsReq *req)
{ {
int i, j; int i, j;
@ -157,9 +179,9 @@ static void request_XISelectEvents_masks(xXISelectEventsReq *req)
memset(bits, 0, mask->mask_len * 4); memset(bits, 0, mask->mask_len * 4);
for (j = 0; j <= XI2LASTEVENT; j++) for (j = 0; j <= XI2LASTEVENT; j++)
{ {
SetBit(bits, j); _set_bit(bits, j);
request_XISelectEvent(req, Success); request_XISelectEvent(req, Success);
ClearBit(bits, j); _clear_bit(bits, j);
} }
/* Test 2: /* Test 2:
@ -173,7 +195,7 @@ static void request_XISelectEvents_masks(xXISelectEventsReq *req)
for (j = 0; j <= XI2LASTEVENT; j++) for (j = 0; j <= XI2LASTEVENT; j++)
{ {
SetBit(bits, j); _set_bit(bits, j);
request_XISelectEvent(req, Success); request_XISelectEvent(req, Success);
} }
@ -187,9 +209,9 @@ static void request_XISelectEvents_masks(xXISelectEventsReq *req)
for (j = XI2LASTEVENT + 1; j < mask->mask_len * 4; j++) for (j = XI2LASTEVENT + 1; j < mask->mask_len * 4; j++)
{ {
SetBit(bits, j); _set_bit(bits, j);
request_XISelectEvent(req, BadValue); request_XISelectEvent(req, BadValue);
ClearBit(bits, j); _clear_bit(bits, j);
} }
/* Test 4: /* Test 4:
@ -200,7 +222,7 @@ static void request_XISelectEvents_masks(xXISelectEventsReq *req)
memset(bits, 0, mask->mask_len * 4); memset(bits, 0, mask->mask_len * 4);
for (j = 0; j <= XI2LASTEVENT; j++) for (j = 0; j <= XI2LASTEVENT; j++)
{ {
SetBit(bits, j); _set_bit(bits, j);
request_XISelectEvent(req, Success); request_XISelectEvent(req, Success);
} }
@ -227,8 +249,8 @@ static void request_XISelectEvents_masks(xXISelectEventsReq *req)
mask->mask_len = (nmasks + 3)/4; mask->mask_len = (nmasks + 3)/4;
memset(bits, 0, mask->mask_len * 4); memset(bits, 0, mask->mask_len * 4);
for (j = 0; j <= XI2LASTEVENT; j++) for (j = 0; j <= XI2LASTEVENT; j++)
SetBit(bits, j); _set_bit(bits, j);
ClearBit(bits, XI_HierarchyChanged); _clear_bit(bits, XI_HierarchyChanged);
for (j = 1; j < 6; j++) for (j = 1; j < 6; j++)
{ {
mask->deviceid = j; mask->deviceid = j;