Add four-finger and five-finger gestures

Add four-finger and five-finger gestures, and move all gesture types
out to a separate file.

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

1 files changed, 10 insertions, 2 deletions

diff --git a/src/gestures-pan.c b/src/gestures-pan.c
index 6c34e5d..3094007 100644
--- a/src/gestures-pan.c
+++ b/src/gestures-pan.c
@@ -26,6 +26,15 @@
 #include <math.h>
 #include <stdio.h>
 
+static const int getype[DIM_TOUCH + 1] = {
+        0,
+        0,
+        GRAIL_TYPE_PAN,
+        GRAIL_TYPE_SWIPE,
+        GRAIL_TYPE_BRUSH,
+        GRAIL_TYPE_HAND,
+};
+
 int gru_pan(struct grail *ge,
             const struct touch_frame *frame)
 {
@@ -43,8 +52,7 @@ int gru_pan(struct grail *ge,
         if (!move->x.tickle && !move->y.tickle)
                 return 0;
         if (!state->active) {
-                int type = move->ntouch == 2 ? GRAIL_TYPE_PAN :
-                        move->ntouch == 3 ? GRAIL_TYPE_SWIPE : 0;
+                int type = getype[move->ntouch];
                 if (!type)
                         return 0;
                 state->gid = gin_gid_begin(ge, type, PRIO_GESTURE, frame);