configure.ac | 2 +- specs/Makefile.am | 2 +- specs/XI2proto.txt | 15 +++++++++------ 3 files changed, 11 insertions(+), 8 deletions(-)
New commits: commit 6946d497e3fe496818fa70de6702934bf70e44ec Author: Peter Hutterer <[email protected]> Date: Mon Apr 4 12:28:42 2016 +1000 inputproto 2.3.2 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 56115df..7480425 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([InputProto], [2.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([InputProto], [2.3.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_WITH_ASCIIDOC commit 1dbdc297d915e4979a7823d6a569d9c7fed14617 Author: Andreas Boll <[email protected]> Date: Fri Dec 11 10:49:33 2015 +0100 specs: Set TZ=UTC before calling asciidoc Set TZ=UTC before calling asciidoc to make the embedded dates invariant to timezones in order to make the package build reproducibly. Fixes bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=795981 v2: Set TZ=UTC after $(AM_V_GEN) (fixes non-verbose build) Suggested-by: Eduard Sanou <[email protected]> Signed-off-by: Andreas Boll <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> diff --git a/specs/Makefile.am b/specs/Makefile.am index a83cf40..f2454bc 100644 --- a/specs/Makefile.am +++ b/specs/Makefile.am @@ -6,7 +6,7 @@ doc_DATA = XI2proto.html XIproto.html dist_doc_DATA = XI2proto.txt XIproto.txt %.html: %.txt - $(AM_V_GEN)$(ASCIIDOC) -o $@ $< + $(AM_V_GEN)TZ=UTC $(ASCIIDOC) -o $@ $< CLEANFILES = $(doc_DATA) commit 7c7c2c18864d166391e49758d83e9cc601bbfb17 Author: Peter Hutterer <[email protected]> Date: Mon Oct 27 14:22:58 2014 +1000 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 <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Hans de Goede <[email protected]> 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 commit 81378a1e7139af9d476d90df8737c0c1a58670f3 Author: Peter Hutterer <[email protected]> Date: Mon Aug 25 11:04:38 2014 +1000 specs: note the (unused) time field in XIPassiveGrabDevice We don't actually use it either in libXi or in the server, it's a copy/paste error that never got noticed and removed. Signed-off-by: Peter Hutterer <[email protected]> diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt index 2f81bef..e3636ac 100644 --- a/specs/XI2proto.txt +++ b/specs/XI2proto.txt @@ -1630,6 +1630,7 @@ XIPassiveGrabDevice deviceid: DEVICE detail: CARD32 grab_type: GRABTYPE + time: TIMESTAMP grab_window: Window cursor: Cursor owner_events: Bool @@ -1695,6 +1696,8 @@ on the specified input device. Number of elements in modifiers_return modifiers_return XKB modifier state that could not be grabbed. + time + This field is unused. If owner-events is False, input events generated from this device are reported with respect to grab-window, and are only reported if
