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, 7 insertions, 4 deletions

diff --git a/src/gestures-pan.c b/src/gestures-pan.c
index 320a987..a023122 100644
--- a/src/gestures-pan.c
+++ b/src/gestures-pan.c
@@ -33,6 +33,8 @@ static const int getype[DIM_TOUCH + 1] = {
         GRAIL_TYPE_HAND,
 };
 
+static const int fm_mask = 0x03;
+
 int gru_pan(struct grail *ge,
             const struct touch_frame *frame)
 {
@@ -40,6 +42,7 @@ int gru_pan(struct grail *ge,
         struct combo_model *state = &gru->pan;
         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,7 +50,7 @@ int gru_pan(struct grail *ge,
                 }
                 return 0;
         }
-        if (!move->x.tickle && !move->y.tickle)
+        if (!(move->tickle & mask))
                 return 0;
         if (!state->active) {
                 int type = getype[move->ntouch];
@@ -56,10 +59,10 @@ int gru_pan(struct grail *ge,
                 state->gid = gin_gid_begin(ge, type, PRIO_GESTURE, frame);
                 state->active = 1;
         }
-        if (!move->x.active && !move->y.active)
+        if (!(move->active & fm_mask))
                 return 0;
-        prop[0] = move->x.active ? move->x.delta : 0;
-        prop[1] = move->y.active ? move->y.delta : 0;
+        prop[0] = move->fm[FM_X].delta;
+        prop[1] = move->fm[FM_Y].delta;
         gru_event(ge, state->gid, move, prop, 2);
         return 1;
 }