summaryrefslogtreecommitdiff
path: root/src/grail-inserter.h
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2011-03-14 15:17:01 +0100
committerHenrik Rydberg <rydberg@euromail.se>2011-04-04 19:46:29 +0200
commit1fb331ca738e92e5815fe8b7ce503c187f52fecc (patch)
tree8ad4fc720e2585faefdbafa7126dc57743f5b320 /src/grail-inserter.h
parentd55a299efd74431e98c8a4f24cffd07c95d419d6 (diff)
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 <rydberg@euromail.se>
Diffstat (limited to 'src/grail-inserter.h')
-rw-r--r--src/grail-inserter.h12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/grail-inserter.h b/src/grail-inserter.h
index 55e94a3..f8451d6 100644
--- a/src/grail-inserter.h
+++ b/src/grail-inserter.h
@@ -58,20 +58,8 @@ struct gesture_inserter {
58 int gestureid; 58 int gestureid;
59 int grab_active; 59 int grab_active;
60 int grab_client; 60 int grab_client;
61 float scale_x, scale_y, scale_r;
62 float trans_x, trans_y;
63}; 61};
64 62
65static inline float gin_prop_x(const struct gesture_inserter *gin, float x)
66{
67 return gin->scale_x * x + gin->trans_x;
68}
69
70static inline float gin_prop_y(const struct gesture_inserter *gin, float y)
71{
72 return gin->scale_y * y + gin->trans_y;
73}
74
75int gin_add_contact_props(const struct gesture_inserter *gin, 63int gin_add_contact_props(const struct gesture_inserter *gin,
76 grail_prop_t *prop, const struct utouch_frame *frame); 64 grail_prop_t *prop, const struct utouch_frame *frame);
77 65