test: don't try to print axis values that aren't set
authorPeter Hutterer <peter.hutterer@who-t.net>
Tue, 4 Aug 2015 23:45:45 +0000 (09:45 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Wed, 5 Aug 2015 01:28:32 +0000 (11:28 +1000)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
test/litest.c

index 51085f194a5f7e013ca14e7d837d925925466bb1..3a16cd7c37418740bfbaa3acb5750e0a11db6390 100644 (file)
@@ -1834,12 +1834,17 @@ litest_print_event(struct libinput_event *event)
                break;
        case LIBINPUT_EVENT_POINTER_AXIS:
                p = libinput_event_get_pointer_event(event);
-               fprintf(stderr,
-                       "vert %.f horiz %.2f",
-                       libinput_event_pointer_get_axis_value(p,
-                               LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL),
-                       libinput_event_pointer_get_axis_value(p,
-                               LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL));
+               x = 0.0;
+               y = 0.0;
+               if (libinput_event_pointer_has_axis(p,
+                               LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))
+                       y = libinput_event_pointer_get_axis_value(p,
+                               LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+               if (libinput_event_pointer_has_axis(p,
+                               LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL))
+                       x = libinput_event_pointer_get_axis_value(p,
+                               LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
+               fprintf(stderr, "vert %.f horiz %.2f", y, x);
                break;
        default:
                break;