From d87cde46e25c058ffc76d3871ca4e2ceb3e57991 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Tue, 29 Mar 2011 10:26:05 +0200 Subject: Prepare for gesture frame additions Rename internal variables and fix makefile to make room for new targets. Signed-off-by: Henrik Rydberg --- src/grail-api.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/grail-api.c') diff --git a/src/grail-api.c b/src/grail-api.c index 6ef4b7d..1d4233a 100644 --- a/src/grail-api.c +++ b/src/grail-api.c @@ -154,7 +154,7 @@ void GRAIL_PUBLIC grail_get_units(const struct grail *ge, const struct utouch_frame GRAIL_PUBLIC * grail_get_contact_frame(const struct grail *ge) { - return ge->impl->frame; + return ge->impl->touch; } static void flush_events(struct grail *ge) @@ -226,15 +226,15 @@ static int gesture_timeout(struct grail *ge, const struct utouch_frame *frame) } static void report_frame(struct grail *ge, - const struct utouch_frame *frame, + const struct utouch_frame *touch, const struct input_event *syn) { struct grail_impl *impl = ge->impl; struct grail_event gev; - ge->impl->frame = frame; + impl->touch = touch; - if (frame->num_active && !frame->prev->num_active) { + if (touch->num_active && !touch->prev->num_active) { impl->ongoing = 1; impl->gesture = 0; } @@ -242,14 +242,14 @@ static void report_frame(struct grail *ge, if (!impl->ongoing) return; - gin_frame_begin(ge, frame); - gru_recognize(ge, frame); - gin_frame_end(ge, frame); + gin_frame_begin(ge, touch); + gru_recognize(ge, touch); + gin_frame_end(ge, touch); if (!grailbuf_empty(&impl->gbuf)) impl->gesture = 1; - if (frame->num_active == 0 || gesture_timeout(ge, frame)) + if (touch->num_active == 0 || gesture_timeout(ge, touch)) impl->ongoing &= impl->gesture; } -- cgit v1.2.3