From 2ea2f99f4fe1dcd3b8e539ca41c482fc40a0533d Mon Sep 17 00:00:00 2001 From: Chase Douglas Date: Wed, 14 Sep 2011 09:46:18 -0500 Subject: Extend XIAllowEvents for handling touch grab processing This removes the XIAllowTouchEvents request, which was the only new request added for multitouch. Signed-off-by: Chase Douglas Reviewed-by: Peter Hutterer --- XI2proto.h | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'XI2proto.h') diff --git a/XI2proto.h b/XI2proto.h index 8117767..3315f1e 100644 --- a/XI2proto.h +++ b/XI2proto.h @@ -92,10 +92,9 @@ #define X_XIDeleteProperty 58 #define X_XIGetProperty 59 #define X_XIGetSelectedEvents 60 -#define X_XIAllowTouchEvents 61 /** Number of XI requests */ -#define XI2REQUESTS (X_XIAllowTouchEvents - X_XIQueryPointer + 1) +#define XI2REQUESTS (X_XIGetSelectedEvents - X_XIQueryPointer + 1) /** Number of XI2 events */ #define XI2EVENTS (XI_LASTEVENT + 1) @@ -648,8 +647,9 @@ typedef struct { uint16_t deviceid; uint8_t mode; uint8_t pad; + uint32_t touch_id; /**< Since XI 2.2 */ } xXIAllowEventsReq; -#define sz_xXIAllowEventsReq 12 +#define sz_xXIAllowEventsReq 16 /**< Was 12 before XI 2.2 */ /** @@ -799,20 +799,6 @@ typedef struct { } xXIGetPropertyReply; #define sz_xXIGetPropertyReply 32 -/** - * Accept or reject a grabbed touch sequence. - */ -typedef struct { - uint8_t reqType; - uint8_t ReqType; /**< Always ::X_XIAllowTouchEvents */ - uint16_t length; /**< Length in 4 byte units */ - uint32_t touchid; - uint16_t deviceid; - uint8_t mode; /**< bitmask */ - uint8_t pad; -} xXIAllowTouchEventsReq; -#define sz_xXIAllowTouchEventsReq 12 - /************************************************************************************* * * * EVENTS * -- cgit v1.2.1