diff options
| author | Chase Douglas <chase.douglas@ubuntu.com> | 2010-10-13 21:34:26 +0200 |
|---|---|---|
| committer | Chase Douglas <chase.douglas@ubuntu.com> | 2010-10-13 21:42:27 +0200 |
| commit | 0a82e2f0c841ad5a00a6e0fc2a5721404490321a (patch) | |
| tree | 1a9b8fe0cc8c49e23f9cbb79248732d56fa59977 | |
| parent | a6cdd84853df31b8d2beffcbf7fbc5e51dbd74b5 (diff) | |
Clients can't select for XI_TouchMotion or XI_TouchEnd, so ensure the
test doesn't try to do so.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
| -rw-r--r-- | test/xi2/protocol-xiselectevents.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/test/xi2/protocol-xiselectevents.c b/test/xi2/protocol-xiselectevents.c index fe1c26df8..769d5a1da 100644 --- a/test/xi2/protocol-xiselectevents.c +++ b/test/xi2/protocol-xiselectevents.c @@ -159,6 +159,9 @@ static void request_XISelectEvents_masks(xXISelectEventsReq *req) memset(bits, 0, mask->mask_len * 4); for (j = 0; j <= XI_LASTEVENT; j++) { + /* Can't select for these events */ + if (j == XI_TouchMotion || j == XI_TouchEnd) + continue; SetBit(bits, j); request_XISelectEvent(req, Success); ClearBit(bits, j); @@ -175,6 +178,9 @@ static void request_XISelectEvents_masks(xXISelectEventsReq *req) for (j = 0; j <= XI_LASTEVENT; j++) { + /* Can't select for these events */ + if (j == XI_TouchMotion || j == XI_TouchEnd) + continue; SetBit(bits, j); request_XISelectEvent(req, Success); } @@ -189,6 +195,9 @@ static void request_XISelectEvents_masks(xXISelectEventsReq *req) for (j = XI_LASTEVENT + 1; j < mask->mask_len * 4; j++) { + /* Can't select for these events */ + if (j == XI_TouchMotion || j == XI_TouchEnd) + continue; SetBit(bits, j); request_XISelectEvent(req, BadValue); ClearBit(bits, j); @@ -202,6 +211,9 @@ static void request_XISelectEvents_masks(xXISelectEventsReq *req) memset(bits, 0, mask->mask_len * 4); for (j = 0; j <= XI_LASTEVENT; j++) { + /* Can't select for these events */ + if (j == XI_TouchMotion || j == XI_TouchEnd) + continue; SetBit(bits, j); request_XISelectEvent(req, Success); } @@ -231,6 +243,8 @@ static void request_XISelectEvents_masks(xXISelectEventsReq *req) for (j = 0; j <= XI_LASTEVENT; j++) SetBit(bits, j); ClearBit(bits, XI_HierarchyChanged); + ClearBit(bits, XI_TouchMotion); + ClearBit(bits, XI_TouchEnd); for (j = 1; j < 6; j++) { mask->deviceid = j; |