xorgproto: Branch 'master' - 9 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Aug 18 22:27:47 UTC 2020
specs/XI2proto.txt | 78 +++++++++++++++++++++++++++--------------------------
1 file changed, 41 insertions(+), 37 deletions(-)
New commits:
commit 2e18c08aca396c0eae7e5516c3bc3da0eb3e1e01
Author: Povilas Kanapickas <povilas at radix.lt>
Date: Tue Jun 30 23:28:42 2020 +0300
specs: Make links between XI2 enum and event names explicit
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index c9bb720..09928f8 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -2063,38 +2063,38 @@ The following event types are available in XI2.
Version 2.0:
- - HierarchyChanged
- - DeviceChanged
- - KeyPress
- - KeyRelease
- - ButtonPress
- - ButtonRelease
- - Motion
- - RawKeyPress
- - RawKeyRelease
- - RawButtonPress
- - RawButtonRelease
- - RawMotion
- - Enter
- - Leave
- - FocusIn
- - FocusOut
- - PropertyEvent
+ - HierarchyChanged (see <<events-hierarchyevent,HierarchyEvent>>)
+ - DeviceChanged (see <<events-devicechangedevent,DeviceChangedEvent>>)
+ - KeyPress (see <<events-deviceevent,DeviceEvent>>)
+ - KeyRelease (see <<events-deviceevent,DeviceEvent>>)
+ - ButtonPress (see <<events-deviceevent,DeviceEvent>>)
+ - ButtonRelease (see <<events-deviceevent,DeviceEvent>>)
+ - Motion (see <<events-deviceevent,DeviceEvent>>)
+ - RawKeyPress (see <<events-rawevent,RawEvent>>)
+ - RawKeyRelease (see <<events-rawevent,RawEvent>>)
+ - RawButtonPress (see <<events-rawevent,RawEvent>>)
+ - RawButtonRelease (see <<events-rawevent,RawEvent>>)
+ - RawMotion (see <<events-rawevent,RawEvent>>)
+ - Enter (see <<events-enterleave,Enter>>)
+ - Leave (see <<events-enterleave,Leave>>)
+ - FocusIn (see <<events-enterleave,FocusIn>>)
+ - FocusOut (see <<events-enterleave,FocusOut>>)
+ - PropertyEvent (see <<events-propertyevent,PropertyEvent>>)
Version 2.2:
- - TouchBegin
- - TouchUpdate
- - TouchOwnership
- - TouchEnd
- - RawTouchBegin
- - RawTouchUpdate
- - RawTouchEnd
+ - TouchBegin (see <<events-deviceevent,DeviceEvent>>)
+ - TouchUpdate (see <<events-deviceevent,DeviceEvent>>)
+ - TouchOwnership (see <<events-touchownershipevent,TouchOwnershipEvent>>)
+ - TouchEnd (see <<events-deviceevent,DeviceEvent>>)
+ - RawTouchBegin (see <<events-rawevent,RawEvent>>)
+ - RawTouchUpdate (see <<events-rawevent,RawEvent>>)
+ - RawTouchEnd (see <<events-rawevent,RawEvent>>)
Version 2.3:
- - BarrierHit
- - BarrierLeave
+ - BarrierHit (see <<events-barrierevent,BarrierEvent>>)
+ - BarrierLeave (see <<events-barrierevent,BarrierEvent>>)
All events have a set of common fields specified as EVENTHEADER.
commit 49720c7548b4dd830573820fdd3cda3b6203ddc0
Author: Povilas Kanapickas <povilas at radix.lt>
Date: Tue Jun 30 23:28:41 2020 +0300
specs: Improve description of detail field in XIPassiveGrabDevice
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 36c57c5..c9bb720 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -1663,9 +1663,9 @@ on the specified input device.
The device to establish the passive grab on or AllDevices or
AllMasterDevices.
detail
- The button number, or key code to grab for.
- Must be 0 for GrabtypeEnter, GrabtypeFocusIn, and
- GrabtypeTouchBegin.
+ In the case of GrabtypeButton, specifies the button number to grab for.
+ In the case of GrabtypeKeycode, specifies the key code to grab for.
+ The value must be 0 for GrabtypeEnter, GrabtypeFocusIn, and GrabtypeTouchBegin.
grab_type
The type of grab to establish.
grab_window
commit 97b47b5065be386ce96a7653937b83c3717695f6
Author: Povilas Kanapickas <povilas at radix.lt>
Date: Tue Jun 30 23:28:40 2020 +0300
specs: Improve description of detail field in DeviceEvent
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index d5747c9..36c57c5 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -2264,7 +2264,10 @@ KeyRelease, ButtonPress, ButtonRelease, Motion.
XI 2.2: The event type may also be TouchBegin, TouchUpdate, or TouchEnd.
detail
- The button number, key code, touch ID, or 0.
+ Represents the key code in the cases of KeyPress and KeyRelease.
+ Represents the button number in the cases of ButtonPress and ButtonRelease.
+ Represents the touch ID in the cases of TouchBegin, TouchUpdate and TouchEnd.
+ In the case of Motion, the value will be 0.
root
event
child
commit 5371f0d4f88e83921e65955851a3bcab6ee720ef
Author: Povilas Kanapickas <povilas at radix.lt>
Date: Tue Jun 30 23:28:39 2020 +0300
specs: Fix example of touch event processing
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index f311b11..d5747c9 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -2690,7 +2690,8 @@ While client I wants to process pointer events on window W's parent, window Y.
* I calls XIPassiveGrab for XI_{ButtonPress,MotionNotify,ButtonRelease} to
create a synchronous pointer grab from D on Y.
* C calls XISelectEvent for XI_Touch{Begin|Update|Ownership|End} from D on W.
-* I receives a ButtonPress event whenever a touch begins within W, and is
+* I receives a ButtonPress and MotionNotify events whenever a (direct device)
+ touch begins within W, and is
considered the owner of the event. C receives a TouchBegin event, but does
not receive a TouchOwnership event.
* When the touchpoint moves, C will receive a TouchUpdate event. Event
commit 31aa0990d654a708466f296f32ad70071c5ae8f1
Author: Povilas Kanapickas <povilas at radix.lt>
Date: Tue Jun 30 23:28:38 2020 +0300
specs: Use non-hyphenated spelling of nonzero
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 17c449a..f311b11 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -845,7 +845,7 @@ Each deviceinfo is detailed as follows:
attachment specifies the master device this device is attached to.
If the device is a floating slave, attachment is undefined.
enabled
- Zero if the device is disabled, non-zero otherwise.
+ Zero if the device is disabled, nonzero otherwise.
num_classes
Number of classes provided.
name_len
commit 8936fcea3376ac079a9b612db4a624b79f94dac4
Author: Povilas Kanapickas <povilas at radix.lt>
Date: Tue Jun 30 23:28:37 2020 +0300
specs: Improve consistency of grammar in a list
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 3a483e9..17c449a 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -1745,7 +1745,7 @@ device is actively grabbed if:
Otherwise, if grab_type is GrabtypeTouchBegin, a touch grab begins if:
- the device is not actively grabbed, and
- - the specified modifier keys are down
+ - the specified modifier keys are down, and
- a touch begins in grab_window or a descendant of grab_window, and
- a passive grab of the same grab_type + modifier combination does not
does not exist on an ancestor of grab_window.
commit b93a47beb555619ee1683aab6e9438f221c880b7
Author: Povilas Kanapickas <povilas at radix.lt>
Date: Tue Jun 30 23:28:36 2020 +0300
specs: Only key code can be grabbed, not key symbol
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 5a20364..3a483e9 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -1663,7 +1663,7 @@ on the specified input device.
The device to establish the passive grab on or AllDevices or
AllMasterDevices.
detail
- The button number, or key symbol to grab for.
+ The button number, or key code to grab for.
Must be 0 for GrabtypeEnter, GrabtypeFocusIn, and
GrabtypeTouchBegin.
grab_type
@@ -1833,7 +1833,7 @@ Release an explicit passive grab on the specified input device.
deviceid
The device to establish the passive grab on.
detail
- The button number or key symbol to ungrab.
+ The button number or key code to ungrab.
Must be 0 for GrabtypeEnter, GrabtypeFocusIn, and
GrabtypeTouchBegin.
grab_type
commit 0f72d2d0b934c1e39e84a59d8ad381cc1f9ce4a6
Author: Povilas Kanapickas <povilas at radix.lt>
Date: Tue Jun 30 23:28:35 2020 +0300
specs: Fix incorrect wording for ignored parameter
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 12995be..5a20364 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -1526,11 +1526,11 @@ ownership processing.
Specifies whether a device is to be thawed and events are to be
replayed, or how to handle a grabbed touch sequence.
touchid
- The ID of the touch sequence to accept or reject. The value is undefined
+ The ID of the touch sequence to accept or reject. The value is ignored
for event modes other than AcceptTouch and RejectTouch.
grab_window
The window on which to accept or reject a touch sequence grab. The value
- is undefined for event modes other than AcceptTouch and RejectTouch.
+ is ignored for event modes other than AcceptTouch and RejectTouch.
The request has no effect if the specified time is earlier than the last-grab
time of the most recent active grab for the client, or if the specified time is
commit 2e7276469c2e3bd70c6b68b48890030498846411
Author: Povilas Kanapickas <povilas at radix.lt>
Date: Tue Jun 30 23:28:34 2020 +0300
specs: Fix grammar (duplicate word)
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 9ba0201..12995be 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -2340,7 +2340,7 @@ Group state in group is detailed as follows:
In servers supporting XI 2.2, a TouchBegin event is generated whenever a new
touch sequence initializes.
A TouchEnd event is generated whenever a touch sequence ceases. A
-TouchUpdate event is generated whenever a valuator value changes, or a flag
+TouchUpdate event is generated whenever a valuator value changes, or a
flag (e.g. pending end) has changed for that touch sequence; this may result
in a TouchUpdate event being sent with zero valuators.
More information about the xorg-commit
mailing list