summaryrefslogtreecommitdiff
path: root/XI2.h
diff options
context:
space:
mode:
authorChase Douglas <chase.douglas@canonical.com>2011-02-20 16:35:09 -0500
committerChase Douglas <chase.douglas@canonical.com>2011-02-22 09:47:02 -0500
commitdb7c0eccc74e95f247d78541e4c4a28cfa87b5b4 (patch)
tree54468793190286bc3a5aa364132f3d4abc584515 /XI2.h
parent99f15a2346c882237c78afbd638932f132d6113c (diff)
Updates for pointer emulation and more touch device modes
Also includes resolutions for dependent devices and implicit grabs and how to handle slave touch device attachment and touch selections. Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Diffstat (limited to 'XI2.h')
-rw-r--r--XI2.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/XI2.h b/XI2.h
index 40c9ca6..dbf14a8 100644
--- a/XI2.h
+++ b/XI2.h
@@ -32,6 +32,7 @@
#define Dont_Check 0
#endif
#define XInput_2_0 7
+#define XInput_2_1 8
#define XI_2_Major 2
@@ -132,16 +133,16 @@
/* Device event flags (common) */
/* Device event flags (key events only) */
#define XIKeyRepeat (1 << 16)
-/* Device event flags (pointer events only) */
+/* Device event flags (pointer and touch events only) */
#define XIPointerEmulated (1 << 16)
/* Device event flags (touch events only) */
-#define XITouchPendingEnd (1 << 16)
-/* Device event flags (touch end events only) */
-#define XITouchAccepted (1 << 17)
+#define XITouchPendingEnd (1 << 17)
/* Touch modes */
#define XIDirectTouch 1
#define XIDependentTouch 2
+#define XIIndependentPointer 3
+#define XISemiMultitouch 4
/* XI2 event mask macros */
#define XISetMask(ptr, event) (((unsigned char*)(ptr))[(event)>>3] |= (1 << ((event) & 7)))