aboutsummaryrefslogtreecommitdiff
path: root/cmd-swap-pane.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-04-22 12:01:19 +0100
committerThomas Adam <thomas@xteddy.org>2017-04-22 12:01:19 +0100
commite802b683ea0ebfa377a5bb8a6b03454c1edbe2d5 (patch)
tree7a495bed6d4d979974826a11707f1c2585173768 /cmd-swap-pane.c
parentb08e451c916fd942b9d24706583ccedf307e0877 (diff)
parent55cd4c7bc756509f241788f7f73676676ef538f6 (diff)
downloadrtmux-e802b683ea0ebfa377a5bb8a6b03454c1edbe2d5.tar.gz
rtmux-e802b683ea0ebfa377a5bb8a6b03454c1edbe2d5.tar.bz2
rtmux-e802b683ea0ebfa377a5bb8a6b03454c1edbe2d5.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-swap-pane.c')
-rw-r--r--cmd-swap-pane.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index 43959140..7283bf53 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -35,8 +35,8 @@ const struct cmd_entry cmd_swap_pane_entry = {
.args = { "dDs:t:U", 0, 0 },
.usage = "[-dDU] " CMD_SRCDST_PANE_USAGE,
- .sflag = CMD_PANE_MARKED,
- .tflag = CMD_PANE,
+ .source = { 's', CMD_FIND_PANE, CMD_FIND_DEFAULT_MARKED },
+ .target = { 't', CMD_FIND_PANE, 0 },
.flags = 0,
.exec = cmd_swap_pane_exec
@@ -50,10 +50,10 @@ cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item)
struct layout_cell *src_lc, *dst_lc;
u_int sx, sy, xoff, yoff;
- 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;
+ dst_w = item->target.wl->window;
+ dst_wp = item->target.wp;
+ src_w = item->source.wl->window;
+ src_wp = item->source.wp;
server_unzoom_window(dst_w);
if (args_has(self->args, 'D')) {