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, 9 insertions, 3 deletions

diff --git a/src/grail-gestures.h b/src/grail-gestures.h
index 6ba6cf7..3ace580 100644
--- a/src/grail-gestures.h
+++ b/src/grail-gestures.h
@@ -29,15 +29,21 @@
 #define PRIO_GESTURE    2
 #define PRIO_TAP        3
 
+#define DIM_FM          4
+
+#define FM_X            0
+#define FM_Y            1
+#define FM_R            2
+#define FM_A            3
+
 struct filter_model {
         float delta, val, orig, fuzz, bar;
-        int tickle, active;
 };
 
 struct move_model {
-        struct filter_model x, y, r, a;
+        struct filter_model fm[DIM_FM];
+        int tickle, active;
         int single, multi, ntouch;
-        float dx, dy, dr, da;
         grail_time_t time;
 };