From 5602571c0111c880a92ec49ec39a7a4c7363fcc7 Mon Sep 17 00:00:00 2001 From: Dane Jensen Date: Mon, 15 Jun 2026 21:17:10 -0700 Subject: [PATCH] Moved functionality to float and tile panes into `break-pane` and `join-pane`. --- cmd-break-pane.c | 55 +++++++++++++++++++++++++++++++++++++++++++++--- cmd-join-pane.c | 53 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 103 insertions(+), 5 deletions(-) diff --git a/cmd-break-pane.c b/cmd-break-pane.c index da15e8b5..714d4e30 100644 --- a/cmd-break-pane.c +++ b/cmd-break-pane.c @@ -34,9 +34,10 @@ const struct cmd_entry cmd_break_pane_entry = { .name = "break-pane", .alias = "breakp", - .args = { "abdPF:n:s:t:", 0, 0, NULL }, - .usage = "[-abdP] [-F format] [-n window-name] [-s src-pane] " - "[-t dst-window]", + .args = { "abdPF:n:s:t:Wx:X:y:Y:", 0, 0, NULL }, + .usage = "[-abdPW] [-F format] [-n window-name] [-s src-pane] " + "[-t dst-window] [x width] [y height] [X x-position] " + "[Y y-position]", .source = { 's', CMD_FIND_PANE, 0 }, .target = { 't', CMD_FIND_WINDOW, CMD_FIND_WINDOW_INDEX }, @@ -45,6 +46,51 @@ const struct cmd_entry cmd_break_pane_entry = { .exec = cmd_break_pane_exec }; +static enum cmd_retval +cmd_break_pane_float(struct cmdq_item *item, struct args *args, + struct window *w, struct window_pane *wp) +{ + struct layout_cell *lc = wp->layout_cell; + u_int sx = lc->saved_sx, sy = lc->saved_sy; + int ox = lc->saved_xoff, oy = lc->saved_yoff; + char *cause = NULL; + + if (window_pane_is_floating(wp)) { + cmdq_error(item, "pane is already floating"); + return (CMD_RETURN_ERROR); + } + if (window_pane_is_hidden(wp)) { + cmdq_error(item, "can't float a hidden pane"); + return (CMD_RETURN_ERROR); + } + if (w->flags & WINDOW_ZOOMED) { + cmdq_error(item, "can't float a pane while window is zoomed"); + return (CMD_RETURN_ERROR); + } + + layout_remove_tile(w, lc); + layout_cell_floating_args_parse(item, args, w, &sx, &sy, &ox, &oy, &cause); + if (cause != NULL) { + cmdq_error(item, "failed to float pane: %s", cause); + free(cause); + return (CMD_RETURN_ERROR); + } + layout_set_size(lc, sx, sy, ox, oy); + + lc->flags |= LAYOUT_CELL_FLOATING; + TAILQ_REMOVE(&w->z_index, wp, zentry); + TAILQ_INSERT_HEAD(&w->z_index, wp, zentry); + + if (!args_has(args, 'd')) + window_set_active_pane(w, wp, 1); + layout_fix_offsets(w); + layout_fix_panes(w, NULL); + notify_window("window-layout-changed", w); + server_redraw_window(w); + + return (CMD_RETURN_NORMAL); +} + static enum cmd_retval cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item) { @@ -62,6 +108,9 @@ cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item) int idx = target->idx, before; const char *template, *name = args_get(args, 'n'); + if (args_has(args, 'W')) + return (cmd_break_pane_float(item, args, w, wp)); + if (name != NULL && !check_name(name, WINDOW_NAME_FORBID)) { cmdq_error(item, "invalid window name: %s", name); return (CMD_RETURN_ERROR); diff --git a/cmd-join-pane.c b/cmd-join-pane.c index 12af48e0..2d52b317 100644 --- a/cmd-join-pane.c +++ b/cmd-join-pane.c @@ -358,6 +358,45 @@ cmd_join_pane_zindex(struct cmdq_item *item, struct winlink *wl, return (CMD_RETURN_NORMAL); } +static enum cmd_retval +cmd_join_pane_tile(struct cmdq_item *item, struct args *args, struct window *w, + struct window_pane *wp) +{ + struct layout_cell *lc = wp->layout_cell; + + if (!window_pane_is_floating(wp)) { + cmdq_error(item, "pane is not floating"); + return (CMD_RETURN_ERROR); + } + if (window_pane_is_hidden(wp)) { + cmdq_error(item, "can't tile a hidden pane"); + return (CMD_RETURN_ERROR); + } + if (w->flags & WINDOW_ZOOMED) { + cmdq_error(item, "can't tile a pane while window is zoomed"); + return (CMD_RETURN_ERROR); + } + + layout_save_size(lc); + lc->flags &= ~LAYOUT_CELL_FLOATING; + if (layout_insert_tile(w, lc) == 0) { + cmdq_error(item, "can't tile a pane that is already tiled"); + return (CMD_RETURN_ERROR); + } + + TAILQ_REMOVE(&w->z_index, wp, zentry); + TAILQ_INSERT_TAIL(&w->z_index, wp, zentry); + + if (!args_has(args, 'd')) + window_set_active_pane(w, wp, 1); + layout_fix_offsets(w); + layout_fix_panes(w, NULL); + notify_window("window-layout-changed", w); + server_redraw_window(w); + + return (CMD_RETURN_NORMAL); +} + static enum cmd_retval cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item) { @@ -372,7 +411,7 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item) const char *s; char *cause = NULL; int flags = 0, dst_idx; - struct layout_cell *lc; + struct layout_cell *lc, *src_lc; dst_s = target->s; dst_wl = target->wl; @@ -403,12 +442,16 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item) src_wl = source->wl; src_wp = source->wp; + src_lc = src_wp->layout_cell; src_w = src_wl->window; server_unzoom_window(src_w); + if (!args_has(args, 't') && window_pane_is_floating(src_wp)) + return (cmd_join_pane_tile(item, args, src_w, src_wp)); + if (src_wp == dst_wp) { cmdq_error(item, "source and target panes must be different"); - return (CMD_RETURN_ERROR); + return (CMD_RETURN_ERROR); } lc = layout_get_tiled_cell(item, args, dst_w, dst_wp, flags, &cause); @@ -417,6 +460,12 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item) free(cause); return (CMD_RETURN_ERROR); } + if (window_pane_is_floating(src_wp)) { + lc->saved_sx = src_lc->sx; + lc->saved_sy = src_lc->sy; + lc->saved_xoff = src_lc->xoff; + lc->saved_yoff = src_lc->yoff; + } layout_close_pane(src_wp);