aboutsummaryrefslogtreecommitdiff
path: root/X11/extensions
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-12-23 14:08:34 +0100
committermarha <marha@users.sourceforge.net>2011-12-23 14:08:34 +0100
commit52b002a44dc240c8c24edb5418e11c49c0bb3e58 (patch)
treed52979538e1452343e77a75f47283f69e468505b /X11/extensions
parentf46c6ffa82d4965b8a703b6b679eedeb48bc2c3b (diff)
parent0b3f475361d87764004432f541e34bb86af1b9f3 (diff)
downloadvcxsrv-52b002a44dc240c8c24edb5418e11c49c0bb3e58.tar.gz
vcxsrv-52b002a44dc240c8c24edb5418e11c49c0bb3e58.tar.bz2
vcxsrv-52b002a44dc240c8c24edb5418e11c49c0bb3e58.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'X11/extensions')
-rw-r--r--X11/extensions/XI.h11
-rw-r--r--X11/extensions/XI2.h14
-rw-r--r--X11/extensions/XI2proto.h5
3 files changed, 20 insertions, 10 deletions
diff --git a/X11/extensions/XI.h b/X11/extensions/XI.h
index 378b34a16..7b443997c 100644
--- a/X11/extensions/XI.h
+++ b/X11/extensions/XI.h
@@ -135,6 +135,17 @@ SOFTWARE.
#define XI_FOOTMOUSE "FOOTMOUSE"
#define XI_JOYSTICK "JOYSTICK"
+/* Indices into the versions[] array (XExtInt.c). Used as a index to
+ * retrieve the minimum version of XI from _XiCheckExtInit */
+#define Dont_Check 0
+#define XInput_Initial_Release 1
+#define XInput_Add_XDeviceBell 2
+#define XInput_Add_XSetDeviceValuators 3
+#define XInput_Add_XChangeDeviceControl 4
+#define XInput_Add_DevicePresenceNotify 5
+#define XInput_Add_DeviceProperties 6
+/* DO NOT ADD TO HERE -> XI2 */
+
#define XI_Absent 0
#define XI_Present 1
diff --git a/X11/extensions/XI2.h b/X11/extensions/XI2.h
index af2802f0b..436800623 100644
--- a/X11/extensions/XI2.h
+++ b/X11/extensions/XI2.h
@@ -191,14 +191,14 @@
#define XI_RawButtonPress 15
#define XI_RawButtonRelease 16
#define XI_RawMotion 17
-#define XI_TouchBegin 18 /* XI 2.1 */
-#define XI_TouchEnd 19
-#define XI_TouchOwnership 20
-#define XI_TouchUpdate 21
+#define XI_TouchBegin 18 /* XI 2.2 */
+#define XI_TouchUpdate 19
+#define XI_TouchEnd 20
+#define XI_TouchOwnership 21
#define XI_RawTouchBegin 22
-#define XI_RawTouchEnd 23
-#define XI_RawTouchUpdate 24
-#define XI_LASTEVENT XI_RawTouchUpdate
+#define XI_RawTouchUpdate 23
+#define XI_RawTouchEnd 24
+#define XI_LASTEVENT XI_RawTouchEnd
/* NOTE: XI2LASTEVENT in xserver/include/inputstr.h must be the same value
* as XI_LASTEVENT if the server is supposed to handle masks etc. for this
* type of event. */
diff --git a/X11/extensions/XI2proto.h b/X11/extensions/XI2proto.h
index 9b867d803..090c42ba0 100644
--- a/X11/extensions/XI2proto.h
+++ b/X11/extensions/XI2proto.h
@@ -652,7 +652,7 @@ typedef struct {
uint16_t deviceid;
uint8_t mode;
uint8_t pad;
- uint32_t touch_id; /**< Since XI 2.2 */
+ 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 */
@@ -906,7 +906,7 @@ typedef struct
Window event;
Window child;
/* └──────── 32 byte boundary ────────┘ */
- uint16_t sourceid; /**< Source of the new classes */
+ uint16_t sourceid;
uint16_t pad0;
uint32_t flags;
uint32_t pad1;
@@ -941,7 +941,6 @@ typedef struct
uint32_t flags; /**< ::XIKeyRepeat */
xXIModifierInfo mods;
xXIGroupInfo group;
- uint32_t active_touches; /**< Number of touches on source device (XI 2.1 only) */
} xXIDeviceEvent;