Merge remote-tracking branch 'inputproto/master' into multitouch-devel

Conflicts:
	XI2.h
	XI2proto.h
	specs/XI2proto.txt

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>

1 files changed, 10 insertions, 2 deletions

diff --git a/XI2.h b/XI2.h
index 43c5836..ca5ce07 100644
--- a/XI2.h
+++ b/XI2.h
@@ -35,8 +35,7 @@
    See commit libXi-1.4.2-21-ge8531dd */
 
 #define XI_2_Major                              2
-#define XI_2_Minor                              0
-#define XI_2_1_Minor                            1
+#define XI_2_Minor                              1
 
 /* Property event flags */
 #define XIPropertyDeleted                       0
@@ -148,9 +147,18 @@
 #define XIKeyClass                              0
 #define XIButtonClass                           1
 #define XIValuatorClass                         2
+#define XIScrollClass                           3
 #define XITouchClass                            8
 #define XITouchValuatorClass                    9
 
+/* Scroll class types */
+#define XIScrollTypeVertical                    1
+#define XIScrollTypeHorizontal                  2
+
+/* Scroll class flags */
+#define XIScrollFlagNoEmulation                 (1 << 0)
+#define XIScrollFlagPreferred                   (1 << 1)
+
 /* Device event flags (common) */
 /* Device event flags (key events only) */
 #define XIKeyRepeat                             (1 << 16)