summaryrefslogtreecommitdiffstats
path: root/input/input.c
diff options
context:
space:
mode:
authorJames Ross-Gowan <rossy@jrg.systems>2017-08-08 21:34:38 +1000
committerJames Ross-Gowan <rossy@jrg.systems>2017-09-03 20:31:44 +1000
commit957e9a37db6611fe0879bd2097131df5e09afd47 (patch)
treeb346371417acd0476a60e2c1ecde20c8548d14ba /input/input.c
parent449d9725c91af467b154817dfd0603d80ba7f00b (diff)
downloadmpv-957e9a37db6611fe0879bd2097131df5e09afd47.tar.bz2
mpv-957e9a37db6611fe0879bd2097131df5e09afd47.tar.xz
input: use mnemonic names for mouse buttons
mpv's mouse button numbering is based on X11 button numbering, which allows for an arbitrary number of buttons and includes mouse wheel input as buttons 3-6. This button numbering was used throughout the codebase and exposed in input.conf, and it was difficult to remember which physical button each number actually referred to and which referred to the scroll wheel. In practice, PC mice only have between two and five buttons and one or two scroll wheel axes, which are more or less in the same location and have more or less the same function. This allows us to use names to refer to the buttons instead of numbers, which makes input.conf syntax a lot easier to remember. It also makes the syntax robust to changes in mpv's underlying numbering. The old MOUSE_BTNx names are still understood as deprecated aliases of the named buttons. This changes both the input.conf syntax and the MP_MOUSE_BTNx symbols in the codebase, since I think both would benefit from using names over numbers, especially since some platforms don't use X11 button numbering and handle different mouse buttons in different windowing system events. This also makes the names shorter, since otherwise they would be pretty long, and it removes the high-numbered MOUSE_BTNx_DBL names, since they weren't used. Names are the same as used in Qt: https://doc.qt.io/qt-5/qt.html#MouseButton-enum
Diffstat (limited to 'input/input.c')
-rw-r--r--input/input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/input/input.c b/input/input.c
index ed7c1ec160..88527b5974 100644
--- a/input/input.c
+++ b/input/input.c
@@ -732,8 +732,8 @@ static void mp_input_feed_key(struct input_ctx *ictx, int code, double scale,
if (ictx->last_doubleclick_key_down == code &&
now - ictx->last_doubleclick_time < opts->doubleclick_time / 1000.0)
{
- if (code >= MP_MOUSE_BTN0 && code <= MP_MOUSE_BTN2) {
- interpret_key(ictx, code - MP_MOUSE_BTN0 + MP_MOUSE_BTN0_DBL,
+ if (code >= MP_MBTN_LEFT && code <= MP_MBTN_RIGHT) {
+ interpret_key(ictx, code - MP_MOUSE_BASE + MP_MOUSE_DBL_BASE,
1, 1);
}
}