Rename KEYBOARD_KEY_STATE to KEY_STATE

[platform/upstream/libinput.git] / tools / event-debug.c

diff --git a/tools/event-debug.c b/tools/event-debug.c
index c0a08a7..eb43e05 100644 (file)
--- a/tools/event-debug.c
+++ b/tools/event-debug.c
@@ -30,7 +30,8 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <linux/input.h>
+#include <libudev.h>
+#include "linux/input.h"
 #include <sys/ioctl.h>
 #include <sys/signalfd.h>
 
@@ -125,7 +126,7 @@ close_restricted(int fd, void *user_data)
        close(fd);
 }
 
-const static struct libinput_interface interface = {
+static const struct libinput_interface interface = {
        .open_restricted = open_restricted,
        .close_restricted = close_restricted,
 };
@@ -230,66 +231,69 @@ print_device_notify(struct libinput_event *ev)
 {
        struct libinput_device *dev = libinput_event_get_device(ev);
        struct libinput_seat *seat = libinput_device_get_seat(dev);
+       double w, h;
 
-       printf("%s      %s\n",
+       printf("%s      %s",
               libinput_seat_get_physical_name(seat),
               libinput_seat_get_logical_name(seat));
+
+       if (libinput_device_get_size(dev, &w, &h) == 0)
+               printf("\tsize %.2f/%.2fmm", w, h);
+
+       printf("\n");
 }
 
 static void
 print_key_event(struct libinput_event *ev)
 {
        struct libinput_event_keyboard *k = libinput_event_get_keyboard_event(ev);
-       enum libinput_keyboard_key_state state;
+       enum libinput_key_state state;
 
        print_event_time(libinput_event_keyboard_get_time(k));
        state = libinput_event_keyboard_get_key_state(k);
        printf("%d %s\n",
               libinput_event_keyboard_get_key(k),
-              state == LIBINPUT_KEYBOARD_KEY_STATE_PRESSED ? "pressed" : "released");
+              state == LIBINPUT_KEY_STATE_PRESSED ? "pressed" : "released");
 }
 
 static void
 print_motion_event(struct libinput_event *ev)
 {
        struct libinput_event_pointer *p = libinput_event_get_pointer_event(ev);
-       li_fixed_t x =  libinput_event_pointer_get_dx(p),
-                  y = libinput_event_pointer_get_dy(p);
+       double x = libinput_event_pointer_get_dx(p);
+       double y = libinput_event_pointer_get_dy(p);
 
        print_event_time(libinput_event_pointer_get_time(p));
 
-       printf("%6.2f/%6.2f\n",
-              li_fixed_to_double(x),
-              li_fixed_to_double(y));
+       printf("%6.2f/%6.2f\n", x, y);
 }
 
 static void
 print_absmotion_event(struct libinput_event *ev)
 {
        struct libinput_event_pointer *p = libinput_event_get_pointer_event(ev);
-       li_fixed_t x = libinput_event_pointer_get_absolute_x_transformed(
+       double x = libinput_event_pointer_get_absolute_x_transformed(
                p, screen_width);
-       li_fixed_t y = libinput_event_pointer_get_absolute_y_transformed(
+       double y = libinput_event_pointer_get_absolute_y_transformed(
                p, screen_height);
 
        print_event_time(libinput_event_pointer_get_time(p));
-       printf("%6.2f/%6.2f\n",
-              li_fixed_to_double(x),
-              li_fixed_to_double(y));
+       printf("%6.2f/%6.2f\n", x, y);
 }
 
 static void
 print_button_event(struct libinput_event *ev)
 {
        struct libinput_event_pointer *p = libinput_event_get_pointer_event(ev);
-       enum libinput_pointer_button_state state;
+       enum libinput_button_state state;
 
        print_event_time(libinput_event_pointer_get_time(p));
 
        state = libinput_event_pointer_get_button_state(p);
-       printf("%3d %s\n",
+       printf("%3d %s, seat count: %u\n",
               libinput_event_pointer_get_button(p),
-              state == LIBINPUT_POINTER_BUTTON_STATE_PRESSED ? "pressed" : "released");
+              state == LIBINPUT_BUTTON_STATE_PRESSED ? "pressed" : "released",
+              libinput_event_pointer_get_seat_button_count(p));
 }
 
 static void
@@ -298,13 +302,13 @@ print_axis_event(struct libinput_event *ev)
        struct libinput_event_pointer *p = libinput_event_get_pointer_event(ev);
        enum libinput_pointer_axis axis = libinput_event_pointer_get_axis(p);
        const char *ax;
-       li_fixed_t val;
+       double val;
 
        switch (axis) {
-       case LIBINPUT_POINTER_AXIS_VERTICAL_SCROLL:
+       case LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL:
                ax = "vscroll";
                break;
-       case LIBINPUT_POINTER_AXIS_HORIZONTAL_SCROLL:
+       case LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL:
                ax = "hscroll";
                break;
        default:
@@ -313,8 +317,7 @@ print_axis_event(struct libinput_event *ev)
 
        print_event_time(libinput_event_pointer_get_time(p));
        val = libinput_event_pointer_get_axis_value(p);
-       printf("%s %.2f\n",
-              ax, li_fixed_to_double(val));
+       printf("%s %.2f\n", ax, val);
 }
 
 static void
@@ -330,16 +333,18 @@ static void
 print_touch_event_with_coords(struct libinput_event *ev)
 {
        struct libinput_event_touch *t = libinput_event_get_touch_event(ev);
-       li_fixed_t x = libinput_event_touch_get_x_transformed(t, screen_width),
-                  y = libinput_event_touch_get_y_transformed(t, screen_height);
+       double x = libinput_event_touch_get_x_transformed(t, screen_width);
+       double y = libinput_event_touch_get_y_transformed(t, screen_height);
+       double xmm = libinput_event_touch_get_x(t);
+       double ymm = libinput_event_touch_get_y(t);
 
        print_event_time(libinput_event_touch_get_time(t));
 
-       printf("%d (%d) %5.2f/%5.2f\n",
+       printf("%d (%d) %5.2f/%5.2f (%5.2f/%5.2fmm)\n",
               libinput_event_touch_get_slot(t),
               libinput_event_touch_get_seat_slot(t),
-              li_fixed_to_double(x),
-              li_fixed_to_double(y));
+              x, y,
+              xmm, ymm);
 }
 
 static int
@@ -436,9 +441,11 @@ mainloop(struct libinput *li)
        close(fds[1].fd);
 }
 
-static void log_handler(enum libinput_log_priority priority,
-                       void *user_data,
-                       const char *format, va_list args)
+static void
+log_handler(enum libinput_log_priority priority,
+           void *user_data,
+           const char *format,
+           va_list args)
 {
        vprintf(format, args);
 }
@@ -471,6 +478,7 @@ main(int argc, char **argv)
 
        mainloop(li);
 
+       libinput_destroy(li);
        if (udev)
                udev_unref(udev);