From 697b5b5c7d2b1c46387061fcbed24cbee51d98ce Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Wed, 4 Aug 2010 16:47:43 +0200 Subject: Introduce tapping Simplify some common parts of the recognizer code and add tapping to the gesture suite. Signed-off-by: Henrik Rydberg --- src/grail-recognizer.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) (limited to 'src/grail-recognizer.c') diff --git a/src/grail-recognizer.c b/src/grail-recognizer.c index 1e7a8bf..bed704e 100644 --- a/src/grail-recognizer.c +++ b/src/grail-recognizer.c @@ -27,8 +27,6 @@ #include #include -static const touch_time_t DROP_TIMEOUT_MS = 100; - int gru_init(struct grail *ge, const struct touch_dev_caps *caps) { struct gesture_recognizer *gru; @@ -46,32 +44,15 @@ void gru_destroy(struct grail *ge) ge->gru = NULL; } -static void reset_gru_state(struct grail *ge, const struct touch_frame *frame) -{ - gru_reset_combo(ge, frame); - gru_reset_rotate(ge, frame); - gru_reset_zoom(ge, frame); - gru_reset_scroll(ge, frame); - gru_reset_motion(ge, frame); -} - void gru_recognize(struct grail *ge, const struct touch_frame *frame) { - struct gesture_recognizer *gru = ge->gru; - struct move_model *move = &gru->move; if (!ge->gin || !ge->gru) return; - if (frame->nactive < move->ntouch && - frame->time < gru->frame.time + DROP_TIMEOUT_MS) - return; - if (frame->nactive < 2 || frame->ncreate || frame->ndestroy) { - reset_gru_state(ge, frame); - return; - } - gru_compute_motion(ge, frame); - gru_scroll(ge, frame); - gru_zoom(ge, frame); + gru_motion(ge, frame); + gru_pan(ge, frame); + gru_pinch(ge, frame); gru_rotate(ge, frame); gru_combo(ge, frame); - gru->frame = *frame; + gru_tapping(ge, frame); + ge->gru->frame = *frame; } -- cgit v1.2.3