Introduce tapping

Simplify some common parts of the recognizer code and add tapping
to the gesture suite.

Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>

1 files changed, 16 insertions, 5 deletions

diff --git a/include/grail.h b/include/grail.h
index 0570101..1adeda2 100644
--- a/include/grail.h
+++ b/include/grail.h
@@ -34,11 +34,22 @@
 #define DIM_GRAIL_PROP          16
 #define DIM_GRAIL_PROP_BYTES    ((DIM_GRAIL_PROP + 7) >> 3)
 
-#define GRAIL_TYPE_MOVE         0
-#define GRAIL_TYPE_SCROLL       1
-#define GRAIL_TYPE_ZOOM         2
-#define GRAIL_TYPE_ROTATE       3
-#define GRAIL_TYPE_SZRCOMBO     4
+#define GRAIL_TYPE_MOVE         0       /* reserved */
+
+#define GRAIL_TYPE_PAN          1       /* two-finger pan/scroll */
+#define GRAIL_TYPE_PINCH        2       /* two-finger pinch-to-zoom */
+#define GRAIL_TYPE_ROTATE       3       /* two-finger rotation */
+#define GRAIL_TYPE_COMBO2       4       /* two-finger combo */
+#define GRAIL_TYPE_SWIPE        5       /* three-finger pan */
+#define GRAIL_TYPE_SCALE        6       /* three-finger pinch */
+#define GRAIL_TYPE_TURN         7       /* three-finger rotate */
+#define GRAIL_TYPE_COMBO3       8       /* three-finger combo */
+
+#define GRAIL_TYPE_TAP1         9       /* single one-finger tap */
+#define GRAIL_TYPE_TAP2         10      /* single two-finger tap */
+#define GRAIL_TYPE_TAP3         11      /* single three-finger tap */
+#define GRAIL_TYPE_TAP4         12      /* single four-finger tap */
+#define GRAIL_TYPE_TAP5         13      /* single five-finger tap */
 
 #define GRAIL_STATUS_BEGIN      0
 #define GRAIL_STATUS_UPDATE     1