1 files changed, 16 insertions, 17 deletions

diff --git a/src/grail-event.c b/src/grail-event.c
index 23fdbb3..9c0e437 100644
--- a/src/grail-event.c
+++ b/src/grail-event.c
@@ -28,17 +28,17 @@
 #include <math.h>
 
 static void compute_bbox(struct grail_coord *min, struct grail_coord *max,
-                         const struct touch_frame *frame)
+                         const struct utouch_frame *frame)
 {
         float x, y;
         int i;
-        if (frame->nactive < 1)
+        if (frame->num_active < 1)
                 return;
         x = frame->active[0]->x;
         y = frame->active[0]->y;
         min->x = max->x = x;
         min->y = max->y = y;
-        for (i = 1; i < frame->nactive; i++) {
+        for (i = 1; i < frame->num_active; i++) {
                 x = frame->active[i]->x;
                 y = frame->active[i]->y;
                 if (x < min->x)
@@ -53,10 +53,10 @@ static void compute_bbox(struct grail_coord *min, struct grail_coord *max,
 }
 
 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)
 {
         struct grail_coord min, max;
-        int i, n = 0, ntouch = frame->nactive;
+        int i, n = 0, ntouch = frame->num_active;
         if (!ntouch)
                 return n;
         if (ntouch > 5)
@@ -67,7 +67,7 @@ int gin_add_contact_props(const struct gesture_inserter *gin,
         prop[n++] = gin_prop_x(gin, max.x);
         prop[n++] = gin_prop_y(gin, max.y);
         for (i = 0; i < ntouch; i++) {
-                const struct touch *ct = frame->active[i];
+                const struct utouch_contact *ct = frame->active[i];
                 prop[n++] = ct->id;
                 prop[n++] = gin_prop_x(gin, ct->x);
                 prop[n++] = gin_prop_y(gin, ct->y);
@@ -79,15 +79,15 @@ 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)
 {
         struct grail_coord pos[DIM_TOUCH];
         int i, npos = 0;
         if (!ge->get_clients)
                 return 0;
         grail_mask_foreach(i, span, bspan) {
-                pos[npos].x = gin_prop_x(ge->gin, frame->touch[i].x);
-                pos[npos].y = gin_prop_y(ge->gin, frame->touch[i].y);
+                pos[npos].x = gin_prop_x(ge->gin, frame->slots[i]->x);
+                pos[npos].y = gin_prop_y(ge->gin, frame->slots[i]->y);
                 npos++;
         }
         return ge->get_clients(ge, info, maxinfo, pos, npos, types, btypes);
@@ -95,7 +95,7 @@ int gin_get_clients(struct grail *ge,
 
 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)
 {
         struct grail_impl *impl = ge->impl;
         const struct gesture_inserter *gin = ge->gin;
@@ -121,15 +121,14 @@ void gin_send_event(struct grail *ge, struct slot_state *s,
 int grail_get_contacts(const struct grail *ge,
                        struct grail_contact *touch, int max_touch)
 {
-        const struct touch_dev *dev = &ge->impl->dev;
         const struct gesture_inserter *gin = ge->gin;
-        const struct touch_frame *frame = &dev->frame;
+        const struct utouch_frame *frame = ge->impl->frame;
         int i;
-        if (frame->nactive < max_touch)
-                max_touch = frame->nactive;
+        if (frame->num_active < max_touch)
+                max_touch = frame->num_active;
         for (i = 0; i < max_touch; i++) {
                 struct grail_contact *t = &touch[i];
-                const struct touch *ct = frame->active[i];
+                const struct utouch_contact *ct = frame->active[i];
                 t->id = ct->id;
                 t->tool_type = ct->tool_type;
                 t->pos.x = gin_prop_x(gin, ct->x);
@@ -138,8 +137,8 @@ int grail_get_contacts(const struct grail *ge,
                 t->touch_minor = gin->scale_r * ct->touch_minor;
                 t->width_major = gin->scale_r * ct->width_major;
                 t->width_minor = gin->scale_r * ct->width_minor;
-                t->angle = touch_angle(dev, ct->orientation);
-                t->pressure = touch_pressure(dev, ct->pressure);
+                t->angle = ct->orientation;
+                t->pressure = ct->pressure;
         }
         return max_touch;
 }