[PATCH inputproto 2/3] Drop grab_window from XIAllowEvents

Peter Hutterer peter.hutterer at who-t.net
Thu Jan 26 21:50:40 PST 2012


With the drop of early acceptance/rejection the grab_window argument is not
as necessary anymore as it would be with early acceptance/rejection. Right
now, it is unlikely that the grab_window handling will be implemented in
time for XI 2.2, so drop it from the protocol - let's not pretend we can
actually handle it.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 XI2proto.h         |    3 +--
 specs/XI2proto.txt |    4 ----
 2 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/XI2proto.h b/XI2proto.h
index 9039fe7..9ff3402 100644
--- a/XI2proto.h
+++ b/XI2proto.h
@@ -648,9 +648,8 @@ typedef struct {
     uint8_t     mode;
     uint8_t     pad;
     /* uint32_t    touchid;            Since XI 2.2 */
-    /* Window      grab_window;        Since XI 2.2 */
 } xXIAllowEventsReq;
-#define sz_xXIAllowEventsReq                   12 /**< 20 in XI 2.2 */
+#define sz_xXIAllowEventsReq                   12 /**< 16 in XI 2.2 */
 
 
 /**
diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index e1b5b8a..5035693 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -1420,7 +1420,6 @@ active device grab becomes not viewable.
                                ReplayDevice, AsyncPair, SyncPair, AcceptTouch*,
                                RejectTouch* }
             touchid*:        CARD32
-            grab_window*:    Window
     └───
 
 * since XI 2.2
@@ -1439,9 +1438,6 @@ ownership processing.
     touchid
         The ID of the touch sequence to accept or reject. The value is undefined
         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.
 
 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
-- 
1.7.7.5



More information about the xorg-devel mailing list