diff options
author | Chase Douglas <chase.douglas@canonical.com> | 2011-08-05 14:49:32 -0700 |
---|---|---|
committer | Chase Douglas <chase.douglas@canonical.com> | 2011-08-05 15:55:13 -0700 |
commit | b5e357c76dc5d8b2176fa470186688ec943d08e6 (patch) | |
tree | b7340f81a25516fee94c29fe6658393391016416 | |
parent | 3172e3c52eb45e4830d85ae53888d0b28c13df62 (diff) |
Remove touch "Observe" grabs
The semantics of these grabs doesn't work for all use cases. Raw touch
events will likely work better.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
-rw-r--r-- | XI2.h | 2 | ||||
-rw-r--r-- | specs/XI2proto.txt | 18 |
2 files changed, 3 insertions, 17 deletions
@@ -90,7 +90,6 @@ #define XIGrabtypeEnter 2 #define XIGrabtypeFocusIn 3 #define XIGrabtypeTouchBegin 4 -#define XIGrabtypeTouchObserve 5 /* Passive grab modifier */ #define XIAnyModifier (1U << 31) @@ -108,7 +107,6 @@ /* XIAllowTouchEvents bitmask event-modes */ #define XITouchAccept (1 << 0) #define XITouchReject (1 << 1) -#define XITouchObserve (1 << 2) /* DeviceChangedEvent change reasons */ #define XISlaveSwitch 1 diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt index fa8d14c..964f7a4 100644 --- a/specs/XI2proto.txt +++ b/specs/XI2proto.txt @@ -1397,8 +1397,7 @@ you pass to the event-mode argument: └─── GRABTYPE { GrabtypeButton, GrabtypeKeycode, GrabtypeEnter, - GrabtypeFocusIn, GrabtypeTouchBegin, - GrabtypeTouchObserve } + GrabtypeFocusIn, GrabtypeTouchBegin } GRABMODIFIERINFO { status: Access modifiers: CARD32 } @@ -1430,9 +1429,6 @@ on the specified input device. releasing XIAllowEvents request or until the device grab is released. Actual device input events are not lost while the device is frozen; they are simply queued for later processing. - Must be Asynchronous for - <<multitouch-processing,GrabtypeTouchBegin>> and - <<multitouch-observer,GrabtypeTouchObserve>>. mask_len Length of mask in 4 byte units. mask @@ -1492,15 +1488,13 @@ device is actively grabbed if: - a passive grab of the same grab_type + modifier combination does not does not exist on an ancestor of grab_window. -Or if grab_type is GrabtypeTouchBegin or GrabtypeTouchObserve, a -touch grab begins if: +Or if grab_type is GrabtypeTouchBegin, a touch grab begins if: - a touch begins in grab_window or one of its ancestors, and - the specified modifier keys are down Ownership of the touch sequence is granted to the grabbing client if: -- grab_type is not GrabtypeTouchObserve, and - a TouchBegin or pointer grab for an emulated touch sequence of a direct touch device with the same modifier set does not exist on an ancestor of grab_window, or all applicable grabs have released ownership. @@ -1517,9 +1511,6 @@ pointer or focus leaves the window and all of its descendants, independent of the state of modifier keys. A GrabtypeTouchBegin grab is released when the touch sequence ends or the client uses XIAllowTouchEvents with mode TouchReject. -A GrabtypeTouchBegin grab is converted to a GrabtypeTouchObserve grab -when the client uses XIAllowTouchEvents with mode TouchObserve. -A GrabtypeTouchObserve grab is released when the touch sequence ends. Note that the logical state of a device (as seen by means of the protocol) may lag the physical state if device event processing is frozen. @@ -1756,7 +1747,7 @@ Requests introduced in version 2.1 flags: SETofALLOWTOUCHFLAGS └─── - ALLOWTOUCHMODE { TouchAccept, TouchReject, TouchObserve } + ALLOWTOUCHMODE { TouchAccept, TouchReject } ALLOWTOUCHFLAGS (none currently defined) The XIAllowTouchEvents request allows the current owner of a touch @@ -1774,9 +1765,6 @@ sequence to direct further delivery. Given TouchReject, the client is no longer interested in the touch sequence, and will receive a TouchEnd event; ownership will be passed on to the next listener. - Given TouchObserve, the client is not interested in ownership, but - still wishes to receive TouchUpdate events; ownership will be passed on - to the next listener. flags A bitmask of applicable flags. |