evdev: add DPI to evdev calculations
[platform/upstream/libinput.git] / src / evdev.c
index 2bc301b..3aa87a7 100644 (file)
 #include "config.h"
 
 #include <errno.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <linux/input.h>
+#include "linux/input.h"
 #include <unistd.h>
 #include <fcntl.h>
-#include <mtdev.h>
+#include <mtdev-plumbing.h>
 #include <assert.h>
+#include <time.h>
+#include <math.h>
 
 #include "libinput.h"
 #include "evdev.h"
+#include "filter.h"
 #include "libinput-private.h"
 
-#define DEFAULT_AXIS_STEP_DISTANCE li_fixed_from_int(10)
+#define DEFAULT_AXIS_STEP_DISTANCE 10
+#define DEFAULT_MIDDLE_BUTTON_SCROLL_TIMEOUT 200
+/* The HW DPI rate we normalize to before calculating pointer acceleration */
+#define DEFAULT_MOUSE_DPI 400
+
+enum evdev_key_type {
+       EVDEV_KEY_TYPE_NONE,
+       EVDEV_KEY_TYPE_KEY,
+       EVDEV_KEY_TYPE_BUTTON,
+};
+
+static void
+hw_set_key_down(struct evdev_device *device, int code, int pressed)
+{
+       long_set_bit_state(device->hw_key_mask, code, pressed);
+}
+
+static int
+hw_is_key_down(struct evdev_device *device, int code)
+{
+       return long_bit_is_set(device->hw_key_mask, code);
+}
+
+static int
+get_key_down_count(struct evdev_device *device, int code)
+{
+       return device->key_count[code];
+}
+
+static int
+update_key_down_count(struct evdev_device *device, int code, int pressed)
+{
+       int key_count;
+       assert(code >= 0 && code < KEY_CNT);
+
+       if (pressed) {
+               key_count = ++device->key_count[code];
+       } else {
+               assert(device->key_count[code] > 0);
+               key_count = --device->key_count[code];
+       }
+
+       if (key_count > 32) {
+               log_bug_libinput(device->base.seat->libinput,
+                                "Key count for %s reached abnormal values\n",
+                                libevdev_event_code_get_name(EV_KEY, code));
+       }
+
+       return key_count;
+}
+
+void
+evdev_keyboard_notify_key(struct evdev_device *device,
+                         uint32_t time,
+                         int key,
+                         enum libinput_key_state state)
+{
+       int down_count;
+
+       down_count = update_key_down_count(device, key, state);
+
+       if ((state == LIBINPUT_KEY_STATE_PRESSED && down_count == 1) ||
+           (state == LIBINPUT_KEY_STATE_RELEASED && down_count == 0))
+               keyboard_notify_key(&device->base, time, key, state);
+}
+
+void
+evdev_pointer_notify_button(struct evdev_device *device,
+                           uint32_t time,
+                           int button,
+                           enum libinput_button_state state)
+{
+       int down_count;
+
+       down_count = update_key_down_count(device, button, state);
+
+       if ((state == LIBINPUT_BUTTON_STATE_PRESSED && down_count == 1) ||
+           (state == LIBINPUT_BUTTON_STATE_RELEASED && down_count == 0)) {
+               pointer_notify_button(&device->base, time, button, state);
+
+               if (state == LIBINPUT_BUTTON_STATE_RELEASED &&
+                   device->buttons.change_to_left_handed)
+                       device->buttons.change_to_left_handed(device);
+       }
+
+}
 
 void
 evdev_device_led_update(struct evdev_device *device, enum libinput_led leds)
@@ -71,45 +160,46 @@ evdev_device_led_update(struct evdev_device *device, enum libinput_led leds)
 static void
 transform_absolute(struct evdev_device *device, int32_t *x, int32_t *y)
 {
-       if (!device->abs.apply_calibration) {
-               *x = device->abs.x;
-               *y = device->abs.y;
+       if (!device->abs.apply_calibration)
                return;
-       } else {
-               *x = device->abs.x * device->abs.calibration[0] +
-                       device->abs.y * device->abs.calibration[1] +
-                       device->abs.calibration[2];
 
-               *y = device->abs.x * device->abs.calibration[3] +
-                       device->abs.y * device->abs.calibration[4] +
-                       device->abs.calibration[5];
-       }
+       matrix_mult_vec(&device->abs.calibration, x, y);
 }
 
-li_fixed_t
+static inline double
+scale_axis(const struct input_absinfo *absinfo, double val, double to_range)
+{
+       return (val - absinfo->minimum) * to_range /
+               (absinfo->maximum - absinfo->minimum + 1);
+}
+
+double
 evdev_device_transform_x(struct evdev_device *device,
-                        li_fixed_t x,
+                        double x,
                         uint32_t width)
 {
-       return (x - li_fixed_from_int(device->abs.min_x)) * width /
-               (device->abs.max_x - device->abs.min_x + 1);
+       return scale_axis(device->abs.absinfo_x, x, width);
 }
 
-li_fixed_t
+double
 evdev_device_transform_y(struct evdev_device *device,
-                        li_fixed_t y,
+                        double y,
                         uint32_t height)
 {
-       return (y - li_fixed_from_int(device->abs.min_y)) * height /
-               (device->abs.max_y - device->abs.min_y + 1);
+       return scale_axis(device->abs.absinfo_y, y, height);
 }
 
 static void
-evdev_flush_pending_event(struct evdev_device *device, uint32_t time)
+evdev_flush_pending_event(struct evdev_device *device, uint64_t time)
 {
+       struct libinput *libinput = device->base.seat->libinput;
+       struct motion_params motion;
        int32_t cx, cy;
+       int32_t x, y;
        int slot;
+       int seat_slot;
        struct libinput_device *base = &device->base;
+       struct libinput_seat *seat = base->seat;
 
        slot = device->mt.slot;
 
@@ -117,80 +207,136 @@ evdev_flush_pending_event(struct evdev_device *device, uint32_t time)
        case EVDEV_NONE:
                return;
        case EVDEV_RELATIVE_MOTION:
-               pointer_notify_motion(base,
-                                     time,
-                                     device->rel.dx,
-                                     device->rel.dy);
+               motion.dx = device->rel.dx / ((double)device->dpi / DEFAULT_MOUSE_DPI);
+               motion.dy = device->rel.dy / ((double)device->dpi / DEFAULT_MOUSE_DPI);
                device->rel.dx = 0;
                device->rel.dy = 0;
+
+               /* Use unaccelerated deltas for pointing stick scroll */
+               if (device->scroll.has_middle_button_scroll &&
+                   hw_is_key_down(device, BTN_MIDDLE)) {
+                       if (device->scroll.middle_button_scroll_active)
+                               evdev_post_scroll(device, time,
+                                                 motion.dx, motion.dy);
+                       break;
+               }
+
+               /* Apply pointer acceleration. */
+               filter_dispatch(device->pointer.filter, &motion, device, time);
+
+               if (motion.dx == 0.0 && motion.dy == 0.0)
+                       break;
+
+               pointer_notify_motion(base, time, motion.dx, motion.dy);
                break;
        case EVDEV_ABSOLUTE_MT_DOWN:
                if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
                        break;
 
-               touch_notify_touch(base,
-                                  time,
-                                  slot,
-                                  li_fixed_from_int(device->mt.slots[slot].x),
-                                  li_fixed_from_int(device->mt.slots[slot].y),
-                                  LIBINPUT_TOUCH_TYPE_DOWN);
+               if (device->mt.slots[slot].seat_slot != -1) {
+                       log_bug_kernel(libinput,
+                                      "%s: Driver sent multiple touch down for the "
+                                      "same slot", device->devnode);
+                       break;
+               }
+
+               seat_slot = ffs(~seat->slot_map) - 1;
+               device->mt.slots[slot].seat_slot = seat_slot;
+
+               if (seat_slot == -1)
+                       break;
+
+               seat->slot_map |= 1 << seat_slot;
+               x = device->mt.slots[slot].x;
+               y = device->mt.slots[slot].y;
+               transform_absolute(device, &x, &y);
+
+               touch_notify_touch_down(base, time, slot, seat_slot, x, y);
                break;
        case EVDEV_ABSOLUTE_MT_MOTION:
                if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
                        break;
 
-               touch_notify_touch(base,
-                                  time,
-                                  slot,
-                                  li_fixed_from_int(device->mt.slots[slot].x),
-                                  li_fixed_from_int(device->mt.slots[slot].y),
-                                  LIBINPUT_TOUCH_TYPE_MOTION);
+               seat_slot = device->mt.slots[slot].seat_slot;
+               x = device->mt.slots[slot].x;
+               y = device->mt.slots[slot].y;
+
+               if (seat_slot == -1)
+                       break;
+
+               transform_absolute(device, &x, &y);
+               touch_notify_touch_motion(base, time, slot, seat_slot, x, y);
                break;
        case EVDEV_ABSOLUTE_MT_UP:
                if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
                        break;
 
-               touch_notify_touch(base,
-                                  time,
-                                  slot,
-                                  0, 0,
-                                  LIBINPUT_TOUCH_TYPE_UP);
+               seat_slot = device->mt.slots[slot].seat_slot;
+               device->mt.slots[slot].seat_slot = -1;
+
+               if (seat_slot == -1)
+                       break;
+
+               seat->slot_map &= ~(1 << seat_slot);
+
+               touch_notify_touch_up(base, time, slot, seat_slot);
                break;
        case EVDEV_ABSOLUTE_TOUCH_DOWN:
                if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
                        break;
 
+               if (device->abs.seat_slot != -1) {
+                       log_bug_kernel(libinput,
+                                      "%s: Driver sent multiple touch down for the "
+                                      "same slot", device->devnode);
+                       break;
+               }
+
+               seat_slot = ffs(~seat->slot_map) - 1;
+               device->abs.seat_slot = seat_slot;
+
+               if (seat_slot == -1)
+                       break;
+
+               seat->slot_map |= 1 << seat_slot;
+
+               cx = device->abs.x;
+               cy = device->abs.y;
                transform_absolute(device, &cx, &cy);
-               touch_notify_touch(base,
-                                  time,
-                                  slot,
-                                  li_fixed_from_int(cx),
-                                  li_fixed_from_int(cy),
-                                  LIBINPUT_TOUCH_TYPE_DOWN);
+
+               touch_notify_touch_down(base, time, -1, seat_slot, cx, cy);
                break;
        case EVDEV_ABSOLUTE_MOTION:
+               cx = device->abs.x;
+               cy = device->abs.y;
                transform_absolute(device, &cx, &cy);
+               x = cx;
+               y = cy;
+
                if (device->seat_caps & EVDEV_DEVICE_TOUCH) {
-                       touch_notify_touch(base,
-                                          time,
-                                          slot,
-                                          li_fixed_from_int(cx),
-                                          li_fixed_from_int(cy),
-                                          LIBINPUT_TOUCH_TYPE_DOWN);
+                       seat_slot = device->abs.seat_slot;
+
+                       if (seat_slot == -1)
+                               break;
+
+                       touch_notify_touch_motion(base, time, -1, seat_slot, x, y);
                } else if (device->seat_caps & EVDEV_DEVICE_POINTER) {
-                       pointer_notify_motion_absolute(base,
-                                                      time,
-                                                      li_fixed_from_int(cx),
-                                                      li_fixed_from_int(cy));
+                       pointer_notify_motion_absolute(base, time, x, y);
                }
                break;
        case EVDEV_ABSOLUTE_TOUCH_UP:
                if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
                        break;
 
-               touch_notify_touch(base,
-                                  time,
-                                  0, 0, 0, LIBINPUT_TOUCH_TYPE_UP);
+               seat_slot = device->abs.seat_slot;
+               device->abs.seat_slot = -1;
+
+               if (seat_slot == -1)
+                       break;
+
+               seat->slot_map &= ~(1 << seat_slot);
+
+               touch_notify_touch_up(base, time, -1, seat_slot);
                break;
        default:
                assert(0 && "Unknown pending event type");
@@ -200,8 +346,57 @@ evdev_flush_pending_event(struct evdev_device *device, uint32_t time)
        device->pending_event = EVDEV_NONE;
 }
 
+static enum evdev_key_type
+get_key_type(uint16_t code)
+{
+       if (code == BTN_TOUCH)
+               return EVDEV_KEY_TYPE_NONE;
+
+       if (code >= KEY_ESC && code <= KEY_MICMUTE)
+               return EVDEV_KEY_TYPE_KEY;
+       if (code >= BTN_MISC && code <= BTN_GEAR_UP)
+               return EVDEV_KEY_TYPE_BUTTON;
+       if (code >= KEY_OK && code <= KEY_LIGHTS_TOGGLE)
+               return EVDEV_KEY_TYPE_KEY;
+       if (code >= BTN_DPAD_UP && code <= BTN_TRIGGER_HAPPY40)
+               return EVDEV_KEY_TYPE_BUTTON;
+       return EVDEV_KEY_TYPE_NONE;
+}
+
+static void
+evdev_middle_button_scroll_timeout(uint64_t time, void *data)
+{
+       struct evdev_device *device = data;
+
+       device->scroll.middle_button_scroll_active = true;
+}
+
+static void
+evdev_middle_button_scroll_button(struct evdev_device *device,
+                                uint64_t time, int is_press)
+{
+       if (is_press) {
+               libinput_timer_set(&device->scroll.timer,
+                               time + DEFAULT_MIDDLE_BUTTON_SCROLL_TIMEOUT);
+       } else {
+               libinput_timer_cancel(&device->scroll.timer);
+               if (device->scroll.middle_button_scroll_active) {
+                       evdev_stop_scroll(device, time);
+                       device->scroll.middle_button_scroll_active = false;
+               } else {
+                       /* If the button is released quickly enough emit the
+                        * button press/release events. */
+                       evdev_pointer_notify_button(device, time, BTN_MIDDLE,
+                                       LIBINPUT_BUTTON_STATE_PRESSED);
+                       evdev_pointer_notify_button(device, time, BTN_MIDDLE,
+                                       LIBINPUT_BUTTON_STATE_RELEASED);
+               }
+       }
+}
+
 static void
-evdev_process_touch_button(struct evdev_device *device, int time, int value)
+evdev_process_touch_button(struct evdev_device *device,
+                          uint64_t time, int value)
 {
        if (device->pending_event != EVDEV_NONE &&
            device->pending_event != EVDEV_ABSOLUTE_MOTION)
@@ -213,8 +408,11 @@ evdev_process_touch_button(struct evdev_device *device, int time, int value)
 }
 
 static inline void
-evdev_process_key(struct evdev_device *device, struct input_event *e, int time)
+evdev_process_key(struct evdev_device *device,
+                 struct input_event *e, uint64_t time)
 {
+       enum evdev_key_type type;
+
        /* ignore kernel key repeat */
        if (e->value == 2)
                return;
@@ -227,30 +425,47 @@ evdev_process_key(struct evdev_device *device, struct input_event *e, int time)
 
        evdev_flush_pending_event(device, time);
 
-       switch (e->code) {
-       case BTN_LEFT:
-       case BTN_RIGHT:
-       case BTN_MIDDLE:
-       case BTN_SIDE:
-       case BTN_EXTRA:
-       case BTN_FORWARD:
-       case BTN_BACK:
-       case BTN_TASK:
-               pointer_notify_button(
-                       &device->base,
+       type = get_key_type(e->code);
+
+       /* Ignore key release events from the kernel for keys that libinput
+        * never got a pressed event for. */
+       if (e->value == 0) {
+               switch (type) {
+               case EVDEV_KEY_TYPE_NONE:
+                       break;
+               case EVDEV_KEY_TYPE_KEY:
+               case EVDEV_KEY_TYPE_BUTTON:
+                       if (!hw_is_key_down(device, e->code))
+                               return;
+               }
+       }
+
+       hw_set_key_down(device, e->code, e->value);
+
+       switch (type) {
+       case EVDEV_KEY_TYPE_NONE:
+               break;
+       case EVDEV_KEY_TYPE_KEY:
+               evdev_keyboard_notify_key(
+                       device,
                        time,
                        e->code,
-                       e->value ? LIBINPUT_POINTER_BUTTON_STATE_PRESSED :
-                                  LIBINPUT_POINTER_BUTTON_STATE_RELEASED);
+                       e->value ? LIBINPUT_KEY_STATE_PRESSED :
+                                  LIBINPUT_KEY_STATE_RELEASED);
                break;
-
-       default:
-               keyboard_notify_key(
-                       &device->base,
+       case EVDEV_KEY_TYPE_BUTTON:
+               if (device->scroll.has_middle_button_scroll &&
+                   e->code == BTN_MIDDLE) {
+                       evdev_middle_button_scroll_button(device, time,
+                                                         e->value);
+                       break;
+               }
+               evdev_pointer_notify_button(
+                       device,
                        time,
-                       e->code,
-                       e->value ? LIBINPUT_KEYBOARD_KEY_STATE_PRESSED :
-                                  LIBINPUT_KEYBOARD_KEY_STATE_RELEASED);
+                       evdev_to_left_handed(device, e->code),
+                       e->value ? LIBINPUT_BUTTON_STATE_PRESSED :
+                                  LIBINPUT_BUTTON_STATE_RELEASED);
                break;
        }
 }
@@ -258,7 +473,7 @@ evdev_process_key(struct evdev_device *device, struct input_event *e, int time)
 static void
 evdev_process_touch(struct evdev_device *device,
                    struct input_event *e,
-                   uint32_t time)
+                   uint64_t time)
 {
        switch (e->code) {
        case ABS_MT_SLOT:
@@ -307,7 +522,7 @@ evdev_process_absolute_motion(struct evdev_device *device,
 
 static inline void
 evdev_process_relative(struct evdev_device *device,
-                      struct input_event *e, uint32_t time)
+                      struct input_event *e, uint64_t time)
 {
        struct libinput_device *base = &device->base;
 
@@ -315,13 +530,13 @@ evdev_process_relative(struct evdev_device *device,
        case REL_X:
                if (device->pending_event != EVDEV_RELATIVE_MOTION)
                        evdev_flush_pending_event(device, time);
-               device->rel.dx += li_fixed_from_int(e->value);
+               device->rel.dx += e->value;
                device->pending_event = EVDEV_RELATIVE_MOTION;
                break;
        case REL_Y:
                if (device->pending_event != EVDEV_RELATIVE_MOTION)
                        evdev_flush_pending_event(device, time);
-               device->rel.dy += li_fixed_from_int(e->value);
+               device->rel.dy += e->value;
                device->pending_event = EVDEV_RELATIVE_MOTION;
                break;
        case REL_WHEEL:
@@ -329,7 +544,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:
@@ -342,7 +557,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:
@@ -355,7 +570,7 @@ evdev_process_relative(struct evdev_device *device,
 static inline void
 evdev_process_absolute(struct evdev_device *device,
                       struct input_event *e,
-                      uint32_t time)
+                      uint64_t time)
 {
        if (device->is_mt) {
                evdev_process_touch(device, e, time);
@@ -364,11 +579,11 @@ evdev_process_absolute(struct evdev_device *device,
        }
 }
 
-static inline int
+static inline bool
 evdev_need_touch_frame(struct evdev_device *device)
 {
        if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
-               return 0;
+               return false;
 
        switch (device->pending_event) {
        case EVDEV_NONE:
@@ -380,19 +595,40 @@ evdev_need_touch_frame(struct evdev_device *device)
        case EVDEV_ABSOLUTE_TOUCH_DOWN:
        case EVDEV_ABSOLUTE_TOUCH_UP:
        case EVDEV_ABSOLUTE_MOTION:
-               return 1;
+               return true;
        }
 
-       return 0;
+       return false;
+}
+
+static void
+evdev_tag_external_mouse(struct evdev_device *device,
+                        struct udev_device *udev_device)
+{
+       int bustype;
+
+       bustype = libevdev_get_id_bustype(device->evdev);
+       if (bustype == BUS_USB || bustype == BUS_BLUETOOTH) {
+               if (device->seat_caps & EVDEV_DEVICE_POINTER)
+                       device->tags |= EVDEV_TAG_EXTERNAL_MOUSE;
+       }
+}
+
+static void
+evdev_tag_trackpoint(struct evdev_device *device,
+                    struct udev_device *udev_device)
+{
+       if (libevdev_has_property(device->evdev, INPUT_PROP_POINTING_STICK))
+               device->tags |= EVDEV_TAG_TRACKPOINT;
 }
 
 static void
 fallback_process(struct evdev_dispatch *dispatch,
                 struct evdev_device *device,
                 struct input_event *event,
-                uint32_t time)
+                uint64_t time)
 {
-       int need_frame = 0;
+       bool need_frame = false;
 
        switch (event->type) {
        case EV_REL:
@@ -419,85 +655,402 @@ fallback_destroy(struct evdev_dispatch *dispatch)
        free(dispatch);
 }
 
+static void
+fallback_tag_device(struct evdev_device *device,
+                   struct udev_device *udev_device)
+{
+       evdev_tag_external_mouse(device, udev_device);
+       evdev_tag_trackpoint(device, udev_device);
+}
+
+static int
+evdev_calibration_has_matrix(struct libinput_device *libinput_device)
+{
+       struct evdev_device *device = (struct evdev_device*)libinput_device;
+
+       return device->abs.absinfo_x && device->abs.absinfo_y;
+}
+
+static enum libinput_config_status
+evdev_calibration_set_matrix(struct libinput_device *libinput_device,
+                            const float matrix[6])
+{
+       struct evdev_device *device = (struct evdev_device*)libinput_device;
+
+       evdev_device_calibrate(device, matrix);
+
+       return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
+static int
+evdev_calibration_get_matrix(struct libinput_device *libinput_device,
+                            float matrix[6])
+{
+       struct evdev_device *device = (struct evdev_device*)libinput_device;
+
+       matrix_to_farray6(&device->abs.usermatrix, matrix);
+
+       return !matrix_is_identity(&device->abs.usermatrix);
+}
+
+static int
+evdev_calibration_get_default_matrix(struct libinput_device *libinput_device,
+                                    float matrix[6])
+{
+       struct evdev_device *device = (struct evdev_device*)libinput_device;
+
+       matrix_to_farray6(&device->abs.default_calibration, matrix);
+
+       return !matrix_is_identity(&device->abs.default_calibration);
+}
+
 struct evdev_dispatch_interface fallback_interface = {
        fallback_process,
-       fallback_destroy
+       fallback_destroy,
+       NULL, /* device_added */
+       NULL, /* device_removed */
+       NULL, /* device_suspended */
+       NULL, /* device_resumed */
+       fallback_tag_device,
 };
 
+static uint32_t
+evdev_sendevents_get_modes(struct libinput_device *device)
+{
+       return LIBINPUT_CONFIG_SEND_EVENTS_ENABLED |
+              LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
+}
+
+static enum libinput_config_status
+evdev_sendevents_set_mode(struct libinput_device *device,
+                         enum libinput_config_send_events_mode mode)
+{
+       struct evdev_device *evdev = (struct evdev_device*)device;
+       struct evdev_dispatch *dispatch = evdev->dispatch;
+
+       if (mode == dispatch->sendevents.current_mode)
+               return LIBINPUT_CONFIG_STATUS_SUCCESS;
+
+       switch(mode) {
+       case LIBINPUT_CONFIG_SEND_EVENTS_ENABLED:
+               evdev_device_resume(evdev);
+               break;
+       case LIBINPUT_CONFIG_SEND_EVENTS_DISABLED:
+               evdev_device_suspend(evdev);
+               break;
+       default:
+               return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
+       }
+
+       dispatch->sendevents.current_mode = mode;
+
+       return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
+static enum libinput_config_send_events_mode
+evdev_sendevents_get_mode(struct libinput_device *device)
+{
+       struct evdev_device *evdev = (struct evdev_device*)device;
+       struct evdev_dispatch *dispatch = evdev->dispatch;
+
+       return dispatch->sendevents.current_mode;
+}
+
+static enum libinput_config_send_events_mode
+evdev_sendevents_get_default_mode(struct libinput_device *device)
+{
+       return LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
+}
+
+static int
+evdev_left_handed_has(struct libinput_device *device)
+{
+       /* This is only hooked up when we have left-handed configuration, so we
+        * can hardcode 1 here */
+       return 1;
+}
+
+static void
+evdev_change_to_left_handed(struct evdev_device *device)
+{
+       unsigned int button;
+
+       if (device->buttons.want_left_handed == device->buttons.left_handed)
+               return;
+
+       for (button = BTN_LEFT; button < BTN_JOYSTICK; button++) {
+               if (libevdev_has_event_code(device->evdev, EV_KEY, button) &&
+                   hw_is_key_down(device, button))
+                       return;
+       }
+
+       device->buttons.left_handed = device->buttons.want_left_handed;
+}
+
+static enum libinput_config_status
+evdev_left_handed_set(struct libinput_device *device, int left_handed)
+{
+       struct evdev_device *evdev_device = (struct evdev_device *)device;
+
+       evdev_device->buttons.want_left_handed = left_handed ? true : false;
+
+       evdev_device->buttons.change_to_left_handed(evdev_device);
+
+       return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
+static int
+evdev_left_handed_get(struct libinput_device *device)
+{
+       struct evdev_device *evdev_device = (struct evdev_device *)device;
+
+       /* return the wanted configuration, even if it hasn't taken
+        * effect yet! */
+       return evdev_device->buttons.want_left_handed;
+}
+
+static int
+evdev_left_handed_get_default(struct libinput_device *device)
+{
+       return 0;
+}
+
+int
+evdev_init_left_handed(struct evdev_device *device,
+                      void (*change_to_left_handed)(struct evdev_device *))
+{
+       device->buttons.config_left_handed.has = evdev_left_handed_has;
+       device->buttons.config_left_handed.set = evdev_left_handed_set;
+       device->buttons.config_left_handed.get = evdev_left_handed_get;
+       device->buttons.config_left_handed.get_default = evdev_left_handed_get_default;
+       device->base.config.left_handed = &device->buttons.config_left_handed;
+       device->buttons.left_handed = false;
+       device->buttons.want_left_handed = false;
+       device->buttons.change_to_left_handed = change_to_left_handed;
+
+       return 0;
+}
+
 static struct evdev_dispatch *
-fallback_dispatch_create(void)
+fallback_dispatch_create(struct libinput_device *device)
 {
-       struct evdev_dispatch *dispatch = malloc(sizeof *dispatch);
+       struct evdev_dispatch *dispatch = zalloc(sizeof *dispatch);
+       struct evdev_device *evdev_device = (struct evdev_device *)device;
+
        if (dispatch == NULL)
                return NULL;
 
        dispatch->interface = &fallback_interface;
 
+       if (evdev_device->buttons.want_left_handed &&
+           evdev_init_left_handed(evdev_device,
+                                  evdev_change_to_left_handed) == -1) {
+               free(dispatch);
+               return NULL;
+       }
+
+       device->config.calibration = &dispatch->calibration;
+
+       dispatch->calibration.has_matrix = evdev_calibration_has_matrix;
+       dispatch->calibration.set_matrix = evdev_calibration_set_matrix;
+       dispatch->calibration.get_matrix = evdev_calibration_get_matrix;
+       dispatch->calibration.get_default_matrix = evdev_calibration_get_default_matrix;
+
+       device->config.sendevents = &dispatch->sendevents.config;
+
+       dispatch->sendevents.current_mode = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
+       dispatch->sendevents.config.get_modes = evdev_sendevents_get_modes;
+       dispatch->sendevents.config.set_mode = evdev_sendevents_set_mode;
+       dispatch->sendevents.config.get_mode = evdev_sendevents_get_mode;
+       dispatch->sendevents.config.get_default_mode = evdev_sendevents_get_default_mode;
+
        return dispatch;
 }
 
-static void
-evdev_process_events(struct evdev_device *device,
-                    struct input_event *ev, int count)
+static inline void
+evdev_process_event(struct evdev_device *device, struct input_event *e)
 {
        struct evdev_dispatch *dispatch = device->dispatch;
-       struct input_event *e, *end;
-       uint32_t time = 0;
+       uint64_t time = e->time.tv_sec * 1000ULL + e->time.tv_usec / 1000;
 
-       e = ev;
-       end = e + count;
-       for (e = ev; e < end; e++) {
-               time = e->time.tv_sec * 1000 + e->time.tv_usec / 1000;
+       dispatch->interface->process(dispatch, device, e, time);
+}
 
-               dispatch->interface->process(dispatch, device, e, time);
+static inline void
+evdev_device_dispatch_one(struct evdev_device *device,
+                         struct input_event *ev)
+{
+       if (!device->mtdev) {
+               evdev_process_event(device, ev);
+       } else {
+               mtdev_put_event(device->mtdev, ev);
+               if (libevdev_event_is_code(ev, EV_SYN, SYN_REPORT)) {
+                       while (!mtdev_empty(device->mtdev)) {
+                               struct input_event e;
+                               mtdev_get_event(device->mtdev, &e);
+                               evdev_process_event(device, &e);
+                       }
+               }
        }
 }
 
+static int
+evdev_sync_device(struct evdev_device *device)
+{
+       struct input_event ev;
+       int rc;
+
+       do {
+               rc = libevdev_next_event(device->evdev,
+                                        LIBEVDEV_READ_FLAG_SYNC, &ev);
+               if (rc < 0)
+                       break;
+               evdev_device_dispatch_one(device, &ev);
+       } while (rc == LIBEVDEV_READ_STATUS_SYNC);
+
+       return rc == -EAGAIN ? 0 : rc;
+}
+
 static void
 evdev_device_dispatch(void *data)
 {
        struct evdev_device *device = data;
        struct libinput *libinput = device->base.seat->libinput;
-       int fd = device->fd;
-       struct input_event ev[32];
-       int len;
+       struct input_event ev;
+       int rc;
 
        /* If the compositor is repainting, this function is called only once
         * per frame and we have to process all the events available on the
         * fd, otherwise there will be input lag. */
        do {
-               if (device->mtdev)
-                       len = mtdev_get(device->mtdev, fd, ev,
-                                       ARRAY_LENGTH(ev)) *
-                               sizeof (struct input_event);
-               else
-                       len = read(fd, &ev, sizeof ev);
-
-               if (len < 0 || len % sizeof ev[0] != 0) {
-                       if (len < 0 && errno != EAGAIN && errno != EINTR) {
-                               libinput_remove_source(libinput,
-                                                      device->source);
-                               device->source = NULL;
+               rc = libevdev_next_event(device->evdev,
+                                        LIBEVDEV_READ_FLAG_NORMAL, &ev);
+               if (rc == LIBEVDEV_READ_STATUS_SYNC) {
+                       if (device->syn_drops_received < 10) {
+                               device->syn_drops_received++;
+                               log_info(libinput, "SYN_DROPPED event from "
+                                        "\"%s\" - some input events have "
+                                        "been lost.\n", device->devname);
+                               if (device->syn_drops_received == 10)
+                                       log_info(libinput, "No longer logging "
+                                                "SYN_DROPPED events for "
+                                                "\"%s\"\n", device->devname);
                        }
 
-                       return;
+                       /* send one more sync event so we handle all
+                          currently pending events before we sync up
+                          to the current state */
+                       ev.code = SYN_REPORT;
+                       evdev_device_dispatch_one(device, &ev);
+
+                       rc = evdev_sync_device(device);
+                       if (rc == 0)
+                               rc = LIBEVDEV_READ_STATUS_SUCCESS;
+               } else if (rc == LIBEVDEV_READ_STATUS_SUCCESS) {
+                       evdev_device_dispatch_one(device, &ev);
                }
+       } while (rc == LIBEVDEV_READ_STATUS_SUCCESS);
+
+       if (rc != -EAGAIN && rc != -EINTR) {
+               libinput_remove_source(libinput, device->source);
+               device->source = NULL;
+       }
+}
+
+static int
+evdev_accel_config_available(struct libinput_device *device)
+{
+       /* this function is only called if we set up ptraccel, so we can
+          reply with a resounding "Yes" */
+       return 1;
+}
+
+static enum libinput_config_status
+evdev_accel_config_set_speed(struct libinput_device *device, double speed)
+{
+       struct evdev_device *dev = (struct evdev_device *)device;
+
+       if (!filter_set_speed(dev->pointer.filter, speed))
+               return LIBINPUT_CONFIG_STATUS_INVALID;
+
+       return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
+static double
+evdev_accel_config_get_speed(struct libinput_device *device)
+{
+       struct evdev_device *dev = (struct evdev_device *)device;
+
+       return filter_get_speed(dev->pointer.filter);
+}
 
-               evdev_process_events(device, ev, len / sizeof ev[0]);
+static double
+evdev_accel_config_get_default_speed(struct libinput_device *device)
+{
+       return 0.0;
+}
+
+int
+evdev_device_init_pointer_acceleration(struct evdev_device *device)
+{
+       device->pointer.filter =
+               create_pointer_accelerator_filter(
+                       pointer_accel_profile_linear);
+       if (!device->pointer.filter)
+               return -1;
+
+       device->pointer.config.available = evdev_accel_config_available;
+       device->pointer.config.set_speed = evdev_accel_config_set_speed;
+       device->pointer.config.get_speed = evdev_accel_config_get_speed;
+       device->pointer.config.get_default_speed = evdev_accel_config_get_default_speed;
+       device->base.config.accel = &device->pointer.config;
+
+       return 0;
+}
+
+
+static inline int
+evdev_need_mtdev(struct evdev_device *device)
+{
+       struct libevdev *evdev = device->evdev;
+
+       return (libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_X) &&
+               libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_Y) &&
+               !libevdev_has_event_code(evdev, EV_ABS, ABS_MT_SLOT));
+}
 
-       } while (len > 0);
+static void
+evdev_tag_device(struct evdev_device *device)
+{
+       struct udev *udev;
+       struct udev_device *udev_device = NULL;
+
+       udev = udev_new();
+       if (!udev)
+               return;
+
+       udev_device = udev_device_new_from_syspath(udev, device->syspath);
+       if (udev_device) {
+               if (device->dispatch->interface->tag_device)
+                       device->dispatch->interface->tag_device(device, udev_device);
+               udev_device_unref(udev_device);
+       }
+       udev_unref(udev);
 }
 
 static int
 evdev_configure_device(struct evdev_device *device)
 {
-       struct input_absinfo absinfo;
-       unsigned long ev_bits[NBITS(EV_MAX)];
-       unsigned long abs_bits[NBITS(ABS_MAX)];
-       unsigned long rel_bits[NBITS(REL_MAX)];
-       unsigned long key_bits[NBITS(KEY_MAX)];
+       struct libinput *libinput = device->base.seat->libinput;
+       struct libevdev *evdev = device->evdev;
+       const struct input_absinfo *absinfo;
+       struct input_absinfo fixed;
        int has_abs, has_rel, has_mt;
        int has_button, has_keyboard, has_touch;
+       struct mt_slot *slots;
+       int num_slots;
+       int active_slot;
+       int slot;
        unsigned int i;
 
        has_rel = 0;
@@ -507,140 +1060,258 @@ evdev_configure_device(struct evdev_device *device)
        has_keyboard = 0;
        has_touch = 0;
 
-       ioctl(device->fd, EVIOCGBIT(0, sizeof(ev_bits)), ev_bits);
-       if (TEST_BIT(ev_bits, EV_ABS)) {
-               ioctl(device->fd, EVIOCGBIT(EV_ABS, sizeof(abs_bits)),
-                     abs_bits);
+       if (libevdev_has_event_type(evdev, EV_ABS)) {
 
-               if (TEST_BIT(abs_bits, ABS_X)) {
-                       ioctl(device->fd, EVIOCGABS(ABS_X), &absinfo);
-                       device->abs.min_x = absinfo.minimum;
-                       device->abs.max_x = absinfo.maximum;
+               if ((absinfo = libevdev_get_abs_info(evdev, ABS_X))) {
+                       if (absinfo->resolution == 0) {
+                               fixed = *absinfo;
+                               fixed.resolution = 1;
+                               libevdev_set_abs_info(evdev, ABS_X, &fixed);
+                               device->abs.fake_resolution = 1;
+                       }
+                       device->abs.absinfo_x = absinfo;
                        has_abs = 1;
                }
-               if (TEST_BIT(abs_bits, ABS_Y)) {
-                       ioctl(device->fd, EVIOCGABS(ABS_Y), &absinfo);
-                       device->abs.min_y = absinfo.minimum;
-                       device->abs.max_y = absinfo.maximum;
+               if ((absinfo = libevdev_get_abs_info(evdev, ABS_Y))) {
+                       if (absinfo->resolution == 0) {
+                               fixed = *absinfo;
+                               fixed.resolution = 1;
+                               libevdev_set_abs_info(evdev, ABS_Y, &fixed);
+                               device->abs.fake_resolution = 1;
+                       }
+                       device->abs.absinfo_y = absinfo;
                        has_abs = 1;
                }
                 /* We only handle the slotted Protocol B in weston.
                    Devices with ABS_MT_POSITION_* but not ABS_MT_SLOT
                    require mtdev for conversion. */
-               if (TEST_BIT(abs_bits, ABS_MT_POSITION_X) &&
-                   TEST_BIT(abs_bits, ABS_MT_POSITION_Y)) {
-                       ioctl(device->fd, EVIOCGABS(ABS_MT_POSITION_X),
-                             &absinfo);
-                       device->abs.min_x = absinfo.minimum;
-                       device->abs.max_x = absinfo.maximum;
-                       ioctl(device->fd, EVIOCGABS(ABS_MT_POSITION_Y),
-                             &absinfo);
-                       device->abs.min_y = absinfo.minimum;
-                       device->abs.max_y = absinfo.maximum;
+               if (libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_X) &&
+                   libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_Y)) {
+                       absinfo = libevdev_get_abs_info(evdev, ABS_MT_POSITION_X);
+                       if (absinfo->resolution == 0) {
+                               fixed = *absinfo;
+                               fixed.resolution = 1;
+                               libevdev_set_abs_info(evdev,
+                                                     ABS_MT_POSITION_X,
+                                                     &fixed);
+                               device->abs.fake_resolution = 1;
+                       }
+                       device->abs.absinfo_x = absinfo;
+                       absinfo = libevdev_get_abs_info(evdev, ABS_MT_POSITION_Y);
+                       if (absinfo->resolution == 0) {
+                               fixed = *absinfo;
+                               fixed.resolution = 1;
+                               libevdev_set_abs_info(evdev,
+                                                     ABS_MT_POSITION_Y,
+                                                     &fixed);
+                               device->abs.fake_resolution = 1;
+                       }
+                       device->abs.absinfo_y = absinfo;
                        device->is_mt = 1;
                        has_touch = 1;
                        has_mt = 1;
 
-                       if (!TEST_BIT(abs_bits, ABS_MT_SLOT)) {
+                       if (evdev_need_mtdev(device)) {
                                device->mtdev = mtdev_new_open(device->fd);
                                if (!device->mtdev)
-                                       return 0;
-                               device->mt.slot = device->mtdev->caps.slot.value;
+                                       return -1;
+
+                               num_slots = device->mtdev->caps.slot.maximum;
+                               if (device->mtdev->caps.slot.minimum < 0 ||
+                                   num_slots <= 0)
+                                       return -1;
+                               active_slot = device->mtdev->caps.slot.value;
                        } else {
-                               ioctl(device->fd, EVIOCGABS(ABS_MT_SLOT),
-                                     &absinfo);
-                               device->mt.slot = absinfo.value;
+                               num_slots = libevdev_get_num_slots(device->evdev);
+                               active_slot = libevdev_get_current_slot(evdev);
+                       }
+
+                       slots = calloc(num_slots, sizeof(struct mt_slot));
+                       if (!slots)
+                               return -1;
+
+                       for (slot = 0; slot < num_slots; ++slot) {
+                               slots[slot].seat_slot = -1;
+                               slots[slot].x = 0;
+                               slots[slot].y = 0;
                        }
+                       device->mt.slots = slots;
+                       device->mt.slots_len = num_slots;
+                       device->mt.slot = active_slot;
                }
        }
-       if (TEST_BIT(ev_bits, EV_REL)) {
-               ioctl(device->fd, EVIOCGBIT(EV_REL, sizeof(rel_bits)),
-                     rel_bits);
-               if (TEST_BIT(rel_bits, REL_X) || TEST_BIT(rel_bits, REL_Y))
-                       has_rel = 1;
-       }
-       if (TEST_BIT(ev_bits, EV_KEY)) {
-               ioctl(device->fd, EVIOCGBIT(EV_KEY, sizeof(key_bits)),
-                     key_bits);
-               if (TEST_BIT(key_bits, BTN_TOOL_FINGER) &&
-                   !TEST_BIT(key_bits, BTN_TOOL_PEN) &&
+
+       if (libevdev_has_property(evdev, INPUT_PROP_POINTING_STICK)) {
+               libinput_timer_init(&device->scroll.timer,
+                                   device->base.seat->libinput,
+                                   evdev_middle_button_scroll_timeout,
+                                   device);
+               device->scroll.has_middle_button_scroll = true;
+       }
+
+       if (libevdev_has_event_code(evdev, EV_REL, REL_X) ||
+           libevdev_has_event_code(evdev, EV_REL, REL_Y))
+               has_rel = 1;
+
+       if (libevdev_has_event_type(evdev, EV_KEY)) {
+               if (!libevdev_has_property(evdev, INPUT_PROP_DIRECT) &&
+                   libevdev_has_event_code(evdev, EV_KEY, BTN_TOOL_FINGER) &&
+                   !libevdev_has_event_code(evdev, EV_KEY, BTN_TOOL_PEN) &&
                    (has_abs || has_mt)) {
-                       device->dispatch = evdev_touchpad_create(device);
+                       device->dispatch = evdev_mt_touchpad_create(device);
+                       log_info(libinput,
+                                "input device '%s', %s is a touchpad\n",
+                                device->devname, device->devnode);
+                       return device->dispatch == NULL ? -1 : 0;
                }
-               for (i = KEY_ESC; i < KEY_MAX; i++) {
-                       if (i >= BTN_MISC && i < KEY_OK)
-                               continue;
-                       if (TEST_BIT(key_bits, i)) {
-                               has_keyboard = 1;
-                               break;
+
+               for (i = 0; i < KEY_MAX; i++) {
+                       if (libevdev_has_event_code(evdev, EV_KEY, i)) {
+                               switch (get_key_type(i)) {
+                               case EVDEV_KEY_TYPE_NONE:
+                                       break;
+                               case EVDEV_KEY_TYPE_KEY:
+                                       has_keyboard = 1;
+                                       break;
+                               case EVDEV_KEY_TYPE_BUTTON:
+                                       has_button = 1;
+                                       break;
+                               }
                        }
                }
-               if (TEST_BIT(key_bits, BTN_TOUCH))
+
+               if (libevdev_has_event_code(evdev, EV_KEY, BTN_TOUCH))
                        has_touch = 1;
-               for (i = BTN_MISC; i < BTN_JOYSTICK; i++) {
-                       if (TEST_BIT(key_bits, i)) {
-                               has_button = 1;
-                               break;
-                       }
-               }
        }
-       if (TEST_BIT(ev_bits, EV_LED))
+       if (libevdev_has_event_type(evdev, EV_LED))
                has_keyboard = 1;
 
-       if ((has_abs || has_rel) && has_button)
+       if ((has_abs || has_rel) && has_button) {
+               if (evdev_device_init_pointer_acceleration(device) == -1)
+                       return -1;
+
                device->seat_caps |= EVDEV_DEVICE_POINTER;
-       if (has_keyboard)
+
+               log_info(libinput,
+                        "input device '%s', %s is a pointer caps =%s%s%s\n",
+                        device->devname, device->devnode,
+                        has_abs ? " absolute-motion" : "",
+                        has_rel ? " relative-motion": "",
+                        has_button ? " button" : "");
+
+               /* want left-handed config option */
+               device->buttons.want_left_handed = true;
+       }
+       if (has_keyboard) {
                device->seat_caps |= EVDEV_DEVICE_KEYBOARD;
-       if (has_touch && !has_button)
+               log_info(libinput,
+                        "input device '%s', %s is a keyboard\n",
+                        device->devname, device->devnode);
+       }
+       if (has_touch && !has_button) {
                device->seat_caps |= EVDEV_DEVICE_TOUCH;
+               log_info(libinput,
+                        "input device '%s', %s is a touch device\n",
+                        device->devname, device->devnode);
+       }
 
        return 0;
 }
 
+static void
+evdev_notify_added_device(struct evdev_device *device)
+{
+       struct libinput_device *dev;
+
+       list_for_each(dev, &device->base.seat->devices_list, link) {
+               struct evdev_device *d = (struct evdev_device*)dev;
+               if (dev == &device->base)
+                       continue;
+
+               /* Notify existing device d about addition of device device */
+               if (d->dispatch->interface->device_added)
+                       d->dispatch->interface->device_added(d, device);
+
+               /* Notify new device device about existing device d */
+               if (device->dispatch->interface->device_added)
+                       device->dispatch->interface->device_added(device, d);
+
+               /* Notify new device device if existing device d is suspended */
+               if (d->suspended && device->dispatch->interface->device_suspended)
+                       device->dispatch->interface->device_suspended(device, d);
+       }
+
+       notify_added_device(&device->base);
+}
+
 struct evdev_device *
 evdev_device_create(struct libinput_seat *seat,
                    const char *devnode,
                    const char *sysname,
-                   int fd)
+                   const char *syspath)
 {
        struct libinput *libinput = seat->libinput;
        struct evdev_device *device;
-       char devname[256] = "unknown";
+       int rc;
+       int fd;
+       int unhandled_device = 0;
+
+       /* Use non-blocking mode so that we can loop on read on
+        * evdev_device_data() until all events on the fd are
+        * read.  mtdev_get() also expects this. */
+       fd = open_restricted(libinput, devnode, O_RDWR | O_NONBLOCK);
+       if (fd < 0) {
+               log_info(libinput,
+                        "opening input device '%s' failed (%s).\n",
+                        devnode, strerror(-fd));
+               return NULL;
+       }
 
        device = zalloc(sizeof *device);
        if (device == NULL)
                return NULL;
 
        libinput_device_init(&device->base, seat);
+       libinput_seat_ref(seat);
+
+       rc = libevdev_new_from_fd(fd, &device->evdev);
+       if (rc != 0)
+               goto err;
+
+       libevdev_set_clock_id(device->evdev, CLOCK_MONOTONIC);
 
        device->seat_caps = 0;
        device->is_mt = 0;
        device->mtdev = NULL;
        device->devnode = strdup(devnode);
        device->sysname = strdup(sysname);
-       device->mt.slot = -1;
+       device->syspath = strdup(syspath);
        device->rel.dx = 0;
        device->rel.dy = 0;
+       device->abs.seat_slot = -1;
        device->dispatch = NULL;
        device->fd = fd;
        device->pending_event = EVDEV_NONE;
+       device->devname = libevdev_get_name(device->evdev);
+       device->scroll.threshold = 5.0; /* Default may be overridden */
+       device->scroll.direction = 0;
+       device->dpi = DEFAULT_MOUSE_DPI;
 
-       ioctl(device->fd, EVIOCGNAME(sizeof(devname)), devname);
-       devname[sizeof(devname) - 1] = '\0';
-       device->devname = strdup(devname);
-
-       libinput_seat_ref(seat);
+       matrix_init_identity(&device->abs.calibration);
+       matrix_init_identity(&device->abs.usermatrix);
+       matrix_init_identity(&device->abs.default_calibration);
 
        if (evdev_configure_device(device) == -1)
                goto err;
 
        if (device->seat_caps == 0) {
+               unhandled_device = 1;
                goto err;
        }
 
        /* If the dispatch was not set up use the fallback. */
        if (device->dispatch == NULL)
-               device->dispatch = fallback_dispatch_create();
+               device->dispatch = fallback_dispatch_create(&device->base);
        if (device->dispatch == NULL)
                goto err;
 
@@ -650,20 +1321,25 @@ evdev_device_create(struct libinput_seat *seat,
                goto err;
 
        list_insert(seat->devices_list.prev, &device->base.link);
-       notify_added_device(&device->base);
+
+       evdev_tag_device(device);
+       evdev_notify_added_device(device);
 
        return device;
 
 err:
+       if (fd >= 0)
+               close_restricted(libinput, fd);
        evdev_device_destroy(device);
-       return NULL;
+
+       return unhandled_device ? EVDEV_UNHANDLED_DEVICE :  NULL;
 }
 
 int
 evdev_device_get_keys(struct evdev_device *device, char *keys, size_t size)
 {
        memset(keys, 0, size);
-       return ioctl(device->fd, EVIOCGKEY(size), keys);
+       return 0;
 }
 
 const char *
@@ -678,11 +1354,94 @@ evdev_device_get_sysname(struct evdev_device *device)
        return device->sysname;
 }
 
+const char *
+evdev_device_get_name(struct evdev_device *device)
+{
+       return device->devname;
+}
+
+unsigned int
+evdev_device_get_id_product(struct evdev_device *device)
+{
+       return libevdev_get_id_product(device->evdev);
+}
+
+unsigned int
+evdev_device_get_id_vendor(struct evdev_device *device)
+{
+       return libevdev_get_id_vendor(device->evdev);
+}
+
 void
-evdev_device_calibrate(struct evdev_device *device, float calibration[6])
+evdev_device_set_default_calibration(struct evdev_device *device,
+                                    const float calibration[6])
 {
-       device->abs.apply_calibration = 1;
-       memcpy(device->abs.calibration, calibration, sizeof device->abs.calibration);
+       matrix_from_farray6(&device->abs.default_calibration, calibration);
+       evdev_device_calibrate(device, calibration);
+}
+
+void
+evdev_device_calibrate(struct evdev_device *device,
+                      const float calibration[6])
+{
+       struct matrix scale,
+                     translate,
+                     transform;
+       double sx, sy;
+
+       matrix_from_farray6(&transform, calibration);
+       device->abs.apply_calibration = !matrix_is_identity(&transform);
+
+       if (!device->abs.apply_calibration) {
+               matrix_init_identity(&device->abs.calibration);
+               return;
+       }
+
+       sx = device->abs.absinfo_x->maximum - device->abs.absinfo_x->minimum + 1;
+       sy = device->abs.absinfo_y->maximum - device->abs.absinfo_y->minimum + 1;
+
+       /* The transformation matrix is in the form:
+        *  [ a b c ]
+        *  [ d e f ]
+        *  [ 0 0 1 ]
+        * Where a, e are the scale components, a, b, d, e are the rotation
+        * component (combined with scale) and c and f are the translation
+        * component. The translation component in the input matrix must be
+        * normalized to multiples of the device width and height,
+        * respectively. e.g. c == 1 shifts one device-width to the right.
+        *
+        * We pre-calculate a single matrix to apply to event coordinates:
+        *     M = Un-Normalize * Calibration * Normalize
+        *
+        * Normalize: scales the device coordinates to [0,1]
+        * Calibration: user-supplied matrix
+        * Un-Normalize: scales back up to device coordinates
+        * Matrix maths requires the normalize/un-normalize in reverse
+        * order.
+        */
+
+       /* back up the user matrix so we can return it on request */
+       matrix_from_farray6(&device->abs.usermatrix, calibration);
+
+       /* Un-Normalize */
+       matrix_init_translate(&translate,
+                             device->abs.absinfo_x->minimum,
+                             device->abs.absinfo_y->minimum);
+       matrix_init_scale(&scale, sx, sy);
+       matrix_mult(&scale, &translate, &scale);
+
+       /* Calibration */
+       matrix_mult(&transform, &scale, &transform);
+
+       /* Normalize */
+       matrix_init_translate(&translate,
+                             -device->abs.absinfo_x->minimum/sx,
+                             -device->abs.absinfo_y->minimum/sy);
+       matrix_init_scale(&scale, 1.0/sx, 1.0/sy);
+       matrix_mult(&scale, &translate, &scale);
+
+       /* store final matrix in device */
+       matrix_mult(&device->abs.calibration, &transform, &scale);
 }
 
 int
@@ -701,16 +1460,277 @@ 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 || device->abs.fake_resolution ||
+           !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_post_scroll(struct evdev_device *device,
+                 uint64_t time,
+                 double dx,
+                 double dy)
+{
+       if (dy <= -device->scroll.threshold || dy >= device->scroll.threshold)
+               device->scroll.direction |= (1 << LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+
+       if (dx <= -device->scroll.threshold || dx >= device->scroll.threshold)
+               device->scroll.direction |= (1 << LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
+
+       if (dy != 0.0 &&
+           (device->scroll.direction & (1 << LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))) {
+               pointer_notify_axis(&device->base,
+                                   time,
+                                   LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL,
+                                   dy);
+       }
+
+       if (dx != 0.0 &&
+           (device->scroll.direction & (1 << LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL))) {
+               pointer_notify_axis(&device->base,
+                                   time,
+                                   LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL,
+                                   dx);
+       }
+}
+
 void
-evdev_device_remove(struct evdev_device *device)
+evdev_stop_scroll(struct evdev_device *device, uint64_t time)
+{
+       /* terminate scrolling with a zero scroll event */
+       if (device->scroll.direction & (1 << LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))
+               pointer_notify_axis(&device->base,
+                                   time,
+                                   LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL,
+                                   0);
+       if (device->scroll.direction & (1 << LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL))
+               pointer_notify_axis(&device->base,
+                                   time,
+                                   LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL,
+                                   0);
+
+       device->scroll.direction = 0;
+}
+
+static void
+release_pressed_keys(struct evdev_device *device)
+{
+       struct libinput *libinput = device->base.seat->libinput;
+       uint64_t time;
+       int code;
+
+       if ((time = libinput_now(libinput)) == 0)
+               return;
+
+       for (code = 0; code < KEY_CNT; code++) {
+               int count = get_key_down_count(device, code);
+
+               if (count > 1) {
+                       log_bug_libinput(libinput,
+                                        "Key %d is down %d times.\n",
+                                        code,
+                                        count);
+               }
+
+               while (get_key_down_count(device, code) > 0) {
+                       switch (get_key_type(code)) {
+                       case EVDEV_KEY_TYPE_NONE:
+                               break;
+                       case EVDEV_KEY_TYPE_KEY:
+                               evdev_keyboard_notify_key(
+                                       device,
+                                       time,
+                                       code,
+                                       LIBINPUT_KEY_STATE_RELEASED);
+                               break;
+                       case EVDEV_KEY_TYPE_BUTTON:
+                               evdev_pointer_notify_button(
+                                       device,
+                                       time,
+                                       evdev_to_left_handed(device, code),
+                                       LIBINPUT_BUTTON_STATE_RELEASED);
+                               break;
+                       }
+               }
+       }
+}
+
+void
+evdev_notify_suspended_device(struct evdev_device *device)
+{
+       struct libinput_device *it;
+
+       if (device->suspended)
+               return;
+
+       list_for_each(it, &device->base.seat->devices_list, link) {
+               struct evdev_device *d = (struct evdev_device*)it;
+               if (it == &device->base)
+                       continue;
+
+               if (d->dispatch->interface->device_suspended)
+                       d->dispatch->interface->device_suspended(d, device);
+       }
+
+       device->suspended = 1;
+}
+
+void
+evdev_notify_resumed_device(struct evdev_device *device)
+{
+       struct libinput_device *it;
+
+       if (!device->suspended)
+               return;
+
+       list_for_each(it, &device->base.seat->devices_list, link) {
+               struct evdev_device *d = (struct evdev_device*)it;
+               if (it == &device->base)
+                       continue;
+
+               if (d->dispatch->interface->device_resumed)
+                       d->dispatch->interface->device_resumed(d, device);
+       }
+
+       device->suspended = 0;
+}
+
+int
+evdev_device_suspend(struct evdev_device *device)
 {
-       if (device->source)
+       evdev_notify_suspended_device(device);
+
+       if (device->source) {
                libinput_remove_source(device->base.seat->libinput,
                                       device->source);
+               device->source = NULL;
+       }
+
+       release_pressed_keys(device);
+
+       if (device->mtdev) {
+               mtdev_close_delete(device->mtdev);
+               device->mtdev = NULL;
+       }
+
+       if (device->fd != -1) {
+               close_restricted(device->base.seat->libinput, device->fd);
+               device->fd = -1;
+       }
+
+       return 0;
+}
+
+static int
+evdev_device_compare_syspath(struct evdev_device *device, int fd)
+{
+       struct udev *udev = NULL;
+       struct udev_device *udev_device = NULL;
+       const char *syspath;
+       struct stat st;
+       int rc = 1;
+
+       udev = udev_new();
+       if (!udev)
+               goto out;
+
+       if (fstat(fd, &st) < 0)
+               goto out;
+
+       udev_device = udev_device_new_from_devnum(udev, 'c', st.st_rdev);
+       if (!device)
+               goto out;
+
+       syspath = udev_device_get_syspath(udev_device);
+       rc = strcmp(syspath, device->syspath);
+out:
+       if (udev_device)
+               udev_device_unref(udev_device);
+       if (udev)
+               udev_unref(udev);
+       return rc;
+}
+
+int
+evdev_device_resume(struct evdev_device *device)
+{
+       struct libinput *libinput = device->base.seat->libinput;
+       int fd;
+
+       if (device->fd != -1)
+               return 0;
 
-       if (device->mtdev)
+       if (device->syspath == NULL)
+               return -ENODEV;
+
+       fd = open_restricted(libinput, device->devnode, O_RDWR | O_NONBLOCK);
+
+       if (fd < 0)
+               return -errno;
+
+       if (evdev_device_compare_syspath(device, fd)) {
+               close_restricted(libinput, fd);
+               return -ENODEV;
+       }
+
+       device->fd = fd;
+
+       if (evdev_need_mtdev(device)) {
+               device->mtdev = mtdev_new_open(device->fd);
+               if (!device->mtdev)
+                       return -ENODEV;
+       }
+
+       device->source =
+               libinput_add_fd(libinput, fd, evdev_device_dispatch, device);
+       if (!device->source) {
                mtdev_close_delete(device->mtdev);
-       close(device->fd);
+               return -ENOMEM;
+       }
+
+       memset(device->hw_key_mask, 0, sizeof(device->hw_key_mask));
+
+       evdev_notify_resumed_device(device);
+
+       return 0;
+}
+
+void
+evdev_device_remove(struct evdev_device *device)
+{
+       struct libinput_device *dev;
+
+       list_for_each(dev, &device->base.seat->devices_list, link) {
+               struct evdev_device *d = (struct evdev_device*)dev;;
+               if (dev == &device->base)
+                       continue;
+
+               if (d->dispatch->interface->device_removed)
+                       d->dispatch->interface->device_removed(d, device);
+       }
+
+       evdev_device_suspend(device);
+
+       /* A device may be removed while suspended. Free the syspath to
+        * skip re-opening a different device with the same node */
+       free(device->syspath);
+       device->syspath = NULL;
+
        list_remove(&device->base.link);
 
        notify_removed_device(&device->base);
@@ -726,10 +1746,12 @@ evdev_device_destroy(struct evdev_device *device)
        if (dispatch)
                dispatch->interface->destroy(dispatch);
 
+       filter_destroy(device->pointer.filter);
        libinput_seat_unref(device->base.seat);
-
-       free(device->devname);
+       libevdev_free(device->evdev);
+       free(device->mt.slots);
        free(device->devnode);
        free(device->sysname);
+       free(device->syspath);
        free(device);
 }