Replace touch logic with utouch frame engine

The original grail uses an internal touch framework and exports some
touch information as extended attributes to gesture events. This was
never quite the intention, but rather to expose gestures and touches
on a similar footing, such that grail can be input agnostic. This
patch starts off by replacing the internal touch framework with the
utouch-frame engine.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/gestures-pinch.c b/src/gestures-pinch.c
index 45f1cb3..fa8a626 100644
--- a/src/gestures-pinch.c
+++ b/src/gestures-pinch.c
@@ -38,7 +38,7 @@ static const int fm_mask = 0x04;
 static void set_props(const struct gesture_inserter *gin,
                       struct combo_model *s,
                       const struct move_model *m,
-                      const struct touch_frame *frame)
+                      const struct utouch_frame *frame)
 {
         s->prop[GRAIL_PROP_PINCH_DR] = gin->scale_r * m->fm[FM_R].action_delta;
         s->prop[GRAIL_PROP_PINCH_VR] = gin->scale_r * m->fm[FM_R].velocity;
@@ -48,7 +48,7 @@ static void set_props(const struct gesture_inserter *gin,
 }
 
 int gru_pinch(struct grail *ge,
-              const struct touch_frame *frame)
+              const struct utouch_frame *frame)
 {
         struct gesture_recognizer *gru = ge->gru;
         struct combo_model *state = &gru->pinch;
@@ -79,7 +79,7 @@ int gru_pinch(struct grail *ge,
 }
 
 int gru_winpinch(struct grail *ge,
-                 const struct touch_frame *frame)
+                 const struct utouch_frame *frame)
 {
         struct gesture_recognizer *gru = ge->gru;
         struct combo_model *state = &gru->winpinch;