circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-03-26 13:16:37 +00:00
Code Issues Projects Releases Wiki Activity

Fix next-layout to ignore floating panes.

Browse Source
This commit is contained in:
Michael Grant
2026-03-24 12:41:04 +00:00
parent 0328fe44e4
commit f201d246fd
11 changed files with 74 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-break-pane.c
View File

@@ -73,7 +73,7 @@ cmd_break_pane_exec(struct cmd *self, struct cmdq_item *item)
} }
server_unzoom_window(w); server_unzoom_window(w);
if (window_count_panes(w) == 1) { if (window_count_panes(w, 1) == 1) {
if (server_link_window(src_s, wl, dst_s, idx, 0, if (server_link_window(src_s, wl, dst_s, idx, 0,
!args_has(args, 'd'), &cause) != 0) { !args_has(args, 'd'), &cause) != 0) {
cmdq_error(item, "%s", cause); cmdq_error(item, "%s", cause);

2
cmd-join-pane.c
View File

@@ -170,7 +170,7 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
} else } else
server_status_session(dst_s); server_status_session(dst_s);
if (window_count_panes(src_w) == 0) if (window_count_panes(src_w, 1) == 0)
server_kill_window(src_w, 1); server_kill_window(src_w, 1);
else else
notify_window("window-layout-changed", src_w); notify_window("window-layout-changed", src_w);

2
cmd-select-pane.c
View File

@@ -103,7 +103,7 @@ cmd_select_pane_exec(struct cmd *self, struct cmdq_item *item)
* spawned without being visited (for example split-window -d). * spawned without being visited (for example split-window -d).
*/ */
lastwp = TAILQ_FIRST(&w->last_panes); lastwp = TAILQ_FIRST(&w->last_panes);
if (lastwp == NULL && window_count_panes(w) == 2) { if (lastwp == NULL && window_count_panes(w, 1) == 2) {
lastwp = TAILQ_PREV(w->active, window_panes, entry); lastwp = TAILQ_PREV(w->active, window_panes, entry);
if (lastwp == NULL) if (lastwp == NULL)
lastwp = TAILQ_NEXT(w->active, entry); lastwp = TAILQ_NEXT(w->active, entry);

2
format.c
View File

@@ -2886,7 +2886,7 @@ static void *
format_cb_window_panes(struct format_tree *ft) format_cb_window_panes(struct format_tree *ft)
{ {
if (ft->w != NULL) if (ft->w != NULL)
return (format_printf("%u", window_count_panes(ft->w))); return (format_printf("%u", window_count_panes(ft->w, 1)));
return (NULL); return (NULL);
} }

2
layout-custom.c
View File

@@ -213,7 +213,7 @@ layout_parse(struct window *w, const char *layout, char **cause)
/* Check this window will fit into the layout. */ /* Check this window will fit into the layout. */
for (;;) { for (;;) {
npanes = window_count_panes(w); npanes = window_count_panes(w, 1);
ncells = layout_count_cells(tiled_lc); ncells = layout_count_cells(tiled_lc);
ncells += layout_count_cells(floating_lc); ncells += layout_count_cells(floating_lc);
if (npanes > ncells) { if (npanes > ncells) {

79
layout-set.c
View File

@@ -123,6 +123,18 @@ layout_set_previous(struct window *w)
return (layout); return (layout);
} }
static struct window_pane *
layout_first_tiled(struct window *w)
{
struct window_pane *wp;
TAILQ_FOREACH(wp, &w->panes, entry) {
if (~wp->flags & PANE_FLOATING)
return (wp);
}
return (NULL);
}
static void static void
layout_set_even(struct window *w, enum layout_type type) layout_set_even(struct window *w, enum layout_type type)
{ {
@@ -133,7 +145,7 @@ layout_set_even(struct window *w, enum layout_type type)
layout_print_cell(w->layout_root, __func__, 1); layout_print_cell(w->layout_root, __func__, 1);
/* Get number of panes. */ /* Get number of panes. */
n = window_count_panes(w); n = window_count_panes(w, 0);
if (n <= 1) if (n <= 1)
return; return;
@@ -156,6 +168,8 @@ layout_set_even(struct window *w, enum layout_type type)
/* Build new leaf cells. */ /* Build new leaf cells. */
TAILQ_FOREACH(wp, &w->panes, entry) { TAILQ_FOREACH(wp, &w->panes, entry) {
if (wp->flags & PANE_FLOATING)
continue;
lcnew = layout_create_cell(lc); lcnew = layout_create_cell(lc);
layout_make_leaf(lcnew, wp); layout_make_leaf(lcnew, wp);
lcnew->sx = w->sx; lcnew->sx = w->sx;
@@ -201,7 +215,7 @@ layout_set_main_h(struct window *w)
layout_print_cell(w->layout_root, __func__, 1); layout_print_cell(w->layout_root, __func__, 1);
/* Get number of panes. */ /* Get number of panes. */
n = window_count_panes(w); n = window_count_panes(w, 0);
if (n <= 1) if (n <= 1)
return; return;
n--; /* take off main pane */ n--; /* take off main pane */
@@ -250,14 +264,16 @@ layout_set_main_h(struct window *w)
/* Create the main pane. */ /* Create the main pane. */
lcmain = layout_create_cell(lc); lcmain = layout_create_cell(lc);
layout_set_size(lcmain, sx, mainh, 0, 0); layout_set_size(lcmain, sx, mainh, 0, 0);
layout_make_leaf(lcmain, TAILQ_FIRST(&w->panes)); layout_make_leaf(lcmain, layout_first_tiled(w));
TAILQ_INSERT_TAIL(&lc->cells, lcmain, entry); TAILQ_INSERT_TAIL(&lc->cells, lcmain, entry);
/* Create the other pane. */ /* Create the other pane. */
lcother = layout_create_cell(lc); lcother = layout_create_cell(lc);
layout_set_size(lcother, sx, otherh, 0, 0); layout_set_size(lcother, sx, otherh, 0, 0);
if (n == 1) { if (n == 1) {
wp = TAILQ_NEXT(TAILQ_FIRST(&w->panes), entry); wp = TAILQ_NEXT(layout_first_tiled(w), entry);
while (wp != NULL && (wp->flags & PANE_FLOATING))
wp = TAILQ_NEXT(wp, entry);
layout_make_leaf(lcother, wp); layout_make_leaf(lcother, wp);
TAILQ_INSERT_TAIL(&lc->cells, lcother, entry); TAILQ_INSERT_TAIL(&lc->cells, lcother, entry);
} else { } else {
@@ -266,7 +282,9 @@ layout_set_main_h(struct window *w)
/* Add the remaining panes as children. */ /* Add the remaining panes as children. */
TAILQ_FOREACH(wp, &w->panes, entry) { TAILQ_FOREACH(wp, &w->panes, entry) {
if (wp == TAILQ_FIRST(&w->panes)) if (wp->flags & PANE_FLOATING)
continue;
if (wp == layout_first_tiled(w))
continue; continue;
lcchild = layout_create_cell(lcother); lcchild = layout_create_cell(lcother);
layout_set_size(lcchild, PANE_MINIMUM, otherh, 0, 0); layout_set_size(lcchild, PANE_MINIMUM, otherh, 0, 0);
@@ -299,7 +317,7 @@ layout_set_main_h_mirrored(struct window *w)
layout_print_cell(w->layout_root, __func__, 1); layout_print_cell(w->layout_root, __func__, 1);
/* Get number of panes. */ /* Get number of panes. */
n = window_count_panes(w); n = window_count_panes(w, 0);
if (n <= 1) if (n <= 1)
return; return;
n--; /* take off main pane */ n--; /* take off main pane */
@@ -349,7 +367,9 @@ layout_set_main_h_mirrored(struct window *w)
lcother = layout_create_cell(lc); lcother = layout_create_cell(lc);
layout_set_size(lcother, sx, otherh, 0, 0); layout_set_size(lcother, sx, otherh, 0, 0);
if (n == 1) { if (n == 1) {
wp = TAILQ_NEXT(TAILQ_FIRST(&w->panes), entry); wp = TAILQ_NEXT(layout_first_tiled(w), entry);
while (wp != NULL && (wp->flags & PANE_FLOATING))
wp = TAILQ_NEXT(wp, entry);
layout_make_leaf(lcother, wp); layout_make_leaf(lcother, wp);
TAILQ_INSERT_TAIL(&lc->cells, lcother, entry); TAILQ_INSERT_TAIL(&lc->cells, lcother, entry);
} else { } else {
@@ -358,7 +378,9 @@ layout_set_main_h_mirrored(struct window *w)
/* Add the remaining panes as children. */ /* Add the remaining panes as children. */
TAILQ_FOREACH(wp, &w->panes, entry) { TAILQ_FOREACH(wp, &w->panes, entry) {
if (wp == TAILQ_FIRST(&w->panes)) if (wp->flags & PANE_FLOATING)
continue;
if (wp == layout_first_tiled(w))
continue; continue;
lcchild = layout_create_cell(lcother); lcchild = layout_create_cell(lcother);
layout_set_size(lcchild, PANE_MINIMUM, otherh, 0, 0); layout_set_size(lcchild, PANE_MINIMUM, otherh, 0, 0);
@@ -371,7 +393,7 @@ layout_set_main_h_mirrored(struct window *w)
/* Create the main pane. */ /* Create the main pane. */
lcmain = layout_create_cell(lc); lcmain = layout_create_cell(lc);
layout_set_size(lcmain, sx, mainh, 0, 0); layout_set_size(lcmain, sx, mainh, 0, 0);
layout_make_leaf(lcmain, TAILQ_FIRST(&w->panes)); layout_make_leaf(lcmain, layout_first_tiled(w));
TAILQ_INSERT_TAIL(&lc->cells, lcmain, entry); TAILQ_INSERT_TAIL(&lc->cells, lcmain, entry);
/* Fix cell offsets. */ /* Fix cell offsets. */
@@ -397,7 +419,7 @@ layout_set_main_v(struct window *w)
layout_print_cell(w->layout_root, __func__, 1); layout_print_cell(w->layout_root, __func__, 1);
/* Get number of panes. */ /* Get number of panes. */
n = window_count_panes(w); n = window_count_panes(w, 0);
if (n <= 1) if (n <= 1)
return; return;
n--; /* take off main pane */ n--; /* take off main pane */
@@ -446,14 +468,16 @@ layout_set_main_v(struct window *w)
/* Create the main pane. */ /* Create the main pane. */
lcmain = layout_create_cell(lc); lcmain = layout_create_cell(lc);
layout_set_size(lcmain, mainw, sy, 0, 0); layout_set_size(lcmain, mainw, sy, 0, 0);
layout_make_leaf(lcmain, TAILQ_FIRST(&w->panes)); layout_make_leaf(lcmain, layout_first_tiled(w));
TAILQ_INSERT_TAIL(&lc->cells, lcmain, entry); TAILQ_INSERT_TAIL(&lc->cells, lcmain, entry);
/* Create the other pane. */ /* Create the other pane. */
lcother = layout_create_cell(lc); lcother = layout_create_cell(lc);
layout_set_size(lcother, otherw, sy, 0, 0); layout_set_size(lcother, otherw, sy, 0, 0);
if (n == 1) { if (n == 1) {
wp = TAILQ_NEXT(TAILQ_FIRST(&w->panes), entry); wp = TAILQ_NEXT(layout_first_tiled(w), entry);
while (wp != NULL && (wp->flags & PANE_FLOATING))
wp = TAILQ_NEXT(wp, entry);
layout_make_leaf(lcother, wp); layout_make_leaf(lcother, wp);
TAILQ_INSERT_TAIL(&lc->cells, lcother, entry); TAILQ_INSERT_TAIL(&lc->cells, lcother, entry);
} else { } else {
@@ -462,7 +486,9 @@ layout_set_main_v(struct window *w)
/* Add the remaining panes as children. */ /* Add the remaining panes as children. */
TAILQ_FOREACH(wp, &w->panes, entry) { TAILQ_FOREACH(wp, &w->panes, entry) {
if (wp == TAILQ_FIRST(&w->panes)) if (wp->flags & PANE_FLOATING)
continue;
if (wp == layout_first_tiled(w))
continue; continue;
lcchild = layout_create_cell(lcother); lcchild = layout_create_cell(lcother);
layout_set_size(lcchild, otherw, PANE_MINIMUM, 0, 0); layout_set_size(lcchild, otherw, PANE_MINIMUM, 0, 0);
@@ -495,7 +521,7 @@ layout_set_main_v_mirrored(struct window *w)
layout_print_cell(w->layout_root, __func__, 1); layout_print_cell(w->layout_root, __func__, 1);
/* Get number of panes. */ /* Get number of panes. */
n = window_count_panes(w); n = window_count_panes(w, 0);
if (n <= 1) if (n <= 1)
return; return;
n--; /* take off main pane */ n--; /* take off main pane */
@@ -545,7 +571,9 @@ layout_set_main_v_mirrored(struct window *w)
lcother = layout_create_cell(lc); lcother = layout_create_cell(lc);
layout_set_size(lcother, otherw, sy, 0, 0); layout_set_size(lcother, otherw, sy, 0, 0);
if (n == 1) { if (n == 1) {
wp = TAILQ_NEXT(TAILQ_FIRST(&w->panes), entry); wp = TAILQ_NEXT(layout_first_tiled(w), entry);
while (wp != NULL && (wp->flags & PANE_FLOATING))
wp = TAILQ_NEXT(wp, entry);
layout_make_leaf(lcother, wp); layout_make_leaf(lcother, wp);
TAILQ_INSERT_TAIL(&lc->cells, lcother, entry); TAILQ_INSERT_TAIL(&lc->cells, lcother, entry);
} else { } else {
@@ -554,7 +582,9 @@ layout_set_main_v_mirrored(struct window *w)
/* Add the remaining panes as children. */ /* Add the remaining panes as children. */
TAILQ_FOREACH(wp, &w->panes, entry) { TAILQ_FOREACH(wp, &w->panes, entry) {
if (wp == TAILQ_FIRST(&w->panes)) if (wp->flags & PANE_FLOATING)
continue;
if (wp == layout_first_tiled(w))
continue; continue;
lcchild = layout_create_cell(lcother); lcchild = layout_create_cell(lcother);
layout_set_size(lcchild, otherw, PANE_MINIMUM, 0, 0); layout_set_size(lcchild, otherw, PANE_MINIMUM, 0, 0);
@@ -567,7 +597,7 @@ layout_set_main_v_mirrored(struct window *w)
/* Create the main pane. */ /* Create the main pane. */
lcmain = layout_create_cell(lc); lcmain = layout_create_cell(lc);
layout_set_size(lcmain, mainw, sy, 0, 0); layout_set_size(lcmain, mainw, sy, 0, 0);
layout_make_leaf(lcmain, TAILQ_FIRST(&w->panes)); layout_make_leaf(lcmain, layout_first_tiled(w));
TAILQ_INSERT_TAIL(&lc->cells, lcmain, entry); TAILQ_INSERT_TAIL(&lc->cells, lcmain, entry);
/* Fix cell offsets. */ /* Fix cell offsets. */
@@ -593,7 +623,7 @@ layout_set_tiled(struct window *w)
layout_print_cell(w->layout_root, __func__, 1); layout_print_cell(w->layout_root, __func__, 1);
/* Get number of panes. */ /* Get number of panes. */
n = window_count_panes(w); n = window_count_panes(w, 0);
if (n <= 1) if (n <= 1)
return; return;
@@ -629,8 +659,10 @@ layout_set_tiled(struct window *w)
layout_set_size(lc, sx, sy, 0, 0); layout_set_size(lc, sx, sy, 0, 0);
layout_make_node(lc, LAYOUT_TOPBOTTOM); layout_make_node(lc, LAYOUT_TOPBOTTOM);
/* Create a grid of the cells. */ /* Create a grid of the cells, skipping any floating panes. */
wp = TAILQ_FIRST(&w->panes); wp = TAILQ_FIRST(&w->panes);
while (wp != NULL && (wp->flags & PANE_FLOATING))
wp = TAILQ_NEXT(wp, entry);
for (j = 0; j < rows; j++) { for (j = 0; j < rows; j++) {
/* If this is the last cell, all done. */ /* If this is the last cell, all done. */
if (wp == NULL) if (wp == NULL)
@@ -645,6 +677,8 @@ layout_set_tiled(struct window *w)
if (n - (j * columns) == 1 || columns == 1) { if (n - (j * columns) == 1 || columns == 1) {
layout_make_leaf(lcrow, wp); layout_make_leaf(lcrow, wp);
wp = TAILQ_NEXT(wp, entry); wp = TAILQ_NEXT(wp, entry);
while (wp != NULL && (wp->flags & PANE_FLOATING))
wp = TAILQ_NEXT(wp, entry);
continue; continue;
} }
@@ -657,8 +691,11 @@ layout_set_tiled(struct window *w)
layout_make_leaf(lcchild, wp); layout_make_leaf(lcchild, wp);
TAILQ_INSERT_TAIL(&lcrow->cells, lcchild, entry); TAILQ_INSERT_TAIL(&lcrow->cells, lcchild, entry);
/* Move to the next cell. */ /* Move to the next non-floating cell. */
if ((wp = TAILQ_NEXT(wp, entry)) == NULL) wp = TAILQ_NEXT(wp, entry);
while (wp != NULL && (wp->flags & PANE_FLOATING))
wp = TAILQ_NEXT(wp, entry);
if (wp == NULL)
break; break;
} }

3
layout.c
View File

@@ -270,7 +270,8 @@ layout_fix_offsets1(struct layout_cell *lc)
} else { } else {
yoff = lc->yoff; yoff = lc->yoff;
TAILQ_FOREACH(lcchild, &lc->cells, entry) { TAILQ_FOREACH(lcchild, &lc->cells, entry) {
if (lcchild->wp->flags & PANE_MINIMISED) if (lcchild->type == LAYOUT_WINDOWPANE &&
lcchild->wp->flags & PANE_MINIMISED)
continue; continue;
lcchild->xoff = lc->xoff; lcchild->xoff = lc->xoff;
lcchild->yoff = yoff; lcchild->yoff = yoff;

2
server-fn.c
View File

@@ -184,7 +184,7 @@ server_kill_pane(struct window_pane *wp)
{ {
struct window *w = wp->window; struct window *w = wp->window;
if (window_count_panes(w) == 1) { if (window_count_panes(w, 1) == 1) {
server_kill_window(w, 1); server_kill_window(w, 1);
recalculate_sizes(); recalculate_sizes();
} else { } else {

2
tmux.h
View File

@@ -3375,7 +3375,7 @@ struct window_pane *window_pane_next_by_number(struct window *,
struct window_pane *window_pane_previous_by_number(struct window *, struct window_pane *window_pane_previous_by_number(struct window *,
struct window_pane *, u_int); struct window_pane *, u_int);
int window_pane_index(struct window_pane *, u_int *); int window_pane_index(struct window_pane *, u_int *);
u_int window_count_panes(struct window *); u_int window_count_panes(struct window *, int);
void window_destroy_panes(struct window *); void window_destroy_panes(struct window *);
struct window_pane *window_pane_find_by_id_str(const char *); struct window_pane *window_pane_find_by_id_str(const char *);
struct window_pane *window_pane_find_by_id(u_int); struct window_pane *window_pane_find_by_id(u_int);

4
window-tree.c
View File

@@ -387,7 +387,7 @@ window_tree_build(void *modedata, struct sort_criteria *sort_crit,
*tag = (uint64_t)data->fs.wl; *tag = (uint64_t)data->fs.wl;
break; break;
case WINDOW_TREE_PANE: case WINDOW_TREE_PANE:
if (window_count_panes(data->fs.wl->window) == 1) if (window_count_panes(data->fs.wl->window, 1) == 1)
*tag = (uint64_t)data->fs.wl; *tag = (uint64_t)data->fs.wl;
else else
*tag = (uint64_t)data->fs.wp; *tag = (uint64_t)data->fs.wp;
@@ -566,7 +566,7 @@ window_tree_draw_window(struct window_tree_modedata *data, struct session *s,
int colour, active_colour, left, right; int colour, active_colour, left, right;
char *label; char *label;
total = window_count_panes(w); total = window_count_panes(w, 1);
memcpy(&gc, &grid_default_cell, sizeof gc); memcpy(&gc, &grid_default_cell, sizeof gc);
colour = options_get_number(oo, "display-panes-colour"); colour = options_get_number(oo, "display-panes-colour");

7
window.c
View File

@@ -950,14 +950,17 @@ window_pane_index(struct window_pane *wp, u_int *i)
} }
u_int u_int
window_count_panes(struct window *w) window_count_panes(struct window *w, int inc_floating)
{ {
struct window_pane *wp; struct window_pane *wp;
u_int n; u_int n;
n = 0; n = 0;
TAILQ_FOREACH(wp, &w->panes, entry) TAILQ_FOREACH(wp, &w->panes, entry) {
if ((inc_floating == 0) && (wp->flags & PANE_FLOATING))
continue;
n++; n++;
}
return (n); return (n);
} }