From 968f4396729ef432b69ba06ea92135acdc471b65 Mon Sep 17 00:00:00 2001 From: Michael Grant Date: Sat, 4 Oct 2025 09:15:51 +0100 Subject: [PATCH] Initial commit. Add new new-floating-window command to create panes without a layout_cell indicating they are floating panes. --- cmd-split-window.c | 153 +++++++++++++++++++++++++++++++++++++++++++++ cmd.c | 2 + layout.c | 3 + screen-write.c | 3 +- spawn.c | 9 ++- tmux.h | 6 ++ 6 files changed, 174 insertions(+), 2 deletions(-) diff --git a/cmd-split-window.c b/cmd-split-window.c index 3d366a00..515bd789 100644 --- a/cmd-split-window.c +++ b/cmd-split-window.c @@ -34,6 +34,8 @@ static enum cmd_retval cmd_split_window_exec(struct cmd *, struct cmdq_item *); +static enum cmd_retval cmd_new_floating_window_exec(struct cmd *, + struct cmdq_item *); const struct cmd_entry cmd_split_window_entry = { .name = "split-window", @@ -50,6 +52,22 @@ const struct cmd_entry cmd_split_window_entry = { .exec = cmd_split_window_exec }; +const struct cmd_entry cmd_new_floating_window_entry = { + .name = "new-floating-window", + .alias = "floatw", + + .args = { "bc:de:fF:hIl:p:Pt:vZ", 0, -1, NULL }, + .usage = "[-bdefhIPvZ] [-c start-directory] [-e environment] " + "[-F format] [-l size] " CMD_TARGET_PANE_USAGE + " [shell-command [argument ...]]", + + .target = { 't', CMD_FIND_PANE, 0 }, + + .flags = 0, + .exec = cmd_new_floating_window_exec +}; + + static enum cmd_retval cmd_split_window_exec(struct cmd *self, struct cmdq_item *item) { @@ -197,3 +215,138 @@ cmd_split_window_exec(struct cmd *self, struct cmdq_item *item) return (CMD_RETURN_WAIT); return (CMD_RETURN_NORMAL); } + +static enum cmd_retval +cmd_new_floating_window_exec(struct cmd *self, struct cmdq_item *item) +{ + struct args *args = cmd_get_args(self); + struct cmd_find_state *current = cmdq_get_current(item); + struct cmd_find_state *target = cmdq_get_target(item); + struct spawn_context sc = { 0 }; + struct client *tc = cmdq_get_target_client(item); + struct session *s = target->s; + struct winlink *wl = target->wl; + struct window *w = wl->window; + struct window_pane *wp = target->wp, *new_wp; + struct cmd_find_state fs; + int flags, input; + const char *template; + char *cause = NULL, *cp; + struct args_value *av; + u_int count = args_count(args); + u_int sx, sy, pct; + + if (args_has(args, 'f')) { + sx = w->sx; + sy = w->sy; + } else { + if (args_has(args, 'l')) { + sx = args_percentage_and_expand(args, 'l', 0, INT_MAX, w->sx, + item, &cause); + sy = args_percentage_and_expand(args, 'l', 0, INT_MAX, w->sy, + item, &cause); + } else if (args_has(args, 'p')) { + pct = args_strtonum_and_expand(args, 'p', 0, 100, item, + &cause); + if (cause == NULL) { + sx = w->sx * pct / 100; + sy = w->sy * pct / 100; + } + } else { + sx = w->sx / 2; + sy = w->sy / 2; + } + if (cause != NULL) { + cmdq_error(item, "size %s", cause); + free(cause); + return (CMD_RETURN_ERROR); + } + } + sc.xoff = 0; + sc.yoff = 0; + sc.sx = sx; + sc.sy = sy; + + input = (args_has(args, 'I') && count == 0); + + flags = SPAWN_FLOATING; + if (args_has(args, 'b')) + flags |= SPAWN_BEFORE; + if (args_has(args, 'f')) + flags |= SPAWN_FULLSIZE; + if (input || (count == 1 && *args_string(args, 0) == '\0')) + flags |= SPAWN_EMPTY; + + sc.item = item; + sc.s = s; + sc.wl = wl; + + sc.wp0 = wp; + sc.lc = NULL; + + args_to_vector(args, &sc.argc, &sc.argv); + sc.environ = environ_create(); + + av = args_first_value(args, 'e'); + while (av != NULL) { + environ_put(sc.environ, av->string, 0); + av = args_next_value(av); + } + + sc.idx = -1; + sc.cwd = args_get(args, 'c'); + + sc.flags = flags; + if (args_has(args, 'd')) + sc.flags |= SPAWN_DETACHED; + if (args_has(args, 'Z')) + sc.flags |= SPAWN_ZOOM; + + if ((new_wp = spawn_pane(&sc, &cause)) == NULL) { + cmdq_error(item, "create pane failed: %s", cause); + free(cause); + if (sc.argv != NULL) + cmd_free_argv(sc.argc, sc.argv); + environ_free(sc.environ); + return (CMD_RETURN_ERROR); + } + if (input) { + switch (window_pane_start_input(new_wp, item, &cause)) { + case -1: + server_client_remove_pane(new_wp); + window_remove_pane(wp->window, new_wp); + cmdq_error(item, "%s", cause); + free(cause); + if (sc.argv != NULL) + cmd_free_argv(sc.argc, sc.argv); + environ_free(sc.environ); + return (CMD_RETURN_ERROR); + case 1: + input = 0; + break; + } + } + if (!args_has(args, 'd')) + cmd_find_from_winlink_pane(current, wl, new_wp, 0); + window_pop_zoom(wp->window); + server_redraw_window(wp->window); + server_status_session(s); + + if (args_has(args, 'P')) { + if ((template = args_get(args, 'F')) == NULL) + template = SPLIT_WINDOW_TEMPLATE; + cp = format_single(item, template, tc, s, wl, new_wp); + cmdq_print(item, "%s", cp); + free(cp); + } + + cmd_find_from_winlink_pane(&fs, wl, new_wp, 0); + cmdq_insert_hook(s, item, &fs, "after-split-window"); + + if (sc.argv != NULL) + cmd_free_argv(sc.argc, sc.argv); + environ_free(sc.environ); + if (input) + return (CMD_RETURN_WAIT); + return (CMD_RETURN_NORMAL); +} diff --git a/cmd.c b/cmd.c index 02d2ac41..b9d6e0e9 100644 --- a/cmd.c +++ b/cmd.c @@ -109,6 +109,7 @@ extern const struct cmd_entry cmd_show_prompt_history_entry; extern const struct cmd_entry cmd_show_window_options_entry; extern const struct cmd_entry cmd_source_file_entry; extern const struct cmd_entry cmd_split_window_entry; +extern const struct cmd_entry cmd_new_floating_window_entry; extern const struct cmd_entry cmd_start_server_entry; extern const struct cmd_entry cmd_suspend_client_entry; extern const struct cmd_entry cmd_swap_pane_entry; @@ -201,6 +202,7 @@ const struct cmd_entry *cmd_table[] = { &cmd_show_window_options_entry, &cmd_source_file_entry, &cmd_split_window_entry, + &cmd_new_floating_window_entry, &cmd_start_server_entry, &cmd_suspend_client_entry, &cmd_swap_pane_entry, diff --git a/layout.c b/layout.c index 2832039c..8087a9e7 100644 --- a/layout.c +++ b/layout.c @@ -1085,6 +1085,9 @@ layout_close_pane(struct window_pane *wp) { struct window *w = wp->window; + if (wp->layout_cell == NULL) + return; + /* Remove the cell. */ layout_destroy_cell(w, wp->layout_cell, &w->layout_root); diff --git a/screen-write.c b/screen-write.c index 5ef9ce46..221ebf06 100644 --- a/screen-write.c +++ b/screen-write.c @@ -139,9 +139,10 @@ screen_write_set_client_cb(struct tty_ctx *ttyctx, struct client *c) if (c->session->curw->window != wp->window) return (0); + /* if (wp->layout_cell == NULL) return (0); - + */ if (wp->flags & (PANE_REDRAW|PANE_DROP)) return (-1); if (c->flags & CLIENT_REDRAWPANES) { diff --git a/spawn.c b/spawn.c index 90cda757..69dbb278 100644 --- a/spawn.c +++ b/spawn.c @@ -265,7 +265,14 @@ spawn_pane(struct spawn_context *sc, char **cause) new_wp->flags &= ~(PANE_STATUSREADY|PANE_STATUSDRAWN); } else if (sc->lc == NULL) { new_wp = window_add_pane(w, NULL, hlimit, sc->flags); - layout_init(w, new_wp); + if (sc->flags & SPAWN_FLOATING) { + new_wp->flags |= PANE_FLOATING; + window_pane_resize(new_wp, sc->sx, sc->sy); + new_wp->xoff = sc->xoff; + new_wp->yoff = sc->yoff; + } else { + layout_init(w, new_wp); + } } else { new_wp = window_add_pane(w, sc->wp0, hlimit, sc->flags); if (sc->flags & SPAWN_ZOOM) diff --git a/tmux.h b/tmux.h index 4276ce8b..7a4b68bb 100644 --- a/tmux.h +++ b/tmux.h @@ -1174,6 +1174,7 @@ struct window_pane { #define PANE_THEMECHANGED 0x2000 #define PANE_UNSEENCHANGES 0x4000 #define PANE_REDRAWSCROLLBAR 0x8000 +#define PANE_FLOATING 0x10000 u_int sb_slider_y; u_int sb_slider_h; @@ -2201,6 +2202,10 @@ struct spawn_context { struct window_pane *wp0; struct layout_cell *lc; + u_int xoff; + u_int yoff; + u_int sx; + u_int sy; const char *name; char **argv; @@ -2219,6 +2224,7 @@ struct spawn_context { #define SPAWN_FULLSIZE 0x20 #define SPAWN_EMPTY 0x40 #define SPAWN_ZOOM 0x80 +#define SPAWN_FLOATING 0x100 }; /* Mode tree sort order. */