circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

When a key isn't in the first table, we need to try the same key again 

not the any key. Also rename some labels. Fixes GitHub issue 1406
reeported by Mark Kelly.
This commit is contained in:
nicm 2018-07-17 18:02:40 +00:00
parent 0d88f8a78b
commit 969af935f3
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
server-client.c
View File

@ -884,11 +884,11 @@ server_client_handle_key(struct client *c, key_code key)
/* Forward mouse keys if disabled. */ /* Forward mouse keys if disabled. */
if (KEYC_IS_MOUSE(key) && !options_get_number(s->options, "mouse")) if (KEYC_IS_MOUSE(key) && !options_get_number(s->options, "mouse"))
goto forward; goto forward_key;
/* Treat everything as a regular key when pasting is detected. */ /* Treat everything as a regular key when pasting is detected. */
if (!KEYC_IS_MOUSE(key) && server_client_assume_paste(s)) if (!KEYC_IS_MOUSE(key) && server_client_assume_paste(s))
goto forward; goto forward_key;
/* /*
* Work out the current key table. If the pane is in a mode, use * Work out the current key table. If the pane is in a mode, use
@ -903,12 +903,12 @@ server_client_handle_key(struct client *c, key_code key)
table = c->keytable; table = c->keytable;
first = table; first = table;
table_changed:
/* /*
* The prefix always takes precedence and forces a switch to the prefix * The prefix always takes precedence and forces a switch to the prefix
* table, unless we are already there. * table, unless we are already there.
*/ */
key0 = (key & ~KEYC_XTERM); key0 = (key & ~KEYC_XTERM);
retry:
if ((key0 == (key_code)options_get_number(s->options, "prefix") || if ((key0 == (key_code)options_get_number(s->options, "prefix") ||
key0 == (key_code)options_get_number(s->options, "prefix2")) && key0 == (key_code)options_get_number(s->options, "prefix2")) &&
strcmp(table->name, "prefix") != 0) { strcmp(table->name, "prefix") != 0) {
@ -926,6 +926,7 @@ retry:
if (c->flags & CLIENT_REPEAT) if (c->flags & CLIENT_REPEAT)
log_debug("currently repeating"); log_debug("currently repeating");
try_again:
/* Try to see if there is a key binding in the current table. */ /* Try to see if there is a key binding in the current table. */
bd_find.key = key0; bd_find.key = key0;
bd = RB_FIND(key_bindings, &table->key_bindings, &bd_find); bd = RB_FIND(key_bindings, &table->key_bindings, &bd_find);
@ -941,7 +942,7 @@ retry:
c->flags &= ~CLIENT_REPEAT; c->flags &= ~CLIENT_REPEAT;
server_status_client(c); server_status_client(c);
table = c->keytable; table = c->keytable;
goto retry; goto table_changed;
} }
log_debug("found in key table %s", table->name); log_debug("found in key table %s", table->name);
@ -975,22 +976,26 @@ retry:
return; return;
} }
/*
* No match, try the ANY key.
*/
if (key0 != KEYC_ANY) {
key0 = KEYC_ANY;
goto try_again;
}
/* /*
* No match in this table. If not in the root table or if repeating, * No match in this table. If not in the root table or if repeating,
* switch the client back to the root table and try again. * switch the client back to the root table and try again.
*/ */
log_debug("not found in key table %s", table->name); 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) || if (!server_client_is_default_key_table(c, table) ||
(c->flags & CLIENT_REPEAT)) { (c->flags & CLIENT_REPEAT)) {
server_client_set_key_table(c, NULL); server_client_set_key_table(c, NULL);
c->flags &= ~CLIENT_REPEAT; c->flags &= ~CLIENT_REPEAT;
server_status_client(c); server_status_client(c);
table = c->keytable; table = c->keytable;
goto retry; goto table_changed;
} }
/* /*
@ -1003,7 +1008,7 @@ retry:
return; return;
} }
forward: forward_key:
if (c->flags & CLIENT_READONLY) if (c->flags & CLIENT_READONLY)
return; return;
if (wp != NULL) if (wp != NULL)