Introduce zoom, rotate and combo gestures

Introduce grail_mask bit functions, and add new gestures as separate
functions, referring to the same move model.

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

1 files changed, 82 insertions, 0 deletions

diff --git a/src/gestures-combo.c b/src/gestures-combo.c
new file mode 100644
index 0000000..4ecd1e4
--- /dev/null
+++ b/src/gestures-combo.c
@@ -0,0 +1,82 @@
+/*****************************************************************************
+ *
+ * grail - Gesture Recognition And Instantiation Library
+ *
+ * Copyright (C) 2010 Canonical Ltd.
+ *
+ * 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/>.
+ *
+ * Authors:
+ *      Henrik Rydberg <rydberg@bitmath.org>
+ *
+ ****************************************************************************/
+
+#include "grail-recognizer.h"
+#include <math.h>
+#include <stdio.h>
+
+void gru_reset_combo(struct grail *ge,
+                     const struct touch_frame *frame)
+{
+        struct gesture_inserter *gin = ge->gin;
+        struct gesture_recognizer *gru = ge->gru;
+        struct combo_model *state = &gru->combo;
+        struct move_model *move = &gru->move;
+        gin_gesture_discard_type(gin, GRAIL_TYPE_SZRCOMBO);
+        state->r = move->r;
+        state->active = 0;
+        state->running = 0;
+}
+
+int gru_combo(struct grail *ge,
+              const struct touch_frame *frame)
+{
+        struct gesture_inserter *gin = ge->gin;
+        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];
+        float dx, dy, dr, da;
+        int i;
+        dx = move->x - state->x;
+        dy = move->y - state->y;
+        dr = move->r - state->r;
+        da = move->a - state->a;
+        if (fabs(dx) < 1 && fabs(dy) < 1 && fabs(da) < 1 && fabs(dr) < 1)
+                return 0;
+        if (!state->active) {
+                i = gin_gesture_begin(ge,
+                                      GRAIL_TYPE_SZRCOMBO, 2,
+                                      frame->touches, sizeof(frame->touches));
+                state->geslot = i;
+                state->active = 1;
+        }
+        if (!state->running &&
+            fabs(dx) < move->xbar && fabs(dy) < move->ybar &&
+            fabs(da) < move->abar && fabs(dr) < move->rbar)
+                return 0;
+        state->running = 1;
+        prop[0] = dx;
+        prop[1] = dy;
+        prop[2] = dr;
+        prop[3] = da;
+        gin_gesture_event(gin, state->geslot,
+                          move->x, move->y, move->ntouch,
+                          prop, 4);
+        state->x = move->x;
+        state->y = move->y;
+        state->r = move->r;
+        state->a = move->a;
+        return 1;
+}