summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicm <nicm>2019-06-26 18:28:31 +0000
committernicm <nicm>2019-06-26 18:28:31 +0000
commit87ea14328ce60fdfb8bd0aef15b7e3b3bdccb1ed (patch)
tree267f525e99deefb03e62e9828236787b770bfe61
parentc599ad63f8857bd74e85150e60339fd2efbb9650 (diff)
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 aa665f08..df97819c 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 e4862d84..a982fe8e 100644
--- a/server-client.c
+++ b/server-client.c
@@ -1220,9 +1220,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);
+ }
}
/*