gesture: Improved tickle/active logic

Reorganize the mode model to use bitmasks for tickle and active,
and refine the tickle logic for each gesture.

1 files changed, 6 insertions, 5 deletions

diff --git a/src/gestures-pinch.c b/src/gestures-pinch.c
index c0d6a17..358718d 100644
--- a/src/gestures-pinch.c
+++ b/src/gestures-pinch.c
@@ -33,6 +33,8 @@ static const int getype[DIM_TOUCH + 1] = {
         GRAIL_TYPE_GRAB,
 };
 
+static const int fm_mask = 0x04;
+
 int gru_pinch(struct grail *ge,
               const struct touch_frame *frame)
 {
@@ -40,6 +42,7 @@ int gru_pinch(struct grail *ge,
         struct combo_model *state = &gru->pinch;
         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);
@@ -47,9 +50,7 @@ int gru_pinch(struct grail *ge,
                 }
                 return 0;
         }
-        if (!move->a.tickle)
-                return 0;
-        if (!move->r.tickle)
+        if (!(move->tickle & mask))
                 return 0;
         if (!state->active) {
                 int type = getype[move->ntouch];
@@ -58,9 +59,9 @@ int gru_pinch(struct grail *ge,
                 state->gid = gin_gid_begin(ge, type, PRIO_GESTURE, frame);
                 state->active = 1;
         }
-        if (!move->r.active)
+        if (!(move->active & fm_mask))
                 return 0;
-        prop[0] = move->r.delta;
+        prop[0] = move->fm[FM_R].delta;
         gru_event(ge, state->gid, move, prop, 1);
         return 1;
 }