diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2007-11-16 21:12:31 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2007-11-16 21:12:31 +0000 |
| commit | b359f9b594ccd945a245e429469d3c53fb6bf859 (patch) | |
| tree | 56ea1db5c03062736f52775f4c45e16f51339eb0 /key-bindings.c | |
| parent | 86b73cec72fc178cc612a60af2ac1d0aff3c10c5 (diff) | |
Add -c option to specify client, and move detach/refresh to client rather than session.
Diffstat (limited to 'key-bindings.c')
| -rw-r--r-- | key-bindings.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/key-bindings.c b/key-bindings.c index 72b89c9a..23d4c869 100644 --- a/key-bindings.c +++ b/key-bindings.c @@ -1,4 +1,4 @@ -/* $Id: key-bindings.c,v 1.12 2007-10-26 12:29:07 nicm Exp $ */ +/* $Id: key-bindings.c,v 1.13 2007-11-16 21:12:31 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -79,8 +79,8 @@ key_bindings_init(void) const struct cmd_entry *entry; void (*fn)(void **, int); } table[] = { - { 'D', &cmd_detach_session_entry, NULL }, - { 'd', &cmd_detach_session_entry, NULL }, + { 'D', &cmd_detach_client_entry, NULL }, + { 'd', &cmd_detach_client_entry, NULL }, { 'S', &cmd_list_sessions_entry, NULL }, { 's', &cmd_list_sessions_entry, NULL }, { 'W', &cmd_list_windows_entry, NULL }, @@ -105,15 +105,10 @@ key_bindings_init(void) { '7', &cmd_select_window_entry, cmd_select_window_default }, { '8', &cmd_select_window_entry, cmd_select_window_default }, { '9', &cmd_select_window_entry, cmd_select_window_default }, - { 'R', &cmd_refresh_session_entry, NULL }, - { 'r', &cmd_refresh_session_entry, NULL }, + { 'R', &cmd_refresh_client_entry, NULL }, + { 'r', &cmd_refresh_client_entry, NULL }, { '&', &cmd_kill_window_entry, NULL }, { META, &cmd_send_prefix_entry, NULL }, -/* - { 'I', &cmd_windo_info_entry }, - { 'i', &cmd_window_info_entry }, - { META, &cmd_meta_entry_entry }, -*/ }; u_int i; struct cmd *cmd; @@ -164,7 +159,7 @@ key_bindings_error(struct cmd_ctx *ctx, const char *fmt, ...) void key_bindings_print(struct cmd_ctx *ctx, const char *fmt, ...) { - struct client *c = ctx->client; + struct client *c = ctx->cmdclient; struct hdr hdr; va_list ap; char *msg; @@ -219,11 +214,12 @@ key_bindings_dispatch(int key, struct client *c) return; ctx.session = c->session; + ctx.client = c; ctx.error = key_bindings_error; ctx.print = key_bindings_print; - ctx.client = c; + ctx.cmdclient = NULL; ctx.flags = CMD_KEY; cmd_exec(bd->cmd, &ctx); |