circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-12 11:18:48 +00:00
Code Issues Projects Releases Wiki Activity

Make prefix work in all tables (except the prefix table). Users who want

Browse Source 
to avoid this can set prefix to "none" and bind send-prefix
themselves. Allows C-b t be bound in the copy mode tables again, pointed
out by millert@.
This commit is contained in:
nicm 2016-12-07 09:16:13 +00:00
parent 1a6156d8fd
commit a8f3ad4487
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
key-bindings.c
View File

@ -238,6 +238,7 @@ key_bindings_init(void)
"bind -Tcopy-mode C-c send -X cancel", "bind -Tcopy-mode C-c send -X cancel",
"bind -Tcopy-mode C-e send -X end-of-line", "bind -Tcopy-mode C-e send -X end-of-line",
"bind -Tcopy-mode C-f send -X cursor-right", "bind -Tcopy-mode C-f send -X cursor-right",
"bind -Tcopy-mode C-b send -X cursor-left",
"bind -Tcopy-mode C-g send -X clear-selection", "bind -Tcopy-mode C-g send -X clear-selection",
"bind -Tcopy-mode C-k send -X copy-end-of-line", "bind -Tcopy-mode C-k send -X copy-end-of-line",
"bind -Tcopy-mode C-n send -X cursor-down", "bind -Tcopy-mode C-n send -X cursor-down",
@ -300,6 +301,7 @@ key_bindings_init(void)
"bind -Tcopy-mode-vi C-c send -X cancel", "bind -Tcopy-mode-vi C-c send -X cancel",
"bind -Tcopy-mode-vi C-d send -X halfpage-down", "bind -Tcopy-mode-vi C-d send -X halfpage-down",
"bind -Tcopy-mode-vi C-e send -X scroll-down", "bind -Tcopy-mode-vi C-e send -X scroll-down",
"bind -Tcopy-mode-vi C-b send -X page-up",
"bind -Tcopy-mode-vi C-f send -X page-down", "bind -Tcopy-mode-vi C-f send -X page-down",
"bind -Tcopy-mode-vi C-h send -X cursor-left", "bind -Tcopy-mode-vi C-h send -X cursor-left",
"bind -Tcopy-mode-vi C-j send -X copy-selection-and-cancel", "bind -Tcopy-mode-vi C-j send -X copy-selection-and-cancel",

24
server-client.c
View File

@ -782,6 +782,18 @@ retry:
else else
log_debug("key table %s (pane %%%u)", table->name, wp->id); log_debug("key table %s (pane %%%u)", table->name, wp->id);
/*
* 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")) &&
strcmp(table->name, "prefix") != 0) {
server_client_set_key_table(c, "prefix");
server_status_client(c);
return;
}
/* 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 = key; bd_find.key = key;
bd = RB_FIND(key_bindings, &table->key_bindings, &bd_find); bd = RB_FIND(key_bindings, &table->key_bindings, &bd_find);
@ -854,22 +866,12 @@ retry:
/* If no match and we're not in the root table, that's it. */ /* If no match and we're not in the root table, that's it. */
if (name == NULL && !server_client_is_default_key_table(c)) { if (name == NULL && !server_client_is_default_key_table(c)) {
log_debug("no key in key table %s", table->name);
server_client_set_key_table(c, NULL); server_client_set_key_table(c, NULL);
server_status_client(c); server_status_client(c);
return; return;
} }
/*
* No match, but in the root table. Prefix switches to the prefix table
* and everything else is passed through.
*/
if (key == (key_code)options_get_number(s->options, "prefix") ||
key == (key_code)options_get_number(s->options, "prefix2")) {
server_client_set_key_table(c, "prefix");
server_status_client(c);
return;
}
forward: forward:
if (c->flags & CLIENT_READONLY) if (c->flags & CLIENT_READONLY)
return; return;