diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-10-16 22:01:14 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-10-16 22:01:14 +0100 |
| commit | 1a6e696b08113ca17ee8e881844167cf94276846 (patch) | |
| tree | 60ecdd8c9e51bff46624e48d9373686b858d2fb1 /cmd-move-window.c | |
| parent | d401340c516131ae8e07bfb978b670347486d077 (diff) | |
| parent | d15d54c2c8e6b95695169442eb2a27d814efc078 (diff) | |
| download | rtmux-1a6e696b08113ca17ee8e881844167cf94276846.tar.gz rtmux-1a6e696b08113ca17ee8e881844167cf94276846.tar.bz2 rtmux-1a6e696b08113ca17ee8e881844167cf94276846.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-move-window.c')
| -rw-r--r-- | cmd-move-window.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cmd-move-window.c b/cmd-move-window.c index 1d423646..7f5cb74a 100644 --- a/cmd-move-window.c +++ b/cmd-move-window.c @@ -26,7 +26,7 @@ * Move a window. */ -static enum cmd_retval cmd_move_window_exec(struct cmd *, struct cmd_q *); +static enum cmd_retval cmd_move_window_exec(struct cmd *, struct cmdq_item *); const struct cmd_entry cmd_move_window_entry = { .name = "move-window", @@ -57,14 +57,14 @@ const struct cmd_entry cmd_link_window_entry = { }; static enum cmd_retval -cmd_move_window_exec(struct cmd *self, struct cmd_q *cmdq) +cmd_move_window_exec(struct cmd *self, struct cmdq_item *item) { struct args *args = self->args; - struct session *src = cmdq->state.sflag.s; - struct session *dst = cmdq->state.tflag.s; - struct winlink *wl = cmdq->state.sflag.wl; + struct session *src = item->state.sflag.s; + struct session *dst = item->state.tflag.s; + struct winlink *wl = item->state.sflag.wl; char *cause; - int idx = cmdq->state.tflag.idx, kflag, dflag, sflag; + int idx = item->state.tflag.idx, kflag, dflag, sflag; if (args_has(args, 'r')) { session_renumber_windows(dst); @@ -84,7 +84,7 @@ cmd_move_window_exec(struct cmd *self, struct cmd_q *cmdq) if (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) { - cmdq_error(cmdq, "can't link window: %s", cause); + cmdq_error(item, "can't link window: %s", cause); free(cause); return (CMD_RETURN_ERROR); } |