diff options
| author | James Ross-Gowan <rossy@jrg.systems> | 2017-09-03 00:00:52 +1000 |
|---|---|---|
| committer | James Ross-Gowan <rossy@jrg.systems> | 2017-09-03 20:31:44 +1000 |
| commit | 7897f79217af1e04e6e65bd72e938058e84c451a (patch) | |
| tree | 0a0a6434ddcf5f97b3eebfd159d01647ee1f3ffa /etc | |
| parent | 8fe4aa94ee7e5400450c124397c8edabfd6d726b (diff) | |
| download | mpv-7897f79217af1e04e6e65bd72e938058e84c451a.tar.bz2 mpv-7897f79217af1e04e6e65bd72e938058e84c451a.tar.xz | |
input: merge mouse wheel and axis keycodes
Mouse wheel bindings have always been a cause of user confusion.
Previously, on Wayland and macOS, precise touchpads would generate AXIS
keycodes and notched mouse wheels would generate mouse button keycodes.
On Windows, both types of device would generate AXIS keycodes and on
X11, both types of device would generate mouse button keycodes. This
made it pretty difficult for users to modify their mouse-wheel bindings,
since it differed between platforms and in some cases, between devices.
To make it more confusing, the keycodes used on Windows were changed in
18a45a42d524 without a deprecation period or adequate communication to
users.
This change aims to make mouse wheel binds less confusing. Both the
mouse button and AXIS keycodes are now deprecated aliases of the new
WHEEL keycodes. This will technically break input configs on Wayland and
macOS that assign different commands to precise and non-precise scroll
events, but this is probably uncommon (if anyone does it at all) and I
think it's a fair tradeoff for finally fixing mouse wheel-related
confusion on other platforms.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/input.conf | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/etc/input.conf b/etc/input.conf index 172736cd32..b58d32a3eb 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -31,18 +31,14 @@ #MBTN_LEFT ignore # don't do anything #MBTN_LEFT_DBL cycle fullscreen # toggle fullscreen on/off #MBTN_RIGHT cycle pause # toggle pause on/off -#WHEEL_UP seek 10 -#WHEEL_DOWN seek -10 -#WHEEL_LEFT add volume -2 -#WHEEL_RIGHT add volume 2 # Mouse wheels, touchpad or other input devices that have axes # if the input devices supports precise scrolling it will also scale the # numeric value accordingly -#AXIS_UP seek 10 -#AXIS_DOWN seek -10 -#AXIS_LEFT seek 5 -#AXIS_RIGHT seek -5 +#WHEEL_UP seek 10 +#WHEEL_DOWN seek -10 +#WHEEL_LEFT add volume -2 +#WHEEL_RIGHT add volume 2 ## Seek units are in seconds, but note that these are limited by keyframes #RIGHT seek 5 |