Decouple timeout from discard

Move the actual gesture discard from the recognition phase
to the instantiation phase.

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

1 files changed, 15 insertions, 0 deletions

diff --git a/src/grail-inserter.c b/src/grail-inserter.c
index 1ee8e5a..5225cb8 100644
--- a/src/grail-inserter.c
+++ b/src/grail-inserter.c
@@ -143,6 +143,13 @@ 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->timeout)
+                        continue;
+                gin_gid_discard(ge, s->id);
+        }
+
+        grail_mask_foreach(i, gin->used, sizeof(gin->used)) {
+                struct slot_state *s = &gin->state[i];
                 struct gesture_event ev;
                 grail_mask_set(gin->types, s->type);
                 if (s->priority < hold[s->slice])
@@ -178,6 +185,7 @@ int gin_gid_begin(struct grail *ge, int type, int priority,
                 s->priority = priority;
                 s->slice = 0;
         }
+        s->timeout = 0;
         s->id = gin->gestureid++ & MAX_GESTURE_ID;
         s->status = GRAIL_STATUS_BEGIN;
         s->nclient = 0;
@@ -204,6 +212,13 @@ void gin_gid_discard(struct grail *ge, int gid)
         grail_mask_set(gin->unused, i);
 }
 
+void gin_gid_timeout(struct grail *ge, int gid)
+{
+        int i = find_gslot(ge->gin, gid);
+        if (i >= 0)
+                ge->gin->state[i].timeout = 1;
+}
+
 void gin_gid_event(struct grail *ge, int gid,
                    float x, float y, int ntouch,
                    const grail_prop_t *prop, int nprop,