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-drag.c b/src/gestures-drag.c
index 2ced765..05272da 100644
--- a/src/gestures-drag.c
+++ b/src/gestures-drag.c
@@ -35,7 +35,7 @@ static const int getype[DIM_TOUCH + 1] = {
 
 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)
 {
         if (m->single) {
                 s->prop[GRAIL_PROP_DRAG_DX] =
@@ -59,7 +59,7 @@ static void set_props(const struct gesture_inserter *gin,
 static const int fm_mask = 0x03;
 
 int gru_drag(struct grail *ge,
-            const struct touch_frame *frame)
+            const struct utouch_frame *frame)
 {
         struct gesture_recognizer *gru = ge->gru;
         struct combo_model *state = &gru->drag;
@@ -89,7 +89,7 @@ int gru_drag(struct grail *ge,
 }
 
 int gru_windrag(struct grail *ge,
-                const struct touch_frame *frame)
+                const struct utouch_frame *frame)
 {
         struct gesture_recognizer *gru = ge->gru;
         struct combo_model *state = &gru->windrag;