summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-10-20 15:55:54 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-11-04 07:41:31 +1000
commitb289b1c039e36a9440c238ff09dfa3eb67e141e4 (patch)
treecbe5b43eafc85eda74bc8ed0cb467d0e03fe87d7
parent86ce2d05e86852d52f5b135ad03288e4cb16d5df (diff)
XI2: Use touchid, not touch_id in XIAllowEvents
Be consistent with other usages of touchid. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
-rw-r--r--XI2proto.h2
-rw-r--r--specs/XI2proto.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/XI2proto.h b/XI2proto.h
index 2460cf5..56df401 100644
--- a/XI2proto.h
+++ b/XI2proto.h
@@ -647,7 +647,7 @@ typedef struct {
uint16_t deviceid;
uint8_t mode;
uint8_t pad;
- uint32_t touch_id; /**< Since XI 2.2 */
+ uint32_t touchid; /**< Since XI 2.2 */
Window grab_window; /**< Since XI 2.2 */
} xXIAllowEventsReq;
#define sz_xXIAllowEventsReq 20 /**< Was 12 before XI 2.2 */
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index b0607a1..c467bb1 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -1372,7 +1372,7 @@ active device grab becomes not viewable.
AsyncPairedDevice, SyncPairedDevice,
ReplayDevice, AsyncPair, SyncPair, AcceptTouch*,
RejectTouch* }
- touch_id*: CARD32
+ touchid*: CARD32
grab_window*: Window
└───
@@ -1389,7 +1389,7 @@ ownership processing.
event_mode
Specifies whether a device is to be thawed and events are to be
replayed, or how to handle a grabbed touch sequence.
- touch_id
+ touchid
The ID of the touch sequence to accept or reject. The value is undefined
for event modes other than AcceptTouch and RejectTouch.
grab_window