aboutsummaryrefslogtreecommitdiffstats
path: root/src/common.h
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2009-05-16 20:07:01 +0200
committerHenrik Rydberg <rydberg@euromail.se>2009-05-16 20:07:01 +0200
commitba20f03d7d2794b3d794e839ba1db45ba327bb62 (patch)
tree35fdd3c1a3c9863c601750c81f24a56bca122b94 /src/common.h
parentecb6a617cc0af69fd4733d9095a5cff842b8e552 (diff)
downloadxorg-input-kobomultitouch-ba20f03d7d2794b3d794e839ba1db45ba327bb62.tar.gz
xorg-input-kobomultitouch-ba20f03d7d2794b3d794e839ba1db45ba327bb62.tar.bz2
xorg-input-kobomultitouch-ba20f03d7d2794b3d794e839ba1db45ba327bb62.zip
adapt to final version of MT protocol
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Diffstat (limited to 'src/common.h')
-rw-r--r--src/common.h33
1 files changed, 18 insertions, 15 deletions
diff --git a/src/common.h b/src/common.h
index 0ddfaaf..cbcde90 100644
--- a/src/common.h
+++ b/src/common.h
@@ -8,25 +8,28 @@
#include <linux/input.h>
#include <errno.h>
#include <match/match.h>
-//#include <exevents.h>
////////////////////////////////////////////////////////
-//#define BTN_MT_REPORT_PACKET 0x210 /* report multitouch packet data */
-//#define BTN_MT_REPORT_FINGER 0x211 /* report multitouch finger data */
-#define BTN_TOOL_PRESS 0x148 /* The trackpad is a physical button */
-#define BTN_MT_REPORT_PACKET 0x14b /* multitouch device */
-#define BTN_MT_REPORT_FINGER 0x14c /* multitouch device */
+
+// includes available in 2.6.30-rc5
+
+#ifndef BTN_TOOL_QUADTAP
#define BTN_TOOL_QUADTAP 0x14f /* Four fingers on trackpad */
+#define ABS_MT_TOUCH_MAJOR 0x30 /* Major axis of touching ellipse */
+#define ABS_MT_TOUCH_MINOR 0x31 /* Minor axis (omit if circular) */
+#define ABS_MT_WIDTH_MAJOR 0x32 /* Major axis of approaching ellipse */
+#define ABS_MT_WIDTH_MINOR 0x33 /* Minor axis (omit if circular) */
+#define ABS_MT_ORIENTATION 0x34 /* Ellipse orientation */
+#define ABS_MT_POSITION_X 0x35 /* Center X ellipse position */
+#define ABS_MT_POSITION_Y 0x36 /* Center Y ellipse position */
+#define ABS_MT_TOOL_TYPE 0x37 /* Type of touching device */
+#define ABS_MT_BLOB_ID 0x38 /* Group a set of packets as a blob */
+#define SYN_MT_REPORT 2
+#define MT_TOOL_FINGER 0
+#define MT_TOOL_PEN 1
+#endif
-#define ABS_MT_TOUCH 0x30
-#define ABS_MT_TOUCH_MAJOR 0x30
-#define ABS_MT_TOUCH_MINOR 0x31
-#define ABS_MT_WIDTH 0x32
-#define ABS_MT_WIDTH_MAJOR 0x32
-#define ABS_MT_WIDTH_MINOR 0x33
-#define ABS_MT_ORIENTATION 0x34
-#define ABS_MT_POSITION_X 0x35
-#define ABS_MT_POSITION_Y 0x36
+////////////////////////////////////////////////////////
#define SYSCALL(call) while (((call) == -1) && (errno == EINTR))