aboutsummaryrefslogtreecommitdiff
path: root/cmd-swap-pane.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-04-13 14:01:45 +0100
committerThomas Adam <thomas@xteddy.org>2020-04-13 14:01:45 +0100
commit8f2b5d714a9f854c9583cab8bae70a2c7323fa00 (patch)
tree4e887ff4a1fcb3703fb0a1fcaa751183cff24c12 /cmd-swap-pane.c
parentb117c3b81217a11946ac784cfbe2ef1f3725b207 (diff)
parent04cdd035250b93b728678d515b69690653dced4e (diff)
downloadrtmux-8f2b5d714a9f854c9583cab8bae70a2c7323fa00.tar.gz
rtmux-8f2b5d714a9f854c9583cab8bae70a2c7323fa00.tar.bz2
rtmux-8f2b5d714a9f854c9583cab8bae70a2c7323fa00.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-swap-pane.c')
-rw-r--r--cmd-swap-pane.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index 60be63dc..021ac224 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -46,15 +46,17 @@ static enum cmd_retval
cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item)
{
struct args *args = cmd_get_args(self);
+ struct cmd_find_state *source = cmdq_get_source(item);
+ struct cmd_find_state *target = cmdq_get_target(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 = item->target.wl->window;
- dst_wp = item->target.wp;
- src_w = item->source.wl->window;
- src_wp = item->source.wp;
+ dst_w = target->wl->window;
+ dst_wp = target->wp;
+ src_w = source->wl->window;
+ src_wp = source->wp;
if (window_push_zoom(dst_w, args_has(args, 'Z')))
server_redraw_window(dst_w);