diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-10-25 17:39:46 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-10-27 15:09:26 +0000 |
| commit | 0900d01ec9fce2e64384ef27111fe1a4d9d45068 (patch) | |
| tree | b4deeb6048a15d72b9b70def7a7765cedec28b0e /input.c | |
| parent | Merge branch 'noop-key-binding' (diff) | |
input: clean up mouse scroll handling
* Allow scrolling on the normal (non-alt) screen, when application is
grabbing the mouse (when user presses Shift).
* Use term_mouse_grabbed() instead of explicitly checking for
MOUSE_NONE tracking.
* Remove mouse tracking check from cmd_scrollback_{up,down}. Caller is
expected to have done the check.
* Don’t scroll down on mouse wheel tilt events.
Diffstat (limited to 'input.c')
| -rw-r--r-- | input.c | 29 |
1 files changed, 21 insertions, 8 deletions
@@ -2091,6 +2091,8 @@ alternate_scroll(struct seat *seat, int amount, int button) xassert(seat->mouse_focus != NULL); struct terminal *term = seat->mouse_focus; + assert(button == BTN_BACK || button == BTN_FORWARD); + xkb_keycode_t key = button == BTN_BACK ? seat->kbd.key_arrow_up : seat->kbd.key_arrow_down; @@ -2110,19 +2112,30 @@ mouse_scroll(struct seat *seat, int amount, enum wl_pointer_axis axis) : amount < 0 ? BTN_WHEEL_LEFT : BTN_WHEEL_RIGHT; amount = abs(amount); - if (term->mouse_tracking == MOUSE_NONE) { + if (term_mouse_grabbed(term, seat)) { if (term->grid == &term->alt) { - if (term->alt_scrolling) - alternate_scroll(seat, amount, button); + if (term->alt_scrolling) { + switch (button) { + case BTN_BACK: + case BTN_FORWARD: + alternate_scroll(seat, amount, button); + break; + } + } } else { - if (button == BTN_BACK) + switch (button) { + case BTN_BACK: cmd_scrollback_up(term, amount); - else + break; + + case BTN_FORWARD: cmd_scrollback_down(term, amount); + break; + } } - } else if (!term_mouse_grabbed(term, seat) && - seat->mouse.col >= 0 && seat->mouse.row >= 0) - { + } + + else if (seat->mouse.col >= 0 && seat->mouse.row >= 0) { xassert(seat->mouse.col < term->cols); xassert(seat->mouse.row < term->rows); |
