1 files changed, 13 insertions, 18 deletions

diff --git a/src/grail-inserter.c b/src/grail-inserter.c
index 847995a..6f9a034 100644
--- a/src/grail-inserter.c
+++ b/src/grail-inserter.c
@@ -40,7 +40,7 @@ static int find_gslot(const struct gesture_inserter *gin, int gid)
 
 // todo: spanning tree for multi-user case
 static void setup_new_gestures(struct grail *ge,
-                               const struct touch_frame *frame)
+                               const struct utouch_frame *frame)
 {
         struct gesture_inserter *gin = ge->gin;
         grail_mask_t types[DIM_GRAIL_TYPE_BYTES];
@@ -100,14 +100,14 @@ void gin_destroy(struct grail *ge)
         ge->gin = NULL;
 }
 
-void gin_frame_begin(struct grail *ge, const struct touch_frame *frame)
+void gin_frame_begin(struct grail *ge, const struct utouch_frame *frame)
 {
         struct gesture_inserter *gin = ge->gin;
         memset(gin->types, 0, sizeof(gin->types));
         gin->time = frame->time;
 }
 
-void gin_frame_end(struct grail *ge, const struct touch_frame *frame)
+void gin_frame_end(struct grail *ge, const struct utouch_frame *frame)
 {
         struct gesture_inserter *gin = ge->gin;
         int i, hold = 0, discard = 0;
@@ -151,11 +151,12 @@ void gin_frame_end(struct grail *ge, const struct touch_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 utouch_frame *frame)
 {
         struct gesture_inserter *gin = ge->gin;
         struct slot_state *s;
+        int slot;
         int i = grail_mask_get_first(gin->unused, sizeof(gin->unused));
         if (i < 0)
                 return -1;
@@ -165,7 +166,8 @@ int gin_gid_begin_select(struct grail *ge, int type, int priority,
         s->id = gin->gestureid++ & MAX_GESTURE_ID;
         s->status = GRAIL_STATUS_BEGIN;
         s->nclient = 0;
-        memcpy(s->span, span, nspan);
+        for (slot = 0; slot < DIM_TOUCH; slot++)
+                grail_mask_modify(s->span, slot, frame->slots[slot]->active);
         gebuf_clear(&s->buf);
         grail_mask_clear(gin->unused, i);
         grail_mask_set(gin->fresh, i);
@@ -173,13 +175,6 @@ int gin_gid_begin_select(struct grail *ge, int type, int priority,
         return s->id;
 }
 
-int gin_gid_begin(struct grail *ge, int type, int priority,
-                  const struct touch_frame *frame)
-{
-        return gin_gid_begin_select(ge, type, priority,
-                                    frame->touches, sizeof(frame->touches));
-}
-
 void gin_gid_discard(struct grail *ge, int gid)
 {
         struct gesture_inserter *gin = ge->gin;
@@ -248,18 +243,18 @@ void grail_set_bbox(struct grail *ge,
                     const struct grail_coord *tmin,
                     const struct grail_coord *tmax)
 {
-        struct touch_caps *caps = &ge->impl->dev.caps;
+        struct utouch_surface *s = utouch_frame_get_surface(ge->impl->fh);
         struct gesture_inserter *gin = ge->gin;
         double tx, ty, dx, dy, sx, sy;
         tx = tmax->x - tmin->x;
         ty = tmax->y - tmin->y;
-        dx = caps->max_x - caps->min_x;
-        dy = caps->max_y - caps->min_y;
+        dx = s->max_x - s->min_x;
+        dy = s->max_y - s->min_y;
         sx = tx / dx;
         sy = ty / dy;
         gin->scale_x = sx;
         gin->scale_y = sy;
         gin->scale_r = sqrt((tx * tx + ty * ty) / (dx * dx + dy * dy));
-        gin->trans_x = tmin->x - caps->min_x * sx;
-        gin->trans_y = tmin->y - caps->min_y * sy;
+        gin->trans_x = tmin->x - s->min_x * sx;
+        gin->trans_y = tmin->y - s->min_y * sy;
 }