diff options
| author | Thomas Adam <thomas@xteddy.org> | 2018-07-16 11:02:25 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2018-07-16 11:02:25 +0100 |
| commit | 4f04b2094ca0011277d23369cf03870227c6afc1 (patch) | |
| tree | 8b260c74c58a0d6482594a687d9486a254fe0060 /server-client.c | |
| parent | 6de991d855e66e341ca30d9a40a65f3f2c905984 (diff) | |
| parent | 0d88f8a78bc0d91ab6fa53c9109f7316bfe5ffbb (diff) | |
| download | rtmux-4f04b2094ca0011277d23369cf03870227c6afc1.tar.gz rtmux-4f04b2094ca0011277d23369cf03870227c6afc1.tar.bz2 rtmux-4f04b2094ca0011277d23369cf03870227c6afc1.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/server-client.c b/server-client.c index 94a024b0..a20ae7cc 100644 --- a/server-client.c +++ b/server-client.c @@ -905,8 +905,8 @@ server_client_handle_key(struct client *c, key_code key) * The prefix always takes precedence and forces a switch to the prefix * table, unless we are already there. */ -retry: key0 = (key & ~KEYC_XTERM); +retry: if ((key0 == (key_code)options_get_number(s->options, "prefix") || key0 == (key_code)options_get_number(s->options, "prefix2")) && strcmp(table->name, "prefix") != 0) { @@ -978,6 +978,10 @@ retry: * switch the client back to the root table and try again. */ log_debug("not found in key table %s", table->name); + if (key0 != KEYC_ANY) { + key0 = KEYC_ANY; + goto retry; + } if (!server_client_is_default_key_table(c, table) || (c->flags & CLIENT_REPEAT)) { server_client_set_key_table(c, NULL); |