From a7e2e4bfa92ab26fab129f0945ef71875c2a1213 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Fri, 4 Jun 2021 23:25:45 +0200 Subject: input: pass through scrollback-* key bindings when alt screen is activw Since the alt screen have no scrollback, all scrollback-* actions are effectively no-ops when the alt screen is active. Make them available to the client application instead. Closes #573 --- input.c | 45 +++++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 12 deletions(-) (limited to 'input.c') diff --git a/input.c b/input.c index 96c41a15..707c23f1 100644 --- a/input.c +++ b/input.c @@ -88,28 +88,46 @@ execute_binding(struct seat *seat, struct terminal *term, return true; case BIND_ACTION_SCROLLBACK_UP_PAGE: - cmd_scrollback_up(term, term->rows); - return true; + if (term->grid == &term->normal) { + cmd_scrollback_up(term, term->rows); + return true; + } + break; case BIND_ACTION_SCROLLBACK_UP_HALF_PAGE: - cmd_scrollback_up(term, max(term->rows / 2, 1)); - return true; + if (term->grid == &term->normal) { + cmd_scrollback_up(term, max(term->rows / 2, 1)); + return true; + } + break; case BIND_ACTION_SCROLLBACK_UP_LINE: - cmd_scrollback_up(term, 1); - return true; + if (term->grid == &term->normal) { + cmd_scrollback_up(term, 1); + return true; + } + break; case BIND_ACTION_SCROLLBACK_DOWN_PAGE: - cmd_scrollback_down(term, term->rows); - return true; + if (term->grid == &term->normal) { + cmd_scrollback_down(term, term->rows); + return true; + } + break; case BIND_ACTION_SCROLLBACK_DOWN_HALF_PAGE: - cmd_scrollback_down(term, max(term->rows / 2, 1)); - return true; + if (term->grid == &term->normal) { + cmd_scrollback_down(term, max(term->rows / 2, 1)); + return true; + } + break; case BIND_ACTION_SCROLLBACK_DOWN_LINE: - cmd_scrollback_down(term, 1); - return true; + if (term->grid == &term->normal) { + cmd_scrollback_down(term, 1); + return true; + } + break; case BIND_ACTION_CLIPBOARD_COPY: selection_to_clipboard(seat, term, serial); @@ -165,6 +183,9 @@ execute_binding(struct seat *seat, struct terminal *term, return true; case BIND_ACTION_PIPE_SCROLLBACK: + if (term->grid == &term->alt) + break; + /* FALLTHROUGH */ case BIND_ACTION_PIPE_VIEW: case BIND_ACTION_PIPE_SELECTED: { if (pipe_argv == NULL) -- cgit v1.3