diff options
| author | nicm <nicm> | 2016-10-16 19:04:05 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2016-10-16 19:04:05 +0000 |
| commit | b342bd0b462f69a9fc9a59d52bcd4bb34b57114f (patch) | |
| tree | 2da71181e3b540b8b52422cb598682f1505c2e89 /cmd-respawn-window.c | |
| parent | ddc4512d2e0eda6c705e002cb5dbf80719d709e1 (diff) | |
Mass rename struct cmd_q to struct cmdq_item and related.
Diffstat (limited to 'cmd-respawn-window.c')
| -rw-r--r-- | cmd-respawn-window.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/cmd-respawn-window.c b/cmd-respawn-window.c index 42f7db19..92ba6299 100644 --- a/cmd-respawn-window.c +++ b/cmd-respawn-window.c @@ -27,7 +27,8 @@ * Respawn a window (restart the command). Kill existing if -k given. */ -static enum cmd_retval cmd_respawn_window_exec(struct cmd *, struct cmd_q *); +static enum cmd_retval cmd_respawn_window_exec(struct cmd *, + struct cmdq_item *); const struct cmd_entry cmd_respawn_window_entry = { .name = "respawn-window", @@ -43,11 +44,11 @@ const struct cmd_entry cmd_respawn_window_entry = { }; static enum cmd_retval -cmd_respawn_window_exec(struct cmd *self, struct cmd_q *cmdq) +cmd_respawn_window_exec(struct cmd *self, struct cmdq_item *item) { struct args *args = self->args; - struct session *s = cmdq->state.tflag.s; - struct winlink *wl = cmdq->state.tflag.wl; + struct session *s = item->state.tflag.s; + struct winlink *wl = item->state.tflag.wl; struct window *w = wl->window; struct window_pane *wp; struct environ *env; @@ -59,7 +60,7 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_q *cmdq) TAILQ_FOREACH(wp, &w->panes, entry) { if (wp->fd == -1) continue; - cmdq_error(cmdq, "window still active: %s:%d", s->name, + cmdq_error(item, "window still active: %s:%d", s->name, wl->idx); return (CMD_RETURN_ERROR); } @@ -78,8 +79,8 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_q *cmdq) window_pane_resize(wp, w->sx, w->sy); path = NULL; - if (cmdq->client != NULL && cmdq->client->session == NULL) - envent = environ_find(cmdq->client->environ, "PATH"); + if (item->client != NULL && item->client->session == NULL) + envent = environ_find(item->client->environ, "PATH"); else envent = environ_find(s->environ, "PATH"); if (envent != NULL) @@ -87,7 +88,7 @@ cmd_respawn_window_exec(struct cmd *self, struct cmd_q *cmdq) if (window_pane_spawn(wp, args->argc, args->argv, path, NULL, NULL, env, s->tio, &cause) != 0) { - cmdq_error(cmdq, "respawn window failed: %s", cause); + cmdq_error(item, "respawn window failed: %s", cause); free(cause); environ_free(env); server_destroy_pane(wp, 0); |