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, 8 insertions, 8 deletions

diff --git a/src/grail-gestures.h b/src/grail-gestures.h
index 27108e9..69dd7e4 100644
--- a/src/grail-gestures.h
+++ b/src/grail-gestures.h
@@ -61,7 +61,7 @@ struct move_model {
 
 void gru_init_motion(struct grail *ge);
 void gru_motion(struct grail *ge,
-                const struct touch_frame *frame);
+                const struct utouch_frame *frame);
 void gru_event(struct grail *ge, int gid,
                const struct move_model *move,
                const grail_prop_t *prop, int nprop);
@@ -77,11 +77,11 @@ struct combo_model {
 };
 
 int gru_drag(struct grail *ge,
-             const struct touch_frame *frame);
+             const struct utouch_frame *frame);
 int gru_pinch(struct grail *ge,
-              const struct touch_frame *frame);
+              const struct utouch_frame *frame);
 int gru_rotate(struct grail *ge,
-               const struct touch_frame *frame);
+               const struct utouch_frame *frame);
 
 static inline int out_of_bounds(const struct combo_model *s,
                                 const struct move_model *m)
@@ -90,11 +90,11 @@ static inline int out_of_bounds(const struct combo_model *s,
 }
 
 int gru_windrag(struct grail *ge,
-                const struct touch_frame *frame);
+                const struct utouch_frame *frame);
 int gru_winpinch(struct grail *ge,
-                 const struct touch_frame *frame);
+                 const struct utouch_frame *frame);
 int gru_winrotate(struct grail *ge,
-                  const struct touch_frame *frame);
+                  const struct utouch_frame *frame);
 
 struct tapping_model {
         grail_time_t start, end;
@@ -105,7 +105,7 @@ struct tapping_model {
 };
 
 int gru_tapping(struct grail *ge,
-                const struct touch_frame *frame);
+                const struct utouch_frame *frame);
 
 #endif