aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-02-13 16:48:00 +0100
committermarha <marha@users.sourceforge.net>2012-02-13 16:48:00 +0100
commitd19dd4c9cf37b7b691552c4f4dd873471e31ca68 (patch)
tree66991af3f814a4bca326d21a61919f6e6c919323
parent179ebdfaf7fe0a0017054c052b76210eeff084a9 (diff)
parent0ae7710db53515dab4a35c33ba9a030bbfc2ac5b (diff)
downloadvcxsrv-d19dd4c9cf37b7b691552c4f4dd873471e31ca68.tar.gz
vcxsrv-d19dd4c9cf37b7b691552c4f4dd873471e31ca68.tar.bz2
vcxsrv-d19dd4c9cf37b7b691552c4f4dd873471e31ca68.zip
Merge remote-tracking branch 'origin/released'
-rw-r--r--X11/extensions/XI2proto.h19
-rw-r--r--packages.txt2
2 files changed, 18 insertions, 3 deletions
diff --git a/X11/extensions/XI2proto.h b/X11/extensions/XI2proto.h
index 090c42ba0..67a14dda5 100644
--- a/X11/extensions/XI2proto.h
+++ b/X11/extensions/XI2proto.h
@@ -652,10 +652,25 @@ typedef struct {
uint16_t deviceid;
uint8_t mode;
uint8_t pad;
+} xXIAllowEventsReq;
+#define sz_xXIAllowEventsReq 12
+
+/**
+ * Allow or replay events on the specified grabbed device.
+ * Since XI 2.2
+ */
+typedef struct {
+ uint8_t reqType;
+ uint8_t ReqType; /**< Always ::X_XIAllowEvents */
+ uint16_t length; /**< Length in 4 byte units */
+ Time time;
+ uint16_t deviceid;
+ uint8_t mode;
+ uint8_t pad;
uint32_t touchid; /**< Since XI 2.2 */
Window grab_window; /**< Since XI 2.2 */
-} xXIAllowEventsReq;
-#define sz_xXIAllowEventsReq 20 /**< Was 12 before XI 2.2 */
+} xXI2_2AllowEventsReq;
+#define sz_xXI2_2AllowEventsReq 20
/**
diff --git a/packages.txt b/packages.txt
index f6e1e8bd2..5fef93b21 100644
--- a/packages.txt
+++ b/packages.txt
@@ -46,7 +46,7 @@ fontconfig git version
fontsproto-2.1.1
freetype-2.4.8
glproto git version
-inputproto-2.1.99.5
+inputproto-2.1.99.6
kbproto-1.0.5
libX11 git version
libXau git version