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-swap-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-swap-window.c')
| -rw-r--r-- | cmd-swap-window.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cmd-swap-window.c b/cmd-swap-window.c index 904a974d..0a0fcab9 100644 --- a/cmd-swap-window.c +++ b/cmd-swap-window.c @@ -26,7 +26,7 @@ * Swap one window with another. */ -static enum cmd_retval cmd_swap_window_exec(struct cmd *, struct cmd_q *); +static enum cmd_retval cmd_swap_window_exec(struct cmd *, struct cmdq_item *); const struct cmd_entry cmd_swap_window_entry = { .name = "swap-window", @@ -43,24 +43,24 @@ const struct cmd_entry cmd_swap_window_entry = { }; static enum cmd_retval -cmd_swap_window_exec(struct cmd *self, struct cmd_q *cmdq) +cmd_swap_window_exec(struct cmd *self, struct cmdq_item *item) { struct session *src, *dst; struct session_group *sg_src, *sg_dst; struct winlink *wl_src, *wl_dst; struct window *w; - wl_src = cmdq->state.sflag.wl; - src = cmdq->state.sflag.s; + wl_src = item->state.sflag.wl; + src = item->state.sflag.s; sg_src = session_group_find(src); - wl_dst = cmdq->state.tflag.wl; - dst = cmdq->state.tflag.s; + wl_dst = item->state.tflag.wl; + dst = item->state.tflag.s; sg_dst = session_group_find(dst); if (src != dst && sg_src != NULL && sg_dst != NULL && sg_src == sg_dst) { - cmdq_error(cmdq, "can't move window, sessions are grouped"); + cmdq_error(item, "can't move window, sessions are grouped"); return (CMD_RETURN_ERROR); } |