aboutsummaryrefslogtreecommitdiff
path: root/server-client.c
diff options
context:
space:
mode:
Diffstat (limited to 'server-client.c')
-rw-r--r--server-client.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/server-client.c b/server-client.c
index cec305f0..c81edcc7 100644
--- a/server-client.c
+++ b/server-client.c
@@ -907,8 +907,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) {
@@ -980,6 +980,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);