Introduce gesture timeouts

The timeout of a gesture is integral to the gesture type.
This patch introduces timeout per gesture type, potentially
enabling more control over gesture timing aspects. The timeout
logic replaces the recently added recognition state.

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

1 files changed, 14 insertions, 0 deletions

diff --git a/src/gestures-pinch.c b/src/gestures-pinch.c
index fa8a626..e022e8d 100644
--- a/src/gestures-pinch.c
+++ b/src/gestures-pinch.c
@@ -62,6 +62,13 @@ int gru_pinch(struct grail *ge,
                 }
                 return 0;
         }
+        if ((move->timeout & fm_mask) == fm_mask) {
+                if (state->active) {
+                        gin_gid_discard(ge, state->gid);
+                        state->active = 0;
+                }
+                return 0;
+        }
         if (!(move->tickle & mask))
                 return 0;
         if (!state->active) {
@@ -93,6 +100,13 @@ int gru_winpinch(struct grail *ge,
                 }
                 return 0;
         }
+        if ((move->timeout & fm_mask) == fm_mask) {
+                if (state->active) {
+                        gin_gid_discard(ge, state->gid);
+                        state->active = 0;
+                }
+                return 0;
+        }
         if (!(move->tickle & mask))
                 return 0;
         if (!state->active) {