#include "filter.h"
#include "libinput-private.h"
-#define DEFAULT_AXIS_STEP_DISTANCE 10
+#define DEFAULT_WHEEL_CLICK_ANGLE 15
#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,
if (state == LIBINPUT_BUTTON_STATE_RELEASED &&
device->buttons.change_to_left_handed)
device->buttons.change_to_left_handed(device);
+
+ if (state == LIBINPUT_BUTTON_STATE_RELEASED &&
+ device->scroll.change_scroll_method)
+ device->scroll.change_scroll_method(device);
}
}
{
struct libinput *libinput = device->base.seat->libinput;
struct motion_params motion;
+ double dx_unaccel, dy_unaccel;
int32_t cx, cy;
int32_t x, y;
int slot;
case EVDEV_NONE:
return;
case EVDEV_RELATIVE_MOTION:
- motion.dx = device->rel.dx / ((double)device->dpi / DEFAULT_MOUSE_DPI);
- motion.dy = device->rel.dy / ((double)device->dpi / DEFAULT_MOUSE_DPI);
+ dx_unaccel = device->rel.dx / ((double) device->dpi /
+ DEFAULT_MOUSE_DPI);
+ dy_unaccel = 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)
+ if (device->scroll.method == LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN &&
+ hw_is_key_down(device, device->scroll.button)) {
+ if (device->scroll.button_scroll_active)
evdev_post_scroll(device, time,
- motion.dx, motion.dy);
+ LIBINPUT_POINTER_AXIS_SOURCE_CONTINUOUS,
+ dx_unaccel, dy_unaccel);
break;
}
/* Apply pointer acceleration. */
+ motion.dx = dx_unaccel;
+ motion.dy = dy_unaccel;
filter_dispatch(device->pointer.filter, &motion, device, time);
- if (motion.dx == 0.0 && motion.dy == 0.0)
+ if (motion.dx == 0.0 && motion.dy == 0.0 &&
+ dx_unaccel == 0.0 && dy_unaccel == 0.0) {
break;
+ }
- pointer_notify_motion(base, time, motion.dx, motion.dy);
+ pointer_notify_motion(base, time,
+ motion.dx, motion.dy,
+ dx_unaccel, dy_unaccel);
break;
case EVDEV_ABSOLUTE_MT_DOWN:
if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
if (device->mt.slots[slot].seat_slot != -1) {
log_bug_kernel(libinput,
"%s: Driver sent multiple touch down for the "
- "same slot", device->devnode);
+ "same slot",
+ udev_device_get_devnode(device->udev_device));
break;
}
if (device->abs.seat_slot != -1) {
log_bug_kernel(libinput,
"%s: Driver sent multiple touch down for the "
- "same slot", device->devnode);
+ "same slot",
+ udev_device_get_devnode(device->udev_device));
break;
}
}
static void
-evdev_middle_button_scroll_timeout(uint64_t time, void *data)
+evdev_button_scroll_timeout(uint64_t time, void *data)
{
struct evdev_device *device = data;
- device->scroll.middle_button_scroll_active = true;
+ device->scroll.button_scroll_active = true;
}
static void
-evdev_middle_button_scroll_button(struct evdev_device *device,
- uint64_t time, int is_press)
+evdev_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;
+ if (device->scroll.button_scroll_active) {
+ evdev_stop_scroll(device, time,
+ LIBINPUT_POINTER_AXIS_SOURCE_CONTINUOUS);
+ device->scroll.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,
+ evdev_pointer_notify_button(device, time,
+ device->scroll.button,
LIBINPUT_BUTTON_STATE_PRESSED);
- evdev_pointer_notify_button(device, time, BTN_MIDDLE,
+ evdev_pointer_notify_button(device, time,
+ device->scroll.button,
LIBINPUT_BUTTON_STATE_RELEASED);
}
}
LIBINPUT_KEY_STATE_RELEASED);
break;
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);
+ if (device->scroll.method == LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN &&
+ e->code == device->scroll.button) {
+ evdev_button_scroll_button(device, time, e->value);
break;
}
evdev_pointer_notify_button(
}
}
+static void
+evdev_notify_axis(struct evdev_device *device,
+ uint64_t time,
+ uint32_t axes,
+ enum libinput_pointer_axis_source source,
+ double x, double y)
+{
+ if (device->scroll.natural_scrolling_enabled) {
+ x *= -1;
+ y *= -1;
+ }
+
+ pointer_notify_axis(&device->base,
+ time,
+ axes,
+ source,
+ x, y);
+}
+
static inline void
evdev_process_relative(struct evdev_device *device,
struct input_event *e, uint64_t time)
{
- struct libinput_device *base = &device->base;
-
switch (e->code) {
case REL_X:
if (device->pending_event != EVDEV_RELATIVE_MOTION)
break;
case REL_WHEEL:
evdev_flush_pending_event(device, time);
- pointer_notify_axis(
- base,
+ evdev_notify_axis(
+ device,
time,
- LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL,
- -1 * e->value * DEFAULT_AXIS_STEP_DISTANCE);
+ AS_MASK(LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL),
+ LIBINPUT_POINTER_AXIS_SOURCE_WHEEL,
+ 0,
+ -1 * e->value * device->scroll.wheel_click_angle);
break;
case REL_HWHEEL:
evdev_flush_pending_event(device, time);
- switch (e->value) {
- case -1:
- /* Scroll left */
- case 1:
- /* Scroll right */
- pointer_notify_axis(
- base,
- time,
- LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL,
- e->value * DEFAULT_AXIS_STEP_DISTANCE);
- break;
- default:
- break;
-
- }
+ evdev_notify_axis(
+ device,
+ time,
+ AS_MASK(LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL),
+ LIBINPUT_POINTER_AXIS_SOURCE_WHEEL,
+ e->value * device->scroll.wheel_click_angle,
+ 0);
+ break;
}
}
}
static inline bool
+evdev_any_button_down(struct evdev_device *device)
+{
+ unsigned int button;
+
+ 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 true;
+ }
+ return false;
+}
+
+static inline bool
evdev_need_touch_frame(struct evdev_device *device)
{
if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
struct evdev_dispatch_interface fallback_interface = {
fallback_process,
+ NULL, /* remove */
fallback_destroy,
NULL, /* device_added */
NULL, /* device_removed */
static uint32_t
evdev_sendevents_get_modes(struct libinput_device *device)
{
- return LIBINPUT_CONFIG_SEND_EVENTS_ENABLED |
- LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
+ return LIBINPUT_CONFIG_SEND_EVENTS_DISABLED;
}
static enum libinput_config_status
case LIBINPUT_CONFIG_SEND_EVENTS_DISABLED:
evdev_device_suspend(evdev);
break;
- default:
+ default: /* no support for combined modes yet */
return LIBINPUT_CONFIG_STATUS_UNSUPPORTED;
}
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;
- }
+ if (evdev_any_button_down(device))
+ return;
device->buttons.left_handed = device->buttons.want_left_handed;
}
return 0;
}
+static uint32_t
+evdev_scroll_get_methods(struct libinput_device *device)
+{
+ return LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN;
+}
+
+static void
+evdev_change_scroll_method(struct evdev_device *device)
+{
+ if (device->scroll.want_method == device->scroll.method &&
+ device->scroll.want_button == device->scroll.button)
+ return;
+
+ if (evdev_any_button_down(device))
+ return;
+
+ device->scroll.method = device->scroll.want_method;
+ device->scroll.button = device->scroll.want_button;
+}
+
+static enum libinput_config_status
+evdev_scroll_set_method(struct libinput_device *device,
+ enum libinput_config_scroll_method method)
+{
+ struct evdev_device *evdev = (struct evdev_device*)device;
+
+ evdev->scroll.want_method = method;
+ evdev->scroll.change_scroll_method(evdev);
+
+ return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
+static enum libinput_config_scroll_method
+evdev_scroll_get_method(struct libinput_device *device)
+{
+ struct evdev_device *evdev = (struct evdev_device *)device;
+
+ /* return the wanted configuration, even if it hasn't taken
+ * effect yet! */
+ return evdev->scroll.want_method;
+}
+
+static enum libinput_config_scroll_method
+evdev_scroll_get_default_method(struct libinput_device *device)
+{
+ struct evdev_device *evdev = (struct evdev_device *)device;
+
+ if (libevdev_has_property(evdev->evdev, INPUT_PROP_POINTING_STICK))
+ return LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN;
+ else
+ return LIBINPUT_CONFIG_SCROLL_NO_SCROLL;
+}
+
+static enum libinput_config_status
+evdev_scroll_set_button(struct libinput_device *device,
+ uint32_t button)
+{
+ struct evdev_device *evdev = (struct evdev_device*)device;
+
+ evdev->scroll.want_button = button;
+ evdev->scroll.change_scroll_method(evdev);
+
+ return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
+static uint32_t
+evdev_scroll_get_button(struct libinput_device *device)
+{
+ struct evdev_device *evdev = (struct evdev_device *)device;
+
+ /* return the wanted configuration, even if it hasn't taken
+ * effect yet! */
+ return evdev->scroll.want_button;
+}
+
+static uint32_t
+evdev_scroll_get_default_button(struct libinput_device *device)
+{
+ struct evdev_device *evdev = (struct evdev_device *)device;
+
+ if (libevdev_has_property(evdev->evdev, INPUT_PROP_POINTING_STICK))
+ return BTN_MIDDLE;
+ else
+ return 0;
+}
+
+static int
+evdev_init_button_scroll(struct evdev_device *device,
+ void (*change_scroll_method)(struct evdev_device *))
+{
+ libinput_timer_init(&device->scroll.timer, device->base.seat->libinput,
+ evdev_button_scroll_timeout, device);
+ device->scroll.config.get_methods = evdev_scroll_get_methods;
+ device->scroll.config.set_method = evdev_scroll_set_method;
+ device->scroll.config.get_method = evdev_scroll_get_method;
+ device->scroll.config.get_default_method = evdev_scroll_get_default_method;
+ device->scroll.config.set_button = evdev_scroll_set_button;
+ device->scroll.config.get_button = evdev_scroll_get_button;
+ device->scroll.config.get_default_button = evdev_scroll_get_default_button;
+ device->base.config.scroll_method = &device->scroll.config;
+ device->scroll.method = evdev_scroll_get_default_method((struct libinput_device *)device);
+ device->scroll.want_method = device->scroll.method;
+ device->scroll.button = evdev_scroll_get_default_button((struct libinput_device *)device);
+ device->scroll.want_button = device->scroll.button;
+ device->scroll.change_scroll_method = change_scroll_method;
+
+ return 0;
+}
+
+static void
+evdev_init_calibration(struct evdev_device *device,
+ struct evdev_dispatch *dispatch)
+{
+ device->base.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;
+}
+
+static void
+evdev_init_sendevents(struct evdev_device *device,
+ struct evdev_dispatch *dispatch)
+{
+ device->base.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;
+}
+
+static int
+evdev_scroll_config_natural_has(struct libinput_device *device)
+{
+ return 1;
+}
+
+static enum libinput_config_status
+evdev_scroll_config_natural_set(struct libinput_device *device,
+ int enabled)
+{
+ struct evdev_device *dev = (struct evdev_device *)device;
+
+ dev->scroll.natural_scrolling_enabled = enabled ? true : false;
+
+ return LIBINPUT_CONFIG_STATUS_SUCCESS;
+}
+
+static int
+evdev_scroll_config_natural_get(struct libinput_device *device)
+{
+ struct evdev_device *dev = (struct evdev_device *)device;
+
+ return dev->scroll.natural_scrolling_enabled ? 1 : 0;
+}
+
+static int
+evdev_scroll_config_natural_get_default(struct libinput_device *device)
+{
+ /* could enable this on Apple touchpads. could do that, could
+ * very well do that... */
+ return 0;
+}
+
+void
+evdev_init_natural_scroll(struct evdev_device *device)
+{
+ device->scroll.config_natural.has = evdev_scroll_config_natural_has;
+ device->scroll.config_natural.set_enabled = evdev_scroll_config_natural_set;
+ device->scroll.config_natural.get_enabled = evdev_scroll_config_natural_get;
+ device->scroll.config_natural.get_default_enabled = evdev_scroll_config_natural_get_default;
+ device->scroll.natural_scrolling_enabled = false;
+ device->base.config.natural_scroll = &device->scroll.config_natural;
+}
+
static struct evdev_dispatch *
fallback_dispatch_create(struct libinput_device *device)
{
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;
+ if (evdev_device->scroll.want_button &&
+ evdev_init_button_scroll(evdev_device,
+ evdev_change_scroll_method) == -1) {
+ free(dispatch);
+ return NULL;
+ }
- device->config.sendevents = &dispatch->sendevents.config;
+ if (evdev_device->scroll.natural_scrolling_enabled)
+ evdev_init_natural_scroll(evdev_device);
- 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;
+ evdev_init_calibration(evdev_device, dispatch);
+ evdev_init_sendevents(evdev_device, dispatch);
return dispatch;
}
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++;
+ switch (ratelimit_test(&device->syn_drop_limit)) {
+ case RATELIMIT_PASS:
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);
+ break;
+ case RATELIMIT_THRESHOLD:
+ log_info(libinput, "SYN_DROPPED flood "
+ "from \"%s\"\n",
+ device->devname);
+ break;
+ case RATELIMIT_EXCEEDED:
+ break;
}
/* send one more sync event so we handle all
static void
evdev_tag_device(struct evdev_device *device)
{
- struct udev *udev;
- struct udev_device *udev_device = NULL;
+ if (device->dispatch->interface->tag_device)
+ device->dispatch->interface->tag_device(device,
+ device->udev_device);
+}
- udev = udev_new();
- if (!udev)
- return;
+static inline int
+evdev_read_wheel_click_prop(struct evdev_device *device)
+{
+ struct libinput *libinput = device->base.seat->libinput;
+ const char *prop;
+ int angle = DEFAULT_WHEEL_CLICK_ANGLE;
+
+ prop = udev_device_get_property_value(device->udev_device,
+ "MOUSE_WHEEL_CLICK_ANGLE");
+ if (prop) {
+ angle = parse_mouse_wheel_click_angle_property(prop);
+ if (!angle) {
+ log_error(libinput,
+ "Mouse wheel click angle '%s' is present but invalid,"
+ "using %d degrees instead\n",
+ device->devname,
+ DEFAULT_WHEEL_CLICK_ANGLE);
+ angle = DEFAULT_WHEEL_CLICK_ANGLE;
+ }
+ }
+
+ return angle;
+}
+static inline int
+evdev_read_dpi_prop(struct evdev_device *device)
+{
+ struct libinput *libinput = device->base.seat->libinput;
+ const char *mouse_dpi;
+ int dpi = DEFAULT_MOUSE_DPI;
+
+ mouse_dpi = udev_device_get_property_value(device->udev_device,
+ "MOUSE_DPI");
+ if (mouse_dpi) {
+ dpi = parse_mouse_dpi_property(mouse_dpi);
+ if (!dpi) {
+ log_error(libinput, "Mouse DPI property for '%s' is "
+ "present but invalid, using %d "
+ "DPI instead\n",
+ device->devname,
+ DEFAULT_MOUSE_DPI);
+ dpi = DEFAULT_MOUSE_DPI;
+ }
+ }
+
+ return dpi;
+}
+
+static inline int
+evdev_fix_abs_resolution(struct libevdev *evdev,
+ unsigned int code,
+ const struct input_absinfo *absinfo)
+{
+ struct input_absinfo fixed;
- 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);
+ if (absinfo->resolution == 0) {
+ fixed = *absinfo;
+ fixed.resolution = 1;
+ /* libevdev_set_abs_info() changes the absinfo we already
+ have a pointer to, no need to fetch it again */
+ libevdev_set_abs_info(evdev, code, &fixed);
+ return 1;
+ } else {
+ return 0;
}
- udev_unref(udev);
}
static int
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 active_slot;
int slot;
unsigned int i;
+ const char *devnode = udev_device_get_devnode(device->udev_device);
has_rel = 0;
has_abs = 0;
has_keyboard = 0;
has_touch = 0;
+ for (i = BTN_JOYSTICK; i < BTN_DIGI; i++) {
+ if (libevdev_has_event_code(evdev, EV_KEY, i)) {
+ log_info(libinput,
+ "input device '%s', %s is a joystick, ignoring\n",
+ device->devname, devnode);
+ return -1;
+ }
+ }
+
if (libevdev_has_event_type(evdev, EV_ABS)) {
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);
+ if (evdev_fix_abs_resolution(evdev,
+ ABS_X,
+ absinfo))
device->abs.fake_resolution = 1;
- }
device->abs.absinfo_x = absinfo;
has_abs = 1;
}
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);
+ if (evdev_fix_abs_resolution(evdev,
+ ABS_Y,
+ absinfo))
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 (libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_X) &&
- libevdev_has_event_code(evdev, EV_ABS, ABS_MT_POSITION_Y)) {
+
+ /* Fake MT devices have the ABS_MT_SLOT bit set because of
+ the limited ABS_* range - they aren't MT devices, they
+ just have too many ABS_ axes */
+ if (libevdev_has_event_code(evdev, EV_ABS, ABS_MT_SLOT) &&
+ libevdev_get_num_slots(evdev) == -1) {
+ has_mt = 0;
+ has_touch = 0;
+ } else 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);
+ if (evdev_fix_abs_resolution(evdev,
+ ABS_MT_POSITION_X,
+ absinfo))
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);
+ if (evdev_fix_abs_resolution(evdev,
+ ABS_MT_POSITION_Y,
+ absinfo))
device->abs.fake_resolution = 1;
- }
device->abs.absinfo_y = absinfo;
device->is_mt = 1;
has_touch = 1;
has_mt = 1;
+ /* We only handle the slotted Protocol B in libinput.
+ Devices with ABS_MT_POSITION_* but not ABS_MT_SLOT
+ require mtdev for conversion. */
if (evdev_need_mtdev(device)) {
device->mtdev = mtdev_new_open(device->fd);
if (!device->mtdev)
}
}
- 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;
device->dispatch = evdev_mt_touchpad_create(device);
log_info(libinput,
"input device '%s', %s is a touchpad\n",
- device->devname, device->devnode);
+ device->devname, devnode);
return device->dispatch == NULL ? -1 : 0;
}
log_info(libinput,
"input device '%s', %s is a pointer caps =%s%s%s\n",
- device->devname, device->devnode,
+ device->devname, devnode,
has_abs ? " absolute-motion" : "",
has_rel ? " relative-motion": "",
has_button ? " button" : "");
/* want left-handed config option */
device->buttons.want_left_handed = true;
+ /* want natural-scroll config option */
+ device->scroll.natural_scrolling_enabled = true;
}
+
+ if (has_rel && has_button) {
+ /* want button scrolling config option */
+ device->scroll.want_button = 1;
+ }
+
if (has_keyboard) {
device->seat_caps |= EVDEV_DEVICE_KEYBOARD;
log_info(libinput,
"input device '%s', %s is a keyboard\n",
- device->devname, device->devnode);
+ device->devname, 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);
+ device->devname, devnode);
}
return 0;
notify_added_device(&device->base);
}
+static int
+evdev_device_compare_syspath(struct udev_device *udev_device, int fd)
+{
+ struct udev *udev = udev_device_get_udev(udev_device);
+ struct udev_device *udev_device_new = NULL;
+ struct stat st;
+ int rc = 1;
+
+ if (fstat(fd, &st) < 0)
+ goto out;
+
+ udev_device_new = udev_device_new_from_devnum(udev, 'c', st.st_rdev);
+ if (!udev_device_new)
+ goto out;
+
+ rc = strcmp(udev_device_get_syspath(udev_device_new),
+ udev_device_get_syspath(udev_device));
+out:
+ if (udev_device_new)
+ udev_device_unref(udev_device_new);
+ return rc;
+}
+
struct evdev_device *
evdev_device_create(struct libinput_seat *seat,
- const char *devnode,
- const char *sysname,
- const char *syspath)
+ struct udev_device *udev_device)
{
struct libinput *libinput = seat->libinput;
- struct evdev_device *device;
+ struct evdev_device *device = NULL;
int rc;
int fd;
int unhandled_device = 0;
+ const char *devnode = udev_device_get_devnode(udev_device);
/* Use non-blocking mode so that we can loop on read on
* evdev_device_data() until all events on the fd are
return NULL;
}
+ if (evdev_device_compare_syspath(udev_device, fd) != 0)
+ goto err;
+
device = zalloc(sizeof *device);
if (device == NULL)
- return NULL;
+ goto err;
libinput_device_init(&device->base, seat);
libinput_seat_ref(seat);
device->seat_caps = 0;
device->is_mt = 0;
device->mtdev = NULL;
- device->devnode = strdup(devnode);
- device->sysname = strdup(sysname);
- device->syspath = strdup(syspath);
+ device->udev_device = udev_device_ref(udev_device);
device->rel.dx = 0;
device->rel.dy = 0;
device->abs.seat_slot = -1;
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;
+ device->scroll.wheel_click_angle =
+ evdev_read_wheel_click_prop(device);
+ device->dpi = evdev_read_dpi_prop(device);
+ /* at most 5 SYN_DROPPED log-messages per 30s */
+ ratelimit_init(&device->syn_drop_limit, 30ULL * 1000, 5);
matrix_init_identity(&device->abs.calibration);
matrix_init_identity(&device->abs.usermatrix);
err:
if (fd >= 0)
close_restricted(libinput, fd);
- evdev_device_destroy(device);
+ if (device)
+ evdev_device_destroy(device);
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 0;
-}
-
const char *
evdev_device_get_output(struct evdev_device *device)
{
const char *
evdev_device_get_sysname(struct evdev_device *device)
{
- return device->sysname;
+ return udev_device_get_sysname(device->udev_device);
}
const char *
return libevdev_get_id_vendor(device->evdev);
}
+struct udev_device *
+evdev_device_get_udev_device(struct evdev_device *device)
+{
+ return udev_device_ref(device->udev_device);
+}
+
void
evdev_device_set_default_calibration(struct evdev_device *device,
const float calibration[6])
return 0;
}
+int
+evdev_device_has_button(struct evdev_device *device, uint32_t code)
+{
+ if (!(device->seat_caps & EVDEV_DEVICE_POINTER))
+ return -1;
+
+ return libevdev_has_event_code(device->evdev, EV_KEY, code);
+}
+
+static inline bool
+evdev_is_scrolling(const struct evdev_device *device,
+ enum libinput_pointer_axis axis)
+{
+ assert(axis == LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL ||
+ axis == LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+
+ return (device->scroll.direction & AS_MASK(axis)) != 0;
+}
+
+static inline void
+evdev_start_scrolling(struct evdev_device *device,
+ enum libinput_pointer_axis axis)
+{
+ assert(axis == LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL ||
+ axis == LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+
+ device->scroll.direction |= AS_MASK(axis);
+}
+
void
evdev_post_scroll(struct evdev_device *device,
uint64_t time,
+ enum libinput_pointer_axis_source source,
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);
+ double trigger_horiz, trigger_vert;
+
+ if (!evdev_is_scrolling(device,
+ LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))
+ device->scroll.buildup_vertical += dy;
+ if (!evdev_is_scrolling(device,
+ LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL))
+ device->scroll.buildup_horizontal += dx;
+
+ trigger_vert = device->scroll.buildup_vertical;
+ trigger_horiz = device->scroll.buildup_horizontal;
+
+ /* If we're not scrolling yet, use a distance trigger: moving
+ past a certain distance starts scrolling */
+ if (!evdev_is_scrolling(device,
+ LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL) &&
+ !evdev_is_scrolling(device,
+ LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL)) {
+ if (fabs(trigger_vert) >= device->scroll.threshold)
+ evdev_start_scrolling(device,
+ LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+ if (fabs(trigger_horiz) >= device->scroll.threshold)
+ evdev_start_scrolling(device,
+ LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
+ /* We're already scrolling in one direction. Require some
+ trigger speed to start scrolling in the other direction */
+ } else if (!evdev_is_scrolling(device,
+ LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL)) {
+ if (fabs(dy) >= device->scroll.threshold)
+ evdev_start_scrolling(device,
+ LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+ } else if (!evdev_is_scrolling(device,
+ LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL)) {
+ if (fabs(dx) >= device->scroll.threshold)
+ evdev_start_scrolling(device,
+ LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
}
- 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);
- }
+ /* We use the trigger to enable, but the delta from this event for
+ * the actual scroll movement. Otherwise we get a jump once
+ * scrolling engages */
+ if (!evdev_is_scrolling(device,
+ LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))
+ dy = 0.0;
+ if (!evdev_is_scrolling(device,
+ LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL))
+ dx = 0.0;
+
+ if (dx != 0.0 || dy != 0.0)
+ evdev_notify_axis(device,
+ time,
+ device->scroll.direction,
+ source,
+ dx,
+ dy);
}
void
-evdev_stop_scroll(struct evdev_device *device, uint64_t time)
+evdev_stop_scroll(struct evdev_device *device,
+ uint64_t time,
+ enum libinput_pointer_axis_source source)
{
/* 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))
+ if (device->scroll.direction != 0)
pointer_notify_axis(&device->base,
time,
- LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL,
- 0);
+ device->scroll.direction,
+ source,
+ 0.0, 0.0);
+ device->scroll.buildup_horizontal = 0;
+ device->scroll.buildup_vertical = 0;
device->scroll.direction = 0;
}
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;
+ const char *devnode;
+ struct input_event ev;
+ enum libevdev_read_status status;
if (device->fd != -1)
return 0;
- if (device->syspath == NULL)
+ if (device->was_removed)
return -ENODEV;
- fd = open_restricted(libinput, device->devnode, O_RDWR | O_NONBLOCK);
+ devnode = udev_device_get_devnode(device->udev_device);
+ fd = open_restricted(libinput, devnode, O_RDWR | O_NONBLOCK);
if (fd < 0)
return -errno;
- if (evdev_device_compare_syspath(device, fd)) {
+ if (evdev_device_compare_syspath(device->udev_device, fd)) {
close_restricted(libinput, fd);
return -ENODEV;
}
return -ENODEV;
}
+ libevdev_change_fd(device->evdev, fd);
+ libevdev_set_clock_id(device->evdev, CLOCK_MONOTONIC);
+
+ /* re-sync libevdev's view of the device, but discard the actual
+ events. Our device is in a neutral state already */
+ libevdev_next_event(device->evdev,
+ LIBEVDEV_READ_FLAG_FORCE_SYNC,
+ &ev);
+ do {
+ status = libevdev_next_event(device->evdev,
+ LIBEVDEV_READ_FLAG_SYNC,
+ &ev);
+ } while (status == LIBEVDEV_READ_STATUS_SYNC);
+
device->source =
libinput_add_fd(libinput, fd, evdev_device_dispatch, device);
if (!device->source) {
struct libinput_device *dev;
list_for_each(dev, &device->base.seat->devices_list, link) {
- struct evdev_device *d = (struct evdev_device*)dev;;
+ struct evdev_device *d = (struct evdev_device*)dev;
if (dev == &device->base)
continue;
evdev_device_suspend(device);
- /* A device may be removed while suspended. Free the syspath to
+ if (device->dispatch->interface->remove)
+ device->dispatch->interface->remove(device->dispatch);
+
+ /* A device may be removed while suspended, mark it to
* skip re-opening a different device with the same node */
- free(device->syspath);
- device->syspath = NULL;
+ device->was_removed = true;
list_remove(&device->base.link);
filter_destroy(device->pointer.filter);
libinput_seat_unref(device->base.seat);
libevdev_free(device->evdev);
+ udev_device_unref(device->udev_device);
free(device->mt.slots);
- free(device->devnode);
- free(device->sysname);
- free(device->syspath);
free(device);
}
projects / platform / upstream / libinput.git / blobdiff