diff options
Diffstat (limited to 'cmd-swap-pane.c')
| -rw-r--r-- | cmd-swap-pane.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c index 42fe2fcb..d484f4e2 100644 --- a/cmd-swap-pane.c +++ b/cmd-swap-pane.c @@ -27,7 +27,7 @@ */ void cmd_swap_pane_key_binding(struct cmd *, int); -enum cmd_retval cmd_swap_pane_exec(struct cmd *, struct cmd_ctx *); +enum cmd_retval cmd_swap_pane_exec(struct cmd *, struct cmd_q *); const struct cmd_entry cmd_swap_pane_entry = { "swap-pane", "swapp", @@ -50,7 +50,7 @@ cmd_swap_pane_key_binding(struct cmd *self, int key) } enum cmd_retval -cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx) +cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq) { struct args *args = self->args; struct winlink *src_wl, *dst_wl; @@ -59,10 +59,11 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx) struct layout_cell *src_lc, *dst_lc; u_int sx, sy, xoff, yoff; - dst_wl = cmd_find_pane(ctx, args_get(args, 't'), NULL, &dst_wp); + dst_wl = cmd_find_pane(cmdq, args_get(args, 't'), NULL, &dst_wp); if (dst_wl == NULL) return (CMD_RETURN_ERROR); dst_w = dst_wl->window; + server_unzoom_window(dst_w); if (!args_has(args, 's')) { src_w = dst_w; @@ -77,11 +78,12 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_ctx *ctx) } else return (CMD_RETURN_NORMAL); } else { - src_wl = cmd_find_pane(ctx, args_get(args, 's'), NULL, &src_wp); + src_wl = cmd_find_pane(cmdq, args_get(args, 's'), NULL, &src_wp); if (src_wl == NULL) return (CMD_RETURN_ERROR); src_w = src_wl->window; } + server_unzoom_window(src_w); if (src_wp == dst_wp) return (CMD_RETURN_NORMAL); |