fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-02-03 20:30:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

evdev: fix axis mixup for the wheel click angles

Browse source 
vertical wheel is y, not x

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2017-11-13 14:27:24 +10:00
parent dc7fb65db5
commit eb048529b5
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/evdev-fallback.c
View file

@ -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 ?

10
src/evdev.c
View file

@ -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;