Rename KEYBOARD_KEY_STATE to KEY_STATE

[platform/upstream/libinput.git] / src / evdev.c

diff --git a/src/evdev.c b/src/evdev.c
index 2b2725c..63eaa4d 100644 (file)
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -310,8 +310,8 @@ evdev_process_key(struct evdev_device *device,
                        &device->base,
                        time,
                        e->code,
-                       e->value ? LIBINPUT_KEYBOARD_KEY_STATE_PRESSED :
-                                  LIBINPUT_KEYBOARD_KEY_STATE_RELEASED);
+                       e->value ? LIBINPUT_KEY_STATE_PRESSED :
+                                  LIBINPUT_KEY_STATE_RELEASED);
                break;
        }
 }
@@ -390,7 +390,7 @@ evdev_process_relative(struct evdev_device *device,
                pointer_notify_axis(
                        base,
                        time,
-                       LIBINPUT_POINTER_AXIS_VERTICAL_SCROLL,
+                       LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL,
                        -1 * e->value * DEFAULT_AXIS_STEP_DISTANCE);
                break;
        case REL_HWHEEL:
@@ -403,7 +403,7 @@ evdev_process_relative(struct evdev_device *device,
                        pointer_notify_axis(
                                base,
                                time,
-                               LIBINPUT_POINTER_AXIS_HORIZONTAL_SCROLL,
+                               LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL,
                                e->value * DEFAULT_AXIS_STEP_DISTANCE);
                        break;
                default:
@@ -871,6 +871,25 @@ evdev_device_has_capability(struct evdev_device *device,
        }
 }
 
+int
+evdev_device_get_size(struct evdev_device *device,
+                     double *width,
+                     double *height)
+{
+       const struct input_absinfo *x, *y;
+
+       x = libevdev_get_abs_info(device->evdev, ABS_X);
+       y = libevdev_get_abs_info(device->evdev, ABS_Y);
+
+       if (!x || !y || !x->resolution || !y->resolution)
+               return -1;
+
+       *width = evdev_convert_to_mm(x, x->maximum);
+       *height = evdev_convert_to_mm(y, y->maximum);
+
+       return 0;
+}
+
 void
 evdev_device_remove(struct evdev_device *device)
 {