summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2011-09-14 22:09:28 -0500
committerChase Douglas <chase.douglas@canonical.com>2011-09-16 11:47:38 -0700
commitcec7567863c3d363b6b75c707540cfe524f849ba (patch)
tree3d8c7ef498fc9259f78e4bcdc9e2262da3640a1c
parent22c06a5ddb1d3be2743a79b78eff3844f457dc5e (diff)
downloadxorg-proto-inputproto-cec7567863c3d363b6b75c707540cfe524f849ba.tar.gz
Revert addition of active_touches to device events
I can't remember why it's there, and I don't see how it may be useful. If a client really wants to know how many touches are on the device, they can listen to raw events and count the number of active touches. (Real reason: extending events is hard :) Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--XI2proto.h1
-rw-r--r--specs/XI2proto.txt6
2 files changed, 0 insertions, 7 deletions
diff --git a/XI2proto.h b/XI2proto.h
index 9e2c63c..2460cf5 100644
--- a/XI2proto.h
+++ b/XI2proto.h
@@ -936,7 +936,6 @@ typedef struct
uint32_t flags; /**< ::XIKeyRepeat */
xXIModifierInfo mods;
xXIGroupInfo group;
- uint32_t active_touches; /**< Number of touches on source device (XI 2.1 only) */
} xXIDeviceEvent;
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 73aa52b..b0607a1 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -2031,11 +2031,8 @@ For a detailed description of classes, see the XIQueryDevice request.
buttons: SETofBUTTONMASK
valuators: SETofVALUATORMASK
axisvalues: LISTofFP3232
- active_touches*: CARD32
└───
- * since XI 2.2
-
BUTTONBIT { (1 << Button1), (1 << Button2), ... , (1 << ButtonN) }
VALUATORBIT { (1 << 1), ( 1 << 2), ... ( 1 << n) }
@@ -2114,9 +2111,6 @@ KeyRelease, ButtonPress, ButtonRelease, Motion.
accepted or passed on ownership. The touch will not generate any
further TouchUpdate events once an event with TouchPendingEnd has been
received.
- active_touches
- Only in XI 2.2 and later. Only valid for TouchBegin, TouchUpdate, and
- TouchEnd events.
The active_touches value denotes the number of touches in contact with
the source touch device surface when the event occurred. The value