aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornicm <nicm>2019-06-26 18:28:31 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2019-06-27 15:49:43 +0100
commit5a501a8ae27c2d0128870caa48c5708e97528567 (patch)
tree27eebb43504513c28baaf75cf77d8061eb1ce71d
parent797042584e2a0b6208aafa3276a08588120a4ba4 (diff)
downloadrtmux-5a501a8ae27c2d0128870caa48c5708e97528567.tar.gz
rtmux-5a501a8ae27c2d0128870caa48c5708e97528567.tar.bz2
rtmux-5a501a8ae27c2d0128870caa48c5708e97528567.zip
Pass keys that aren't 0-9 on to normal key processing when display-panes
is active (restores previous behaviour).
-rw-r--r--cmd-display-panes.c2
-rw-r--r--server-client.c8
2 files changed, 7 insertions, 3 deletions
diff --git a/cmd-display-panes.c b/cmd-display-panes.c
index aeeb6936..7f38cd9e 100644
--- a/cmd-display-panes.c
+++ b/cmd-display-panes.c
@@ -204,7 +204,7 @@ cmd_display_panes_key(struct client *c, struct key_event *event)
struct cmd_parse_result *pr;
if (event->key < '0' || event->key > '9')
- return (1);
+ return (-1);
wp = window_pane_at_index(w, event->key - '0');
if (wp == NULL)
diff --git a/server-client.c b/server-client.c
index 7381eb52..0d0d561c 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1218,9 +1218,13 @@ server_client_handle_key(struct client *c, struct key_event *event)
* blocked so they need to be processed immediately rather than queued.
*/
if ((~c->flags & CLIENT_READONLY) && c->overlay_key != NULL) {
- if (c->overlay_key(c, event) != 0)
+ switch (c->overlay_key(c, event)) {
+ case 0:
+ return (0);
+ case 1:
server_client_clear_overlay(c);
- return (0);
+ return (0);
+ }
}
/*