diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-11-23 18:01:19 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-11-23 18:01:19 +0000 |
| commit | 8a8001350db320f6c8adfef161f96d0abb67e2b4 (patch) | |
| tree | 315159db7eb6665c32d0bed155222ae627c80b44 /server-client.c | |
| parent | 442e49f51c07a1fc508c6889d77065b8b4894893 (diff) | |
| parent | 6de466cf8b665d8725301307c57f6d8cb2e65a3f (diff) | |
| download | rtmux-8a8001350db320f6c8adfef161f96d0abb67e2b4.tar.gz rtmux-8a8001350db320f6c8adfef161f96d0abb67e2b4.tar.bz2 rtmux-8a8001350db320f6c8adfef161f96d0abb67e2b4.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/server-client.c b/server-client.c index ea63a979..6030d504 100644 --- a/server-client.c +++ b/server-client.c @@ -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; } |