From 325c9ecccb9817f70924c6ca0a08e6d064b7ed70 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Mon, 14 Feb 2011 10:05:15 +0100 Subject: Display device properties based on utouch surface instead The current code erroneously extracts the device properties from the evemu device, when there is a utouch surface structure to read from. Remedied with this patch. Signed-off-by: Henrik Rydberg --- tools/utouch-frame-test-mtdev.c | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/tools/utouch-frame-test-mtdev.c b/tools/utouch-frame-test-mtdev.c index 13f5a68..86f5b64 100644 --- a/tools/utouch-frame-test-mtdev.c +++ b/tools/utouch-frame-test-mtdev.c @@ -115,41 +115,30 @@ static void loop_device(struct frame_test *test, int fd) static void report_device_caps(struct frame_test *test) { -#ifdef INPUT_PROP_POINTER + struct utouch_surface *s = utouch_frame_get_surface(test->fh); fprintf(stderr, "device props:\n"); - if (evemu_has_prop(test->evemu, INPUT_PROP_POINTER)) + if (s->needs_pointer) fprintf(stderr, "\tpointer\n"); - if (evemu_has_prop(test->evemu, INPUT_PROP_DIRECT)) + if (s->is_direct) fprintf(stderr, "\tdirect\n"); - if (evemu_has_prop(test->evemu, INPUT_PROP_BUTTONPAD)) + if (s->is_buttonpad) fprintf(stderr, "\tbuttonpad\n"); - if (evemu_has_prop(test->evemu, INPUT_PROP_SEMI_MT)) + if (s->is_semi_mt) fprintf(stderr, "\tsemi_mt\n"); -#endif fprintf(stderr, "device mt events:\n"); - if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_SLOT)) - fprintf(stderr, "\tslot\n"); - if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_TOUCH_MAJOR)) + if (s->use_touch_major) fprintf(stderr, "\ttouch_major\n"); - if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_TOUCH_MINOR)) + if (s->use_touch_minor) fprintf(stderr, "\ttouch_minor\n"); - if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_WIDTH_MAJOR)) + if (s->use_width_major) fprintf(stderr, "\twidth_major\n"); - if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_WIDTH_MINOR)) + if (s->use_width_minor) fprintf(stderr, "\twidth_minor\n"); - if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_ORIENTATION)) + if (s->use_orientation) fprintf(stderr, "\torientation\n"); - if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_POSITION_X)) - fprintf(stderr, "\tposition_x\n"); - if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_POSITION_Y)) - fprintf(stderr, "\tposition_y\n"); - if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_TOOL_TYPE)) - fprintf(stderr, "\tposition_y\n"); - if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_TRACKING_ID)) - fprintf(stderr, "\ttracking_id\n"); - if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_PRESSURE)) + if (s->use_pressure) fprintf(stderr, "\tpressure\n"); - if (evemu_has_event(test->evemu, EV_ABS, ABS_MT_DISTANCE)) + if (s->use_distance) fprintf(stderr, "\tdistance\n"); } -- cgit v1.2.3