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-pane.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-pane.c')
| -rw-r--r-- | cmd-swap-pane.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c index e5f5c810..43959140 100644 --- a/cmd-swap-pane.c +++ b/cmd-swap-pane.c @@ -26,7 +26,7 @@ * Swap two panes. */ -static enum cmd_retval cmd_swap_pane_exec(struct cmd *, struct cmd_q *); +static enum cmd_retval cmd_swap_pane_exec(struct cmd *, struct cmdq_item *); const struct cmd_entry cmd_swap_pane_entry = { .name = "swap-pane", @@ -43,17 +43,17 @@ const struct cmd_entry cmd_swap_pane_entry = { }; static enum cmd_retval -cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq) +cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item) { struct window *src_w, *dst_w; struct window_pane *tmp_wp, *src_wp, *dst_wp; struct layout_cell *src_lc, *dst_lc; u_int sx, sy, xoff, yoff; - dst_w = cmdq->state.tflag.wl->window; - dst_wp = cmdq->state.tflag.wp; - src_w = cmdq->state.sflag.wl->window; - src_wp = cmdq->state.sflag.wp; + dst_w = item->state.tflag.wl->window; + dst_wp = item->state.tflag.wp; + src_w = item->state.sflag.wl->window; + src_wp = item->state.sflag.wp; server_unzoom_window(dst_w); if (args_has(self->args, 'D')) { |