1 files changed, 19 insertions, 10 deletions

diff --git a/test/grail-touch.c b/test/grail-touch.c
index bed31c3..c5ecae3 100644
--- a/test/grail-touch.c
+++ b/test/grail-touch.c
@@ -28,22 +28,33 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-static void tp_event(struct touch_engine *engine,
+static void tp_event(struct touch_dev *dev,
                      const struct input_event *ev)
 {
         fprintf(stderr, "event %d 0x%x %d\n", ev->type, ev->code, ev->value);
 }
 
-static void tp_sync(struct touch_engine *engine,
+static void tp_sync(struct touch_dev *dev,
                     const struct input_event *syn)
 {
-        struct touch_frame *frame = &engine->frame;
+        struct touch_frame *frame = &dev->frame;
         int i, j;
         for (i = 0; i < frame->nactive; i++) {
                 struct touch *t = frame->active[i];
-                fprintf(stderr, "touch %d %d\n", i, t->slot);
-                for (j = 0; j < DIM_TOUCH_PROP; j++)
-                        fprintf(stderr, "  %d\n", t->prop[j]);
+                fprintf(stderr, "touch %d\n", i);
+                fprintf(stderr, "  slot:         %d\n", t->slot);
+                fprintf(stderr, "  id:           %d\n", t->id);
+                fprintf(stderr, "  tool_type:    %d\n", t->tool_type);
+                fprintf(stderr, "  x:            %d\n", t->x);
+                fprintf(stderr, "  y:            %d\n", t->y);
+                fprintf(stderr, "  touch_major:  %d\n", t->touch_major);
+                fprintf(stderr, "  touch_minor:  %d\n", t->touch_minor);
+                fprintf(stderr, "  width_major:  %d\n", t->width_major);
+                fprintf(stderr, "  width_minor:  %d\n", t->width_minor);
+                fprintf(stderr, "  angle:        %f\n",
+                        touch_angle(dev, t->orientation));
+                fprintf(stderr, "  pressure:     %f\n",
+                        touch_pressure(dev, t->pressure));
         }
         fprintf(stderr, "sync %d %lld %d %d\n",
                 frame->nactive, frame->time, frame->ncreate, frame->ndestroy);
@@ -51,12 +62,10 @@ static void tp_sync(struct touch_engine *engine,
 
 static void loop_device(struct touch_dev *dev, int fd)
 {
-        struct touch_engine engine;
-        touch_engine_init(&engine, tp_event, tp_sync, 0);
-        touch_engine_attach(&engine, dev);
+        dev->event = tp_event;
+        dev->sync = tp_sync;
         while (!touch_dev_idle(dev, fd, 5000))
                 touch_dev_pull(dev, fd);
-        touch_engine_detach(&engine, dev);
 }
 
 int main(int argc, char *argv[])