aboutsummaryrefslogtreecommitdiff
path: root/cmd-join-pane.c
diff options
context:
space:
mode:
Diffstat (limited to 'cmd-join-pane.c')
-rw-r--r--cmd-join-pane.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/cmd-join-pane.c b/cmd-join-pane.c
index eb2f6022..a4ab81f7 100644
--- a/cmd-join-pane.c
+++ b/cmd-join-pane.c
@@ -38,8 +38,8 @@ const struct cmd_entry cmd_join_pane_entry = {
.args = { "bdhvp:l:s:t:", 0, 0 },
.usage = "[-bdhv] [-p percentage|-l size] " 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_join_pane_exec
@@ -52,8 +52,8 @@ const struct cmd_entry cmd_move_pane_entry = {
.args = { "bdhvp:l:s:t:", 0, 0 },
.usage = "[-bdhv] [-p percentage|-l size] " CMD_SRCDST_PANE_USAGE,
- .sflag = CMD_PANE,
- .tflag = CMD_PANE,
+ .source = { 's', CMD_FIND_PANE, 0 },
+ .target = { 't', CMD_FIND_PANE, 0 },
.flags = 0,
.exec = cmd_join_pane_exec
@@ -79,15 +79,15 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
else
not_same_window = 0;
- dst_s = item->state.tflag.s;
- dst_wl = item->state.tflag.wl;
- dst_wp = item->state.tflag.wp;
+ dst_s = item->target.s;
+ dst_wl = item->target.wl;
+ dst_wp = item->target.wp;
dst_w = dst_wl->window;
dst_idx = dst_wl->idx;
server_unzoom_window(dst_w);
- src_wl = item->state.sflag.wl;
- src_wp = item->state.sflag.wp;
+ src_wl = item->source.wl;
+ src_wp = item->source.wp;
src_w = src_wl->window;
server_unzoom_window(src_w);