From 88dada465e0fad35b5a535a042e0a93046ffff7c Mon Sep 17 00:00:00 2001
From: Henrik Rydberg <rydberg@bitmath.org>
Date: Wed, 4 Aug 2010 22:06:54 +0200
Subject: Cleanup tapping and gesture code

Improved tapping quality with this patch.

Signed-off-by: Henrik Rydberg <rydberg@bitmath.org>
---
 src/gestures-tapping.c | 67 ++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 35 deletions(-)

(limited to 'src/gestures-tapping.c')

diff --git a/src/gestures-tapping.c b/src/gestures-tapping.c
index 453f77c..1c07b6c 100644
--- a/src/gestures-tapping.c
+++ b/src/gestures-tapping.c
@@ -25,13 +25,12 @@
 #include "grail-recognizer.h"
 #include <math.h>
 
-static const int TAP_INIT = 0;
-static const int TAP_BEGIN = 1;
-static const int TAP_END = 2;
-static const int TAP_CANCEL = 3;
+static const int TAP_BEGIN = 0;
+static const int TAP_END = 1;
+static const int TAP_CANCEL = 2;
 
 static const int TAP_MIN_GAP_MS = 25;
-static const int TAP_MAX_GAP_MS = 400;
+static const int TAP_MAX_GAP_MS = 300;
 
 int gru_tapping(struct grail *ge,
 	      const struct touch_frame *frame)
@@ -40,56 +39,54 @@ int gru_tapping(struct grail *ge,
 	struct tapping_model *state = &gru->tapping;
 	struct move_model *move = &gru->move;
 	grail_prop_t prop[DIM_GRAIL_PROP];
-	if (state->status == TAP_CANCEL) {
-		if (move->ntouch)
+	if (move->ntouch) {
+		if (state->status == TAP_CANCEL)
 			return 0;
-		else
-			state->status = TAP_INIT;
-	}
-	if (move->ntouch > state->ntouch) {
-		if (!state->ntouch) {
+		state->status = TAP_BEGIN;
+		if (!state->ntouch)
 			state->start = frame->time;
-			state->status = TAP_BEGIN;
+		if (move->ntouch > state->ntouch) {
+			state->ntouch = move->ntouch;
+			if (state->active) {
+				gin_gid_discard(ge, state->gid);
+				state->active = 0;
+			}
 		}
-		state->ntouch = move->ntouch;
-	} else if (move->ntouch < state->ntouch) {
-		if (!move->ntouch)
-			state->status = TAP_END;
-	}
-	if (state->status == TAP_INIT)
+		if (!state->active) {
+			int type = GRAIL_TYPE_TAP1 + state->ntouch - 1;
+			state->gid = gin_gid_begin(ge, type, PRIO_TAP, frame);
+			state->active = 1;
+		}
+	} else if (state->status == TAP_BEGIN && state->ntouch) {
+		state->status = TAP_END;
+	} else {
+		state->status = TAP_BEGIN;
+		state->ntouch = 0;
 		return 0;
-	if (state->ntouch < 1 || state->ntouch > 5) {
-		state->status = TAP_CANCEL;
 	}
-	if (frame->time - state->start > TAP_MAX_GAP_MS) {
+	if (state->ntouch < 1 || state->ntouch > 5)
+		state->status = TAP_CANCEL;
+	if (frame->time - state->start > TAP_MAX_GAP_MS)
 		state->status = TAP_CANCEL;
-	}
 	if (state->status == TAP_END &&
-	    frame->time - state->start < TAP_MIN_GAP_MS) {
+	    frame->time - state->start < TAP_MIN_GAP_MS)
 		state->status = TAP_CANCEL;
-	}
 	if (state->status == TAP_CANCEL) {
 		if (state->active) {
-			gru_end(ge, state->gid, move);
+			gin_gid_discard(ge, state->gid);
 			state->active = 0;
 		}
 		state->ntouch = 0;
 		return 0;
 	}
-	if (frame->time - state->start < TAP_MIN_GAP_MS)
-		return 0;
-	if (!state->active) {
-		int type = GRAIL_TYPE_TAP1 + state->ntouch - 1;
-		state->gid = gin_gid_begin(ge, type, frame);
-		state->active = 1;
-	}
-	if (state->status != TAP_END)
+	if (state->status != TAP_END ||
+	    frame->time - state->start < TAP_MIN_GAP_MS)
 		return 0;
 	prop[0] = frame->time - state->start;
 	gin_gid_event(ge, state->gid,
 		      move->x.val, move->y.val, state->ntouch,
 		      prop, 1, GRAIL_STATUS_END);
-	state->status = TAP_INIT;
+	state->status = TAP_BEGIN;
 	state->ntouch = 0;
 	state->active = 0;
 	return 1;
-- 
cgit v1.2.3