circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-06-23 16:57:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into screen_redraw

Browse Source
This commit is contained in:
Nicholas Marriott
2026-06-22 11:23:27 +01:00
parent 7ebac4a3c3 06ee890db3
commit e1eb3e6b47
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
layout.c
View File

@@ -1359,14 +1359,21 @@ layout_split_pane(struct window_pane *wp, enum layout_type type, int size,
* layout_assign_pane before much else happens!
*/
struct layout_cell *
layout_floating_pane(struct window *w, u_int sx, u_int sy, int ox, int oy)
layout_floating_pane(struct window *w, struct window_pane *wp, u_int sx,
u_int sy, int ox, int oy)
{
struct layout_cell *lc = w->layout_root, *lcnew, *lcparent;
struct layout_cell *lc, *lcnew, *lcparent;
if (lc->type == LAYOUT_WINDOWPANE) {
if (wp == NULL)
lc = w->layout_root;
else
lc = wp->layout_cell;
lcparent = lc->parent;
if (lcparent == NULL) {
/*
* Adding a pane to a root that doesn't have a container. Must
* create and insert a new root.
* Adding a pane to a root that isn't node. Must create and
* insert a new root.
*/
lcparent = layout_create_cell(NULL);
layout_make_node(lcparent, LAYOUT_TOPBOTTOM);
@@ -1376,11 +1383,10 @@ layout_floating_pane(struct window *w, u_int sx, u_int sy, int ox, int oy)
/* Insert the old cell. */
lc->parent = lcparent;
TAILQ_INSERT_HEAD(&lcparent->cells, lc, entry);
} else
lcparent = w->layout_root;
}
lcnew = layout_create_cell(lcparent);
TAILQ_INSERT_TAIL(&lcparent->cells, lcnew, entry);
TAILQ_INSERT_AFTER(&lcparent->cells, lc, lcnew, entry);
lcnew->flags |= LAYOUT_CELL_FLOATING;
layout_set_size(lcnew, sx, sy, ox, oy);
@@ -1555,7 +1561,7 @@ layout_get_tiled_cell(struct cmdq_item *item, struct args *args,
/* Get a new floating cell. */
struct layout_cell *
layout_get_floating_cell(struct cmdq_item *item, struct args *args,
struct window *w, __unused struct window_pane *wp, char **cause)
struct window *w, struct window_pane *wp, char **cause)
{
struct layout_cell *lcnew;
int sx = w->sx / 2, sy = w->sy / 4;
@@ -1629,7 +1635,7 @@ layout_get_floating_cell(struct cmdq_item *item, struct args *args,
return (NULL);
}
lcnew = layout_floating_pane(w, sx, sy, ox, oy);
lcnew = layout_floating_pane(w, wp, sx, sy, ox, oy);
return (lcnew);
}