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

diff --git a/src/grail-inserter.h b/src/grail-inserter.h
index 9baecb7..3b8cd77 100644
--- a/src/grail-inserter.h
+++ b/src/grail-inserter.h
@@ -23,8 +23,7 @@
 #ifndef _GRAIL_INSERTER_H
 #define _GRAIL_INSERTER_H
 
-#include <grail-touch.h>
-#include <grail.h>
+#include "grail-impl.h"
 #include "gebuf.h"
 
 #define DIM_EV_TYPE             EV_CNT
@@ -69,27 +68,25 @@ static inline float gin_prop_y(const struct gesture_inserter *gin, float y)
 }
 
 int gin_add_contact_props(const struct gesture_inserter *gin,
-                          grail_prop_t *prop, const struct touch_frame *frame);
+                          grail_prop_t *prop, const struct utouch_frame *frame);
 
 int gin_get_clients(struct grail *ge,
                     struct grail_client_info *info, int maxinfo,
                     const grail_mask_t* types, int btypes,
                     const grail_mask_t* span, int bspan,
-                    const struct touch_frame *frame);
+                    const struct utouch_frame *frame);
 void gin_send_event(struct grail *ge, struct slot_state *s,
                     const struct gesture_event *ev,
-                    const struct touch_frame *frame);
+                    const struct utouch_frame *frame);
 
 int gin_init(struct grail *ge);
 void gin_destroy(struct grail *ge);
 
-void gin_frame_begin(struct grail *ge, const struct touch_frame *frame);
-void gin_frame_end(struct grail *ge, const struct touch_frame *frame);
+void gin_frame_begin(struct grail *ge, const struct utouch_frame *frame);
+void gin_frame_end(struct grail *ge, const struct utouch_frame *frame);
 
-int gin_gid_begin_select(struct grail *ge, int type, int priority,
-                         const grail_mask_t *span, int nspan);
 int gin_gid_begin(struct grail *ge, int type, int priority,
-                  const struct touch_frame *frame);
+                  const struct utouch_frame *frame);
 void gin_gid_discard(struct grail *ge, int gid);
 
 void gin_gid_event(struct grail *ge, int gid,