Do not timeout gestures overlapping touch gestures

The notion of listening to touch gestures implies that the
touches of those gestures never timeout. Hence, any pending
gesture that overlaps those touches should not timeout.

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

1 files changed, 22 insertions, 0 deletions

diff --git a/src/grail-inserter.c b/src/grail-inserter.c
index 5225cb8..fc9076a 100644
--- a/src/grail-inserter.c
+++ b/src/grail-inserter.c
@@ -38,6 +38,18 @@ static int find_gslot(const struct gesture_inserter *gin, int gid)
         return -1;
 }
 
+static int mask_overlap(const grail_mask_t *a, const grail_mask_t *b,
+                        int bytes)
+{
+        int i;
+
+        for (i = 0; i < bytes; i++)
+                if (a[i] & b[i])
+                        return 1;
+
+        return 0;
+}
+
 // todo: spanning tree for multi-user case
 static void setup_new_gestures(struct grail *ge,
                                const struct utouch_frame *frame)
@@ -119,8 +131,10 @@ void gin_frame_begin(struct grail *ge, const struct utouch_frame *frame)
 void gin_frame_end(struct grail *ge, const struct utouch_frame *frame)
 {
         struct gesture_inserter *gin = ge->gin;
+        grail_mask_t keep[DIM_TOUCH_BYTES];
         int i, hold[2] = { 0, 0 }, discard[2] = { 0, 0 };
 
+        memset(keep, 0, sizeof(keep));
         setup_new_gestures(ge, frame);
 
         grail_mask_foreach(i, gin->used, sizeof(gin->used)) {
@@ -143,8 +157,16 @@ void gin_frame_end(struct grail *ge, const struct utouch_frame *frame)
 
         grail_mask_foreach(i, gin->used, sizeof(gin->used)) {
                 struct slot_state *s = &gin->state[i];
+                if (s->slice == 1)
+                        grail_mask_set_mask(keep, s->span, sizeof(keep));
+        }
+
+        grail_mask_foreach(i, gin->used, sizeof(gin->used)) {
+                struct slot_state *s = &gin->state[i];
                 if (!s->timeout)
                         continue;
+                if (mask_overlap(keep, s->span, sizeof(keep)))
+                        continue;
                 gin_gid_discard(ge, s->id);
         }