diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-06-13 13:48:37 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-06-13 13:48:37 +0100 |
| commit | 154c95d0c97172d1a23c469451e9cacad4b98b90 (patch) | |
| tree | e762e66f1a86be12b07dc6f21364e9c4faf05c0f | |
| parent | a073d11c3e05af2b691e89aae1101f1a0904f9b3 (diff) | |
| parent | ac7080b31b7d470467bd756d83c4803d6e0c3230 (diff) | |
Merge branch 'obsd-master'
| -rw-r--r-- | server-client.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/server-client.c b/server-client.c index d0ba617f..1fd6eb6c 100644 --- a/server-client.c +++ b/server-client.c @@ -816,6 +816,7 @@ server_client_handle_key(struct client *c, key_code key) struct key_binding bd_find, *bd; int xtimeout, flags; struct cmd_find_state fs; + key_code key0; /* Check the client is good to accept input. */ if (s == NULL || (c->flags & (CLIENT_DEAD|CLIENT_SUSPENDED)) != 0) @@ -904,8 +905,9 @@ 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. */ - if ((key == (key_code)options_get_number(s->options, "prefix") || - key == (key_code)options_get_number(s->options, "prefix2")) && + key0 = (key & ~KEYC_XTERM); + if ((key0 == (key_code)options_get_number(s->options, "prefix") || + key0 == (key_code)options_get_number(s->options, "prefix2")) && strcmp(table->name, "prefix") != 0) { server_client_set_key_table(c, "prefix"); server_status_client(c); @@ -923,7 +925,7 @@ retry: log_debug("currently repeating"); /* Try to see if there is a key binding in the current table. */ - bd_find.key = (key & ~KEYC_XTERM); + bd_find.key = key0; bd = RB_FIND(key_bindings, &table->key_bindings, &bd_find); if (bd != NULL) { /* |