Add environment and meta gestures

With meta gestures, the gesture starts given a certain number of
fingers, but can then continue even if the number of fingers change.
By configuration, such gestures live on a different priority plane
from normal gestures. To match window manager specs, this patch adds
the environment and meta planes, and add drag, pinch and rotate gestures
initiated with three and four fingers, respectively.

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

1 files changed, 41 insertions, 0 deletions

diff --git a/src/gestures-pinch.c b/src/gestures-pinch.c
index 0ddffa4..91e6504 100644
--- a/src/gestures-pinch.c
+++ b/src/gestures-pinch.c
@@ -100,3 +100,44 @@ int gru_pinch(struct grail *ge,
         gru_event(ge, state->gid, move, state->prop, state->nprop);
         return 1;
 }
+
+int gru_winpinch(struct grail *ge,
+                 const struct touch_frame *frame)
+{
+        struct gesture_recognizer *gru = ge->gru;
+        struct combo_model *state = &gru->winpinch;
+        struct move_model *move = &gru->move;
+        int mask = state->active ? (move->active & fm_mask) : fm_mask;
+        if (!move->multi) {
+                if (state->active && out_of_bounds(state, move)) {
+                        gru_end(ge, state->gid, move,
+                                state->prop, state->nprop);
+                        state->active = 0;
+                }
+                return 0;
+        }
+        if (!(move->tickle & mask))
+                return 0;
+        if (!state->active) {
+                if (move->ntouch == 4) {
+                        state->gid = gin_gid_begin(ge, GRAIL_TYPE_MPINCH,
+                                                   PRIO_META, frame);
+                        state->mintouch = 2;
+                        state->maxtouch = 4;
+                        state->active = 1;
+                } else if (move->ntouch == 3) {
+                        state->gid = gin_gid_begin(ge, GRAIL_TYPE_EPINCH,
+                                                   PRIO_ENV, frame);
+                        state->mintouch = 2;
+                        state->maxtouch = 3;
+                        state->active = 1;
+                } else {
+                        return 0;
+                }
+        }
+        if (!(move->active & fm_mask))
+                return 0;
+        set_props(state, move, frame);
+        gru_event(ge, state->gid, move, state->prop, state->nprop);
+        return 1;
+}