aboutsummaryrefslogtreecommitdiff
path: root/terminal.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2024-07-13 08:24:11 +0000
committerDaniel Eklöf <daniel@ekloef.se>2024-07-13 08:41:10 +0000
commit1136108c9780eae9fae252a1bca5089f19fcd57d (patch)
tree89cc11fabcbb5096fe4117266aa6bc0eedda61fa /terminal.c
parentchangelog: remove entry for change that hasn't yet been merged (diff)
input: don't map wheel events to BTN_{BACK,FORWARD}
BTN_BACK and BTN_FORWARD are separate buttons. The scroll wheel don't have any button mappings in libinput/wayland, so make up our own defines. This allows us to map them in mouse bindings. Also expose BTN_WHEEL_{LEFT,RIGHT}. These were already defined, and used, internally, to handle wheel tilt events. With this, they can also be used in mouse bindings. Finally, fix encoding used for BTN_{BACK,FORWARD} when sending mouse button events to the client application. Before this, they were mapped to buttons 4/5. But, button 4/5 are for the scroll wheel, and as mentioned above, BTN_{BACK,FORWARD} are not the same as scroll wheel "buttons". Closes #1763
Diffstat (limited to 'terminal.c')
-rw-r--r--terminal.c26
1 files changed, 16 insertions, 10 deletions
diff --git a/terminal.c b/terminal.c
index d08bb74d..6e83d9a0 100644
--- a/terminal.c
+++ b/terminal.c
@@ -3192,17 +3192,23 @@ term_kbd_focus_out(struct terminal *term)
static int
linux_mouse_button_to_x(int button)
{
+ /* Note: on X11, scroll events where reported as buttons. Not so
+ * on Wayland. We manually map scroll events to custom "button"
+ * defines (BTN_WHEEL_*).
+ */
switch (button) {
- case BTN_LEFT: return 1;
- case BTN_MIDDLE: return 2;
- case BTN_RIGHT: return 3;
- case BTN_BACK: return 4;
- case BTN_FORWARD: return 5;
- case BTN_WHEEL_LEFT: return 6; /* Foot custom define */
- case BTN_WHEEL_RIGHT: return 7; /* Foot custom define */
- case BTN_SIDE: return 8;
- case BTN_EXTRA: return 9;
- case BTN_TASK: return -1; /* TODO: ??? */
+ case BTN_LEFT: return 1;
+ case BTN_MIDDLE: return 2;
+ case BTN_RIGHT: return 3;
+ case BTN_WHEEL_BACK: return 4; /* Foot custom define */
+ case BTN_WHEEL_FORWARD: return 5; /* Foot custom define */
+ case BTN_WHEEL_LEFT: return 6; /* Foot custom define */
+ case BTN_WHEEL_RIGHT: return 7; /* Foot custom define */
+ case BTN_SIDE: return 8;
+ case BTN_EXTRA: return 9;
+ case BTN_FORWARD: return 10;
+ case BTN_BACK: return 11;
+ case BTN_TASK: return 12; /* Guessing... */
default:
LOG_WARN("unrecognized mouse button: %d (0x%x)", button, button);