api: Rename gestures to conform to design docs

Use the names drag, pinch and rotate, and remove the combo gesture.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

1 files changed, 74 insertions, 0 deletions

diff --git a/src/gestures-drag.c b/src/gestures-drag.c
new file mode 100644
index 0000000..3f21041
--- /dev/null
+++ b/src/gestures-drag.c
@@ -0,0 +1,74 @@
+/*****************************************************************************
+ *
+ * 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] = {
+        -1,
+        GRAIL_TYPE_DRAG1,
+        GRAIL_TYPE_DRAG2,
+        GRAIL_TYPE_DRAG3,
+        GRAIL_TYPE_DRAG4,
+        GRAIL_TYPE_DRAG5,
+};
+
+static const int fm_mask = 0x03;
+
+int gru_drag(struct grail *ge,
+            const struct touch_frame *frame)
+{
+        struct gesture_recognizer *gru = ge->gru;
+        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;
+        if (!move->multi && (!gru->pointer_gesture || !move->single)) {
+                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 < 0)
+                        return 0;
+                state->gid = gin_gid_begin(ge, type, PRIO_GESTURE, frame);
+                state->active = 1;
+        }
+        if (move->single) {
+                prop[0] = move->fm[FM_X].raw_delta;
+                prop[1] = move->fm[FM_Y].raw_delta;
+        } else {
+                if (!(move->active & fm_mask))
+                        return 0;
+                prop[0] = move->fm[FM_X].action_delta;
+                prop[1] = move->fm[FM_Y].action_delta;
+        }
+        gru_event(ge, state->gid, move, prop, 2);
+        return 1;
+}
+