1 files changed, 8 insertions, 8 deletions

diff --git a/test/touch.c b/test/touch.c
index 1dd9cd4..9b2d38a 100644
--- a/test/touch.c
+++ b/test/touch.c
@@ -31,20 +31,20 @@
 static void tp_event(struct touch_engine *engine,
                      const struct input_event *ev)
 {
-        fprintf(stderr, "event %d %d %d\n", ev->type, ev->code, ev->value);
+        fprintf(stderr, "event %d 0x%x %d\n", ev->type, ev->code, ev->value);
 }
 
 static void tp_sync(struct touch_engine *engine,
                     const struct input_event *syn)
 {
         struct touch_frame *frame = &engine->frame;
-        int slot, i;
-        fprintf(stderr, "sync %d %lld\n", frame->ntouch, frame->time);
-        for (slot = frame->slot; slot >= 0; slot = next_slot(frame, slot)) {
-                struct touch *touch = &frame->touch[slot];
-                fprintf(stderr, "touch %d\n", slot);
-                for (i = 0; i < DIM_TOUCH_PROP; i++)
-                        fprintf(stderr, "  %d\n", touch->prop[i]);
+        int i, j;
+        fprintf(stderr, "sync %d %lld\n", frame->nactive, frame->time);
+        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]);
         }
 }