summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2014-10-27 14:22:58 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2014-10-28 09:29:50 +1000
commit7c7c2c18864d166391e49758d83e9cc601bbfb17 (patch)
treed2067f273ad55a9443b8eef0f0c3cbe446ad5b48
parent81378a1e7139af9d476d90df8737c0c1a58670f3 (diff)
downloadxorg-proto-inputproto-7c7c2c18864d166391e49758d83e9cc601bbfb17.tar.gz
specs: rename EVENTMASK to EVTYPEMASK
EVENTMASK was used twice in the spec, once as the actual bitmask for events, once as the set of deviceid, mask length and mask. The libXi public API uses XIEventMask for the latter data triplet, so leave EVENTMASK, and rename the pure bitmask to EVTYPEMASK. Reported-by: Gabriel Laskar <gabriel@lse.epita.fr> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r--specs/XI2proto.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index e3636ac..697dd89 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -672,9 +672,9 @@ Data types
device hierarchy. See Section "The Master/Slave device hierarchy"
for more information.
- EVENTMASK
- An EVENTMASK is a binary mask defined as (1 << event type).
- A SETofEVENTMASK is a binary OR of zero or more EVENTMASK.
+ EVTYPEMASK
+ An EVTYPEMASK is a binary mask defined as (1 << event type).
+ A SETofEVTYPEMASK is a binary OR of zero or more EVTYPEMASK.
FP1616
Fixed point decimal in 16.16 format as one INT16 and one CARD16.
@@ -971,7 +971,7 @@ XISelectEvents
EVENTMASK { deviceid: DEVICE,
mask_len: CARD16,
- mask: SETofEVENTMASK
+ mask: SETofEVTYPEMASK }
window
The window to select the events on.
@@ -1392,7 +1392,7 @@ XIGrabDevice
time: TIMESTAMP or CurrentTime
cursor: Cursor
mask_len: CARD16
- masks: SETofEVENTMASK
+ masks: SETofEVTYPEMASK
status: Success, AlreadyGrabbed, Frozen, InvalidTime, NotViewable
└───
@@ -1638,7 +1638,7 @@ XIPassiveGrabDevice
paired_device_mode: { Synchronous, Asynchronous }
num_modifiers: INT16
mask_len: CARD16
- masks: SETofEVENTMASK
+ masks: SETofEVTYPEMASK
modifiers: LISTofSETofMODIFIERMASK
num_modifiers_return: INT16