diff options
Diffstat (limited to 'usr.bin/tmux/cmd-choose-client.c')
| -rw-r--r-- | usr.bin/tmux/cmd-choose-client.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/usr.bin/tmux/cmd-choose-client.c b/usr.bin/tmux/cmd-choose-client.c index dc58e0cfb4b..9d045818160 100644 --- a/usr.bin/tmux/cmd-choose-client.c +++ b/usr.bin/tmux/cmd-choose-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-choose-client.c,v 1.30 2016/10/10 21:51:39 nicm Exp $ */ +/* $OpenBSD: cmd-choose-client.c,v 1.31 2016/10/16 19:04:05 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -33,7 +33,8 @@ "#{?client_utf8, (utf8),}#{?client_readonly, (ro),} " \ "(last used #{t:client_activity})" -static enum cmd_retval cmd_choose_client_exec(struct cmd *, struct cmd_q *); +static enum cmd_retval cmd_choose_client_exec(struct cmd *, + struct cmdq_item *); static void cmd_choose_client_callback(struct window_choose_data *); @@ -55,19 +56,19 @@ struct cmd_choose_client_data { }; static enum cmd_retval -cmd_choose_client_exec(struct cmd *self, struct cmd_q *cmdq) +cmd_choose_client_exec(struct cmd *self, struct cmdq_item *item) { struct args *args = self->args; - struct client *c = cmdq->state.c; + struct client *c = item->state.c; struct client *c1; struct window_choose_data *cdata; - struct winlink *wl = cmdq->state.tflag.wl; + struct winlink *wl = item->state.tflag.wl; const char *template; char *action; u_int idx, cur; if (c == NULL) { - cmdq_error(cmdq, "no client available"); + cmdq_error(item, "no client available"); return (CMD_RETURN_ERROR); } @@ -86,7 +87,7 @@ cmd_choose_client_exec(struct cmd *self, struct cmd_q *cmdq) TAILQ_FOREACH(c1, &clients, entry) { if (c1->session == NULL || c1->tty.path == NULL) continue; - if (c1 == cmdq->client) + if (c1 == item->client) cur = idx; cdata = window_choose_data_create(TREE_OTHER, c, c->session); |