Break out common display functions

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

1 files changed, 3 insertions, 64 deletions

diff --git a/tools/utouch-frame-test-xi2.c b/tools/utouch-frame-test-xi2.c
index df68c1a..015c119 100644
--- a/tools/utouch-frame-test-xi2.c
+++ b/tools/utouch-frame-test-xi2.c
@@ -30,6 +30,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdlib.h>
+#include "common-defs.h"
 
 static int opcode;
 
@@ -91,68 +92,6 @@ static void destroy_all(struct frame_test *test)
         memset(test, 0, sizeof(*test));
 }
 
-static void report_device_caps(struct frame_test *test)
-{
-        struct utouch_surface *s = utouch_frame_get_surface(test->fh);
-        fprintf(stderr, "device props:\n");
-        if (s->needs_pointer)
-                fprintf(stderr, "\tpointer\n");
-        if (s->is_direct)
-                fprintf(stderr, "\tdirect\n");
-        if (s->is_buttonpad)
-                fprintf(stderr, "\tbuttonpad\n");
-        if (s->is_semi_mt)
-                fprintf(stderr, "\tsemi_mt\n");
-        fprintf(stderr, "device mt events:\n");
-        if (s->use_touch_major)
-                fprintf(stderr, "\ttouch_major\n");
-        if (s->use_touch_minor)
-                fprintf(stderr, "\ttouch_minor\n");
-        if (s->use_width_major)
-                fprintf(stderr, "\twidth_major\n");
-        if (s->use_width_minor)
-                fprintf(stderr, "\twidth_minor\n");
-        if (s->use_orientation)
-                fprintf(stderr, "\torientation\n");
-        if (s->use_pressure)
-                fprintf(stderr, "\tpressure\n");
-        if (s->use_distance)
-                fprintf(stderr, "\tdistance\n");
-}
-
-static void report_frame(const struct utouch_frame *frame,
-                         const XIDeviceEvent *ev)
-{
-        int i;
-
-        for (i = 0; i < frame->num_active; i++) {
-                const struct utouch_contact *t = frame->active[i];
-
-                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:            %f\n", t->x);
-                fprintf(stderr, "  y:            %f\n", t->y);
-                fprintf(stderr, "  touch_major:  %f\n", t->touch_major);
-                fprintf(stderr, "  touch_minor:  %f\n", t->touch_minor);
-                fprintf(stderr, "  width_major:  %f\n", t->width_major);
-                fprintf(stderr, "  width_minor:  %f\n", t->width_minor);
-                fprintf(stderr, "  angle:        %f\n", t->orientation);
-                fprintf(stderr, "  pressure:     %f\n", t->pressure);
-                fprintf(stderr, "  distance:     %f\n", t->distance);
-        }
-
-        fprintf(stderr, "sync %d %ld %d %d %d %f %f\n",
-                frame->num_active,
-                frame->time,
-                frame->sequence_id,
-                frame->revision,
-                frame->slot_revision,
-                ev->root_x,
-                ev->root_y);
-}
-
 static void handle_event(struct frame_test *test, XEvent *ev)
 {
         XGenericEventCookie *gev = &ev->xcookie;
@@ -175,7 +114,7 @@ static void handle_event(struct frame_test *test, XEvent *ev)
                 if (gev->type == GenericEvent && gev->extension == opcode) {
                         frame = utouch_frame_pump_xi2(test->fh, dev);
                         if (frame)
-                                report_frame(frame, dev);
+                                report_frame(frame);
                 }
                 XFreeEventData(test->display, gev);
                 break;
@@ -229,7 +168,7 @@ int main(int argc, char *argv[])
                 return -1;
         }
 
-        report_device_caps(&test);
+        report_device_caps(test.fh);
 
         loop_device(&test);