diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2018-10-29 13:42:19 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2018-10-29 14:11:26 +1000 |
| commit | 49b58311590402af346fef176785f9de9b250e44 (patch) | |
| tree | 2fdc70c5ba4655677c94b6741d1ee852efe459c5 | |
| parent | 5fd8c7cdb89aff9de61f9aaf75338e5225feaf9e (diff) | |
| download | libinput-49b58311590402af346fef176785f9de9b250e44.tar.gz | |
evdev: log the wheel click angle setting
Log if we use a non-default click angle setting, makes it easier to debug
this. The condition to add the log was a bit unwieldly to read, so this also
factors out the property names to temporary variables.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/evdev.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/evdev.c b/src/evdev.c index 25bb6e2e..b2b831f2 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1144,21 +1144,23 @@ static inline struct wheel_angle evdev_read_wheel_click_props(struct evdev_device *device) { struct wheel_angle angles; + const char *wheel_count = "MOUSE_WHEEL_CLICK_COUNT"; + const char *wheel_angle = "MOUSE_WHEEL_CLICK_ANGLE"; + const char *hwheel_count = "MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL"; + const char *hwheel_angle = "MOUSE_WHEEL_CLICK_ANGLE_HORIZONTAL"; /* CLICK_COUNT overrides CLICK_ANGLE */ - if (!evdev_read_wheel_click_count_prop(device, - "MOUSE_WHEEL_CLICK_COUNT", - &angles.y)) - evdev_read_wheel_click_prop(device, - "MOUSE_WHEEL_CLICK_ANGLE", - &angles.y); - if (!evdev_read_wheel_click_count_prop(device, - "MOUSE_WHEEL_CLICK_COUNT_HORIZONTAL", - &angles.x)) { - if (!evdev_read_wheel_click_prop(device, - "MOUSE_WHEEL_CLICK_ANGLE_HORIZONTAL", - &angles.x)) - angles.x = angles.y; + if (evdev_read_wheel_click_count_prop(device, wheel_count, &angles.y) || + evdev_read_wheel_click_prop(device, wheel_angle, &angles.y)) { + evdev_log_debug(device, + "wheel: vert click angle: %.2f\n", angles.y); + } + if (evdev_read_wheel_click_count_prop(device, hwheel_count, &angles.x) || + evdev_read_wheel_click_prop(device, hwheel_angle, &angles.x)) { + evdev_log_debug(device, + "wheel: horizontal click angle: %.2f\n", angles.y); + } else { + angles.x = angles.y; } return angles; |