circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 14:27:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2016-11-23 18:01:19 +00:00
parent 442e49f51c 6de466cf8b
commit 8a8001350d
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server-client.c
View File

@ -690,6 +690,7 @@ server_client_handle_key(struct client *c, key_code key)
struct key_table *table;
struct key_binding bd_find, *bd;
int xtimeout;
struct cmd_find_state fs;
/* Check the client is good to accept input. */
if (s == NULL || (c->flags & (CLIENT_DEAD|CLIENT_SUSPENDED)) != 0)
@ -802,8 +803,21 @@ retry:
}
server_status_client(c);
/* Find default state if the pane is known. */
cmd_find_clear_state(&fs, NULL, 0);
if (wp != NULL) {
fs.s = s;
fs.wl = fs.s->curw;
fs.w = fs.wl->window;
fs.wp = wp;
cmd_find_log_state(__func__, &fs);
if (!cmd_find_valid_state(&fs))
fatalx("invalid key state");
}
/* Dispatch the key binding. */
key_bindings_dispatch(bd, c, m);
key_bindings_dispatch(bd, c, m, &fs);
key_bindings_unref_table(table);
return;
}