circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-13 06:04:34 +00:00
Code Issues Projects Releases Wiki Activity

Add a helper to swap a node into the place of a leaf, from Dane Jensen.

Browse Source
This commit is contained in:
nicm
2026-06-27 10:18:32 +00:00
parent dd02989e88
commit e24969b422
2 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
layout.c
View File

@@ -1184,6 +1184,32 @@ layout_resize_child_cells(struct window *w, struct layout_cell *lc)
} }
} }
/*
* Replaces the provided layout cell with a new node of the specified type and
* inserts the cell into it. Used when creating new cells requires a different
* layout type, or when the root layout is a window pane.
*/
struct layout_cell *
layout_replace_with_node(struct window *w, struct layout_cell *lc,
enum layout_type type)
{
struct layout_cell *lcparent;
lcparent = layout_create_cell(lc->parent);
layout_make_node(lcparent, type);
layout_set_size(lcparent, lc->sx, lc->sy, lc->xoff, lc->yoff);
if (lc->parent == NULL)
w->layout_root = lcparent;
else
TAILQ_REPLACE(&lc->parent->cells, lc, lcparent, entry);
/* Insert the old cell. */
lc->parent = lcparent;
TAILQ_INSERT_HEAD(&lcparent->cells, lc, entry);
return (lcparent);
}
/* /*
* Split a pane into two. size is a hint, or -1 for default half/half * Split a pane into two. size is a hint, or -1 for default half/half
* split. This must be followed by layout_assign_pane before much else happens! * split. This must be followed by layout_assign_pane before much else happens!
@@ -1315,17 +1341,7 @@ layout_split_pane(struct window_pane *wp, enum layout_type type, int size,
*/ */
/* Create and insert the replacement parent. */ /* Create and insert the replacement parent. */
lcparent = layout_create_cell(lc->parent); lcparent = layout_replace_with_node(wp->window, lc, type);
layout_make_node(lcparent, type);
layout_set_size(lcparent, sx, sy, xoff, yoff);
if (lc->parent == NULL)
wp->window->layout_root = lcparent;
else
TAILQ_REPLACE(&lc->parent->cells, lc, lcparent, entry);
/* Insert the old cell. */
lc->parent = lcparent;
TAILQ_INSERT_HEAD(&lcparent->cells, lc, entry);
/* Create the new child cell. */ /* Create the new child cell. */
lcnew = layout_create_cell(lcparent); lcnew = layout_create_cell(lcparent);
@@ -1384,14 +1400,7 @@ layout_floating_pane(struct window *w, struct window_pane *wp, u_int sx,
* Adding a pane to a root that isn't node. Must create and * Adding a pane to a root that isn't node. Must create and
* insert a new root. * insert a new root.
*/ */
lcparent = layout_create_cell(NULL); lcparent = layout_replace_with_node(w, lc, LAYOUT_TOPBOTTOM);
layout_make_node(lcparent, LAYOUT_TOPBOTTOM);
layout_set_size(lcparent, w->sx, w->sy, 0, 0);
w->layout_root = lcparent;
/* Insert the old cell. */
lc->parent = lcparent;
TAILQ_INSERT_HEAD(&lcparent->cells, lc, entry);
} }
lcnew = layout_create_cell(lcparent); lcnew = layout_create_cell(lcparent);
@@ -1712,7 +1721,11 @@ layout_remove_tile(struct window *w, struct layout_cell *lc)
layout_resize_adjust(w, lcneighbour, type, change); layout_resize_adjust(w, lcneighbour, type, change);
} }
/* Zeroing out the cell geometry until the cell is retiled. */ /*
layout_set_size(lc, 0, 0, 0, 0); * Zeroing out the cell geometry until the cell is retiled unless this
* is the top level node.
*/
if (lc->parent != NULL)
layout_set_size(lc, 0, 0, 0, 0);
return (1); return (1);
} }

2
tmux.h
View File

@@ -3643,6 +3643,8 @@ int layout_resize_floating_pane_to(struct window_pane *,
enum layout_type, u_int, char **); enum layout_type, u_int, char **);
void layout_assign_pane(struct layout_cell *, struct window_pane *, void layout_assign_pane(struct layout_cell *, struct window_pane *,
int); int);
struct layout_cell *layout_replace_with_node(struct window *,
struct layout_cell *, enum layout_type);
struct layout_cell *layout_split_pane(struct window_pane *, enum layout_type, struct layout_cell *layout_split_pane(struct window_pane *, enum layout_type,
int, int); int, int);
struct layout_cell *layout_floating_pane(struct window *, struct window_pane *, struct layout_cell *layout_floating_pane(struct window *, struct window_pane *,