From 1fb331ca738e92e5815fe8b7ce503c187f52fecc Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Mon, 14 Mar 2011 15:17:01 +0100 Subject: Convert to utouch-frame mapping Remove the grail-internal mapping code and rely directly on utouch-frame instead. Passes the unit test designed for this change. Signed-off-by: Henrik Rydberg --- src/grail-inserter.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) (limited to 'src/grail-inserter.c') diff --git a/src/grail-inserter.c b/src/grail-inserter.c index f784848..ab81ece 100644 --- a/src/grail-inserter.c +++ b/src/grail-inserter.c @@ -104,11 +104,6 @@ int gin_init(struct grail *ge) return -ENOMEM; for (i = 0; i < DIM_INSTANCE; i++) grail_mask_set(gin->unused, i); - gin->scale_x = 1; - gin->scale_y = 1; - gin->scale_r = 1; - gin->trans_x = 1; - gin->trans_y = 1; ge->gin = gin; return 0; } @@ -298,17 +293,12 @@ void grail_set_bbox(struct grail *ge, const struct grail_coord *tmax) { struct utouch_surface *s = utouch_frame_get_surface(ge->impl->fh); - struct gesture_inserter *gin = ge->gin; - double tx, ty, dx, dy, sx, sy; - tx = tmax->x - tmin->x; - ty = tmax->y - tmin->y; - dx = s->max_x - s->min_x; - dy = s->max_y - s->min_y; - sx = tx / dx; - sy = ty / dy; - gin->scale_x = sx; - gin->scale_y = sy; - gin->scale_r = sqrt((tx * tx + ty * ty) / (dx * dx + dy * dy)); - gin->trans_x = tmin->x - s->min_x * sx; - gin->trans_y = tmin->y - s->min_y * sy; + + s->mapped_min_x = tmin->x; + s->mapped_min_y = tmin->y; + s->mapped_max_x = tmax->x; + s->mapped_max_y = tmax->y; + + if (ge->gru) + gru_init_motion(ge); } -- cgit v1.2.3