From ee4a0c6821a1b79c3d18c6ef6d7ed6d37df74755 Mon Sep 17 00:00:00 2001
From: Henrik Rydberg <rydberg@euromail.se>
Date: Sat, 7 Aug 2010 18:28:29 +0200
Subject: gesture: Improved tickle/active logic

Reorganize the mode model to use bitmasks for tickle and active,
and refine the tickle logic for each gesture.
---
 src/grail-gestures.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/grail-gestures.h')

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;
 };
 
-- 
cgit v1.2.3