From 6ad90e63236408d4b661050a96d2486854c69cb1 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 15 Sep 2020 18:33:58 +0200 Subject: input: don’t do grid scrollback if mouse events are being captured MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- input.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'input.c') diff --git a/input.c b/input.c index 65dbba0b..0f477acf 100644 --- a/input.c +++ b/input.c @@ -1660,9 +1660,8 @@ mouse_scroll(struct seat *seat, int amount) term_mouse_up( term, button, seat->mouse.row, seat->mouse.col, seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl); - } - - scrollback(term, amount); + } else + scrollback(term, amount); } } -- cgit v1.3 From 028bbd03a3284d60db802631a71ebb1626befa68 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 15 Sep 2020 18:40:51 +0200 Subject: input: don’t do alternate mode scrolling if application is grabbing mouse MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'input.c') diff --git a/input.c b/input.c index 0f477acf..ab15fc46 100644 --- a/input.c +++ b/input.c @@ -1624,7 +1624,8 @@ mouse_scroll(struct seat *seat, int amount) amount = abs(amount); if ((button == BTN_BACK || button == BTN_FORWARD) && - term->grid == &term->alt && term->alt_scrolling) + term->grid == &term->alt && term->alt_scrolling && + term->mouse_tracking == MOUSE_NONE) { /* * alternateScroll/faux scrolling - translate mouse -- cgit v1.3 From cb41db85965698dcf34217f8d26d9163a72a2e70 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 15 Sep 2020 18:44:54 +0200 Subject: input: don’t use stale keycodes for arrow-up/down MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The keycodes will change if the seat’s keymap changes. Make sure we only do alternate scrolling if the seat has a keyboard, and use the *current* layout’s keycodes for arrow up/down (instead of the *first* layout’s). --- input.c | 21 ++++++++++----------- wayland.h | 3 +++ 2 files changed, 13 insertions(+), 11 deletions(-) (limited to 'input.c') diff --git a/input.c b/input.c index ab15fc46..e8c49d5d 100644 --- a/input.c +++ b/input.c @@ -498,6 +498,9 @@ keyboard_keymap(void *data, struct wl_keyboard *wl_keyboard, seat->kbd.mod_ctrl = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, "Control"); seat->kbd.mod_meta = xkb_keymap_mod_get_index(seat->kbd.xkb_keymap, "Mod4"); + seat->kbd.key_arrow_up = xkb_keymap_key_by_name(seat->kbd.xkb_keymap, "UP"); + seat->kbd.key_arrow_down = xkb_keymap_key_by_name(seat->kbd.xkb_keymap, "DOWN"); + /* Compose (dead keys) */ seat->kbd.xkb_compose_table = xkb_compose_table_new_from_locale( seat->kbd.xkb, setlocale(LC_CTYPE, NULL), XKB_COMPOSE_COMPILE_NO_FLAGS); @@ -1623,6 +1626,7 @@ mouse_scroll(struct seat *seat, int amount) amount = abs(amount); + if ((button == BTN_BACK || button == BTN_FORWARD) && term->grid == &term->alt && term->alt_scrolling && term->mouse_tracking == MOUSE_NONE) @@ -1632,19 +1636,14 @@ mouse_scroll(struct seat *seat, int amount) * "back"/"forward" to up/down keys */ - static xkb_keycode_t key_arrow_up = 0; - static xkb_keycode_t key_arrow_down = 0; + if (seat->wl_keyboard != NULL) { + xkb_keycode_t key = button == BTN_BACK + ? seat->kbd.key_arrow_up : seat->kbd.key_arrow_down; - if (key_arrow_up == 0) { - key_arrow_up = xkb_keymap_key_by_name(seat->kbd.xkb_keymap, "UP"); - key_arrow_down = xkb_keymap_key_by_name(seat->kbd.xkb_keymap, "DOWN"); + for (int i = 0; i < amount; i++) + keyboard_key(seat, NULL, seat->kbd.serial, 0, key - 8, XKB_KEY_DOWN); + keyboard_key(seat, NULL, seat->kbd.serial, 0, key - 8, XKB_KEY_UP); } - - xkb_keycode_t key = button == BTN_BACK ? key_arrow_up : key_arrow_down; - - for (int i = 0; i < amount; i++) - keyboard_key(seat, NULL, seat->kbd.serial, 0, key - 8, XKB_KEY_DOWN); - keyboard_key(seat, NULL, seat->kbd.serial, 0, key - 8, XKB_KEY_UP); } else { if (!term_mouse_grabbed(term, seat) && seat->mouse.col >= 0 && seat->mouse.row >= 0) diff --git a/wayland.h b/wayland.h index 430d6b66..7d512ba0 100644 --- a/wayland.h +++ b/wayland.h @@ -149,6 +149,9 @@ struct seat { xkb_mod_index_t mod_ctrl; xkb_mod_index_t mod_meta; + xkb_keycode_t key_arrow_up; + xkb_keycode_t key_arrow_down; + /* Enabled modifiers */ bool shift; bool alt; -- cgit v1.3 From 04c1bab7b0d24028403667d9081ca0081c947ebd Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 15 Sep 2020 18:56:22 +0200 Subject: input: mouse_scroll(): refactor --- input.c | 71 ++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 35 insertions(+), 36 deletions(-) (limited to 'input.c') diff --git a/input.c b/input.c index e8c49d5d..cfa99574 100644 --- a/input.c +++ b/input.c @@ -1613,6 +1613,20 @@ wl_pointer_button(void *data, struct wl_pointer *wl_pointer, } } +static void +alternate_scroll(struct seat *seat, int amount, int button) +{ + if (seat->wl_keyboard == NULL) + return; + + xkb_keycode_t key = button == BTN_BACK + ? seat->kbd.key_arrow_up : seat->kbd.key_arrow_down; + + for (int i = 0; i < amount; i++) + keyboard_key(seat, NULL, seat->kbd.serial, 0, key - 8, XKB_KEY_DOWN); + keyboard_key(seat, NULL, seat->kbd.serial, 0, key - 8, XKB_KEY_UP); +} + static void mouse_scroll(struct seat *seat, int amount) { @@ -1620,48 +1634,33 @@ mouse_scroll(struct seat *seat, int amount) assert(term != NULL); int button = amount < 0 ? BTN_BACK : BTN_FORWARD; - - void (*scrollback)(struct terminal *term, int rows) - = amount < 0 ? &cmd_scrollback_up : &cmd_scrollback_down; - amount = abs(amount); - - if ((button == BTN_BACK || button == BTN_FORWARD) && - term->grid == &term->alt && term->alt_scrolling && - term->mouse_tracking == MOUSE_NONE) - { - /* - * alternateScroll/faux scrolling - translate mouse - * "back"/"forward" to up/down keys - */ - - if (seat->wl_keyboard != NULL) { - xkb_keycode_t key = button == BTN_BACK - ? seat->kbd.key_arrow_up : seat->kbd.key_arrow_down; - - for (int i = 0; i < amount; i++) - keyboard_key(seat, NULL, seat->kbd.serial, 0, key - 8, XKB_KEY_DOWN); - keyboard_key(seat, NULL, seat->kbd.serial, 0, key - 8, XKB_KEY_UP); + if (term->mouse_tracking == MOUSE_NONE) { + if (term->grid == &term->alt) { + if (term->alt_scrolling) + alternate_scroll(seat, amount, button); + } else { + if (button == BTN_BACK) + cmd_scrollback_up(term, amount); + else + cmd_scrollback_down(term, amount); } - } else { - if (!term_mouse_grabbed(term, seat) && - seat->mouse.col >= 0 && seat->mouse.row >= 0) - { - assert(seat->mouse.col < term->cols); - assert(seat->mouse.row < term->rows); - - for (int i = 0; i < amount; i++) { - term_mouse_down( - term, button, seat->mouse.row, seat->mouse.col, - seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl); - } + } else if (!term_mouse_grabbed(term, seat) && + seat->mouse.col >= 0 && seat->mouse.row >= 0) + { + assert(seat->mouse.col < term->cols); + assert(seat->mouse.row < term->rows); - term_mouse_up( + for (int i = 0; i < amount; i++) { + term_mouse_down( term, button, seat->mouse.row, seat->mouse.col, seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl); - } else - scrollback(term, amount); + } + + term_mouse_up( + term, button, seat->mouse.row, seat->mouse.col, + seat->kbd.shift, seat->kbd.alt, seat->kbd.ctrl); } } -- cgit v1.3