10 files changed, 53 insertions, 121 deletions

diff --git a/include/grail-types.h b/include/grail-types.h
index 7de11b0..028a71b 100644
--- a/include/grail-types.h
+++ b/include/grail-types.h
@@ -23,32 +23,37 @@
 #ifndef _GRAIL_TYPES_H
 #define _GRAIL_TYPES_H
 
-#define GRAIL_TYPE_POINTER      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_BRUSH        9       /* four-finger pan */
-#define GRAIL_TYPE_PICK         10      /* four-finger pinch */
-#define GRAIL_TYPE_WHIRL        11      /* four-finger rotate */
-#define GRAIL_TYPE_COMBO4       12      /* four-finger combo */
-
-#define GRAIL_TYPE_HAND         13      /* five-finger pan */
-#define GRAIL_TYPE_GRAB         14      /* five-finger pinch */
-#define GRAIL_TYPE_REVOLVE      15      /* five-finger rotate */
-#define GRAIL_TYPE_COMBO5       16      /* five-finger combo */
-
-#define GRAIL_TYPE_TAP1         17      /* single one-finger tap */
-#define GRAIL_TYPE_TAP2         18      /* single two-finger tap */
-#define GRAIL_TYPE_TAP3         19      /* single three-finger tap */
-#define GRAIL_TYPE_TAP4         20      /* single four-finger tap */
-#define GRAIL_TYPE_TAP5         21      /* single five-finger tap */
+#define GRAIL_TYPE_DRAG1        0       /* one-finger drag/pan/scroll */
+#define GRAIL_TYPE_PINCH1       1       /* one-finger pinch-to-zoom */
+#define GRAIL_TYPE_ROTATE1      2       /* one-finger rotation */
+
+#define GRAIL_TYPE_DRAG2        3       /* two-finger drag/pan/scroll */
+#define GRAIL_TYPE_PINCH2       4       /* two-finger pinch-to-zoom */
+#define GRAIL_TYPE_ROTATE2      5       /* two-finger rotation */
+
+#define GRAIL_TYPE_DRAG3        6       /* three-finger drag/pan */
+#define GRAIL_TYPE_PINCH3       7       /* three-finger pinch */
+#define GRAIL_TYPE_ROTATE3      8       /* three-finger rotate */
+
+#define GRAIL_TYPE_DRAG4        9       /* four-finger drag/pan */
+#define GRAIL_TYPE_PINCH4       10      /* four-finger pinch */
+#define GRAIL_TYPE_ROTATE4      11      /* four-finger rotate */
+
+#define GRAIL_TYPE_DRAG5        12      /* five-finger drag/pan */
+#define GRAIL_TYPE_PINCH5       13      /* five-finger pinch */
+#define GRAIL_TYPE_ROTATE5      14      /* five-finger rotate */
+
+#define GRAIL_TYPE_TAP1         15      /* one-finger single tap */
+#define GRAIL_TYPE_TAP2         16      /* two-finger single tap */
+#define GRAIL_TYPE_TAP3         17      /* three-finger single tap */
+#define GRAIL_TYPE_TAP4         18      /* four-finger single tap */
+#define GRAIL_TYPE_TAP5         19      /* five-finger single tap */
+
+#define GRAIL_PROP_DRAG_DX      0       /* horizontal position delta */
+#define GRAIL_PROP_DRAG_DY      1       /* vertical position delta */
+#define GRAIL_PROP_DRAG_VX      2       /* horizontal velocity */
+#define GRAIL_PROP_DRAG_VY      3       /* vertical velocity */
+#define GRAIL_PROP_DRAG_X       4       /* horizontal position */
+#define GRAIL_PROP_DRAG_Y       5       /* vertical position */
 
 #endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 7dc3ac2..96ac7ed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,10 +15,9 @@ libgrail_la_SOURCES = \
         grail-inserter.h \
         grail-gestures.c \
         grail-gestures.h \
-        gestures-pan.c \
+        gestures-drag.c \
         gestures-pinch.c \
         gestures-rotate.c \
-        gestures-combo.c \
         gestures-tapping.c \
         grail-recognizer.c \
         grail-recognizer.h \
diff --git a/src/gestures-combo.c b/src/gestures-combo.c
deleted file mode 100644
index 5b6de5b..0000000
--- a/src/gestures-combo.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*****************************************************************************
- *
- * grail - Gesture Recognition And Instantiation Library
- *
- * Copyright (C) 2010 Canonical Ltd.
- * Copyright (C) 2010 Henrik Rydberg <rydberg@bitmath.org>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- ****************************************************************************/
-
-#include "grail-recognizer.h"
-#include <math.h>
-#include <stdio.h>
-
-static const int getype[DIM_TOUCH + 1] = {
-        0,
-        0,
-        GRAIL_TYPE_COMBO2,
-        GRAIL_TYPE_COMBO3,
-        GRAIL_TYPE_COMBO4,
-        GRAIL_TYPE_COMBO5,
-};
-
-static const int fm_mask = 0x0f;
-
-int gru_combo(struct grail *ge,
-              const struct touch_frame *frame)
-{
-        struct gesture_recognizer *gru = ge->gru;
-        struct combo_model *state = &gru->combo;
-        struct move_model *move = &gru->move;
-        grail_prop_t prop[DIM_GRAIL_PROP];
-        int mask = state->active ? (move->active & fm_mask) : fm_mask;
-        if (!move->multi) {
-                if (state->active) {
-                        gru_end(ge, state->gid, move);
-                        state->active = 0;
-                }
-                return 0;
-        }
-        if (!(move->tickle & mask))
-                return 0;
-        if (!state->active) {
-                int type = getype[move->ntouch];
-                if (!type)
-                        return 0;
-                state->gid = gin_gid_begin(ge, type, PRIO_GESTURE, frame);
-                state->active = 1;
-        }
-        if (!(move->active & fm_mask))
-                return 0;
-        prop[0] = move->fm[FM_X].action_delta;
-        prop[1] = move->fm[FM_Y].action_delta;
-        prop[2] = move->fm[FM_R].action_delta;
-        prop[3] = move->fm[FM_A].action_delta;
-        gru_event(ge, state->gid, move, prop, 4);
-        return 1;
-}
diff --git a/src/gestures-pan.c b/src/gestures-drag.c
index c951b78..3f21041 100644
--- a/src/gestures-pan.c
+++ b/src/gestures-drag.c
@@ -26,20 +26,20 @@
 
 static const int getype[DIM_TOUCH + 1] = {
         -1,
-        GRAIL_TYPE_POINTER,
-        GRAIL_TYPE_PAN,
-        GRAIL_TYPE_SWIPE,
-        GRAIL_TYPE_BRUSH,
-        GRAIL_TYPE_HAND,
+        GRAIL_TYPE_DRAG1,
+        GRAIL_TYPE_DRAG2,
+        GRAIL_TYPE_DRAG3,
+        GRAIL_TYPE_DRAG4,
+        GRAIL_TYPE_DRAG5,
 };
 
 static const int fm_mask = 0x03;
 
-int gru_pan(struct grail *ge,
+int gru_drag(struct grail *ge,
             const struct touch_frame *frame)
 {
         struct gesture_recognizer *gru = ge->gru;
-        struct combo_model *state = &gru->pan;
+        struct combo_model *state = &gru->drag;
         struct move_model *move = &gru->move;
         grail_prop_t prop[DIM_GRAIL_PROP];
         int mask = state->active ? (move->active & fm_mask) : fm_mask;
diff --git a/src/gestures-pinch.c b/src/gestures-pinch.c
index 62f6601..3b94a66 100644
--- a/src/gestures-pinch.c
+++ b/src/gestures-pinch.c
@@ -27,10 +27,10 @@
 static const int getype[DIM_TOUCH + 1] = {
         0,
         0,
-        GRAIL_TYPE_PINCH,
-        GRAIL_TYPE_SCALE,
-        GRAIL_TYPE_PICK,
-        GRAIL_TYPE_GRAB,
+        GRAIL_TYPE_PINCH2,
+        GRAIL_TYPE_PINCH3,
+        GRAIL_TYPE_PINCH4,
+        GRAIL_TYPE_PINCH5,
 };
 
 static const int fm_mask = 0x04;
diff --git a/src/gestures-rotate.c b/src/gestures-rotate.c
index fa0db22..ebab6d3 100644
--- a/src/gestures-rotate.c
+++ b/src/gestures-rotate.c
@@ -27,10 +27,10 @@
 static const int getype[DIM_TOUCH + 1] = {
         0,
         0,
-        GRAIL_TYPE_ROTATE,
-        GRAIL_TYPE_TURN,
-        GRAIL_TYPE_WHIRL,
-        GRAIL_TYPE_REVOLVE,
+        GRAIL_TYPE_ROTATE2,
+        GRAIL_TYPE_ROTATE3,
+        GRAIL_TYPE_ROTATE4,
+        GRAIL_TYPE_ROTATE5,
 };
 
 static const int fm_mask = 0x08;
diff --git a/src/grail-gestures.h b/src/grail-gestures.h
index 2acbb6d..6846ed0 100644
--- a/src/grail-gestures.h
+++ b/src/grail-gestures.h
@@ -63,8 +63,8 @@ struct combo_model {
         int active, gid;
 };
 
-int gru_pan(struct grail *ge,
-            const struct touch_frame *frame);
+int gru_drag(struct grail *ge,
+             const struct touch_frame *frame);
 int gru_pinch(struct grail *ge,
               const struct touch_frame *frame);
 int gru_rotate(struct grail *ge,
diff --git a/src/grail-recognizer.c b/src/grail-recognizer.c
index bcfbc2c..5f4bee0 100644
--- a/src/grail-recognizer.c
+++ b/src/grail-recognizer.c
@@ -47,10 +47,9 @@ void gru_recognize(struct grail *ge, const struct touch_frame *frame)
         if (!ge->gin || !ge->gru)
                 return;
         gru_motion(ge, frame);
-        gru_pan(ge, frame);
+        gru_drag(ge, frame);
         gru_pinch(ge, frame);
         gru_rotate(ge, frame);
-        gru_combo(ge, frame);
         gru_tapping(ge, frame);
         ge->gru->frame = *frame;
 }
diff --git a/src/grail-recognizer.h b/src/grail-recognizer.h
index 11b44ce..1c36819 100644
--- a/src/grail-recognizer.h
+++ b/src/grail-recognizer.h
@@ -28,10 +28,9 @@
 struct gesture_recognizer {
         struct touch_frame frame;
         struct move_model move;
-        struct combo_model pan;
+        struct combo_model drag;
         struct combo_model pinch;
         struct combo_model rotate;
-        struct combo_model combo;
         struct tapping_model tapping;
         int pointer_gesture;
 };
diff --git a/test/grail-gesture.c b/test/grail-gesture.c
index 16b33ac..8e34f84 100644
--- a/test/grail-gesture.c
+++ b/test/grail-gesture.c
@@ -46,7 +46,7 @@ static int tp_get_clients(struct grail *ge,
 
 static void tp_event(struct grail *ge, const struct input_event *ev)
 {
-        if (!grail_mask_get(flag_mask, GRAIL_TYPE_POINTER))
+        if (!grail_mask_get(flag_mask, GRAIL_TYPE_DRAG1))
                 return;
         fprintf(stderr, "event %d 0x%x %d\n", ev->type, ev->code, ev->value);
 }