From eb048529b52aed94ba5ab307222aa91a82542f82 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 13 Nov 2017 14:27:24 +1000 Subject: [PATCH] evdev: fix axis mixup for the wheel click angles vertical wheel is y, not x Signed-off-by: Peter Hutterer --- src/evdev-fallback.c | 4 ++-- src/evdev.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/evdev-fallback.c b/src/evdev-fallback.c index 4da07e7d..1482b4e2 100644 --- a/src/evdev-fallback.c +++ b/src/evdev-fallback.c @@ -1060,7 +1060,7 @@ fallback_process_relative(struct fallback_dispatch *dispatch, case REL_WHEEL: fallback_flush_pending_event(dispatch, device, time); wheel_degrees.y = -1 * e->value * - device->scroll.wheel_click_angle.x; + device->scroll.wheel_click_angle.y; discrete.y = -1 * e->value; source = device->scroll.is_tilt.vertical ? @@ -1078,7 +1078,7 @@ fallback_process_relative(struct fallback_dispatch *dispatch, case REL_HWHEEL: fallback_flush_pending_event(dispatch, device, time); wheel_degrees.x = e->value * - device->scroll.wheel_click_angle.y; + device->scroll.wheel_click_angle.x; discrete.x = e->value; source = device->scroll.is_tilt.horizontal ? diff --git a/src/evdev.c b/src/evdev.c index 17303096..28b7b44d 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1126,17 +1126,17 @@ evdev_read_wheel_click_props(struct evdev_device *device) /* CLICK_COUNT overrides CLICK_ANGLE */ if (!evdev_read_wheel_click_count_prop(device, "MOUSE_WHEEL_CLICK_COUNT", - &angles.x)) + &angles.y)) evdev_read_wheel_click_prop(device, "MOUSE_WHEEL_CLICK_ANGLE", - &angles.x); + &angles.y); if (!evdev_read_wheel_click_count_prop(device, "MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL", - &angles.y)) { + &angles.x)) { if (!evdev_read_wheel_click_prop(device, "MOUSE_WHEEL_CLICK_ANGLE_HORIZONTAL", - &angles.y)) - angles.y = angles.x; + &angles.x)) + angles.x = angles.y; } return angles;