circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-10-15 07:44:24 +00:00
Code Issues Projects Releases Wiki Activity

Zoomed panes are now like full screen floating panes.

Browse Source
This commit is contained in:
Michael Grant
2026-09-30 23:10:40 +01:00
parent 5a820e63b7
commit 7810f8abf3
29 changed files with 752 additions and 621 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
window-panes.c
View File

@@ -150,21 +150,7 @@ window_panes_add_area(struct window_panes_modedata *data,
static int
window_panes_pane_floating(struct window_pane *wp)
{
struct layout_cell *lc = wp->saved_layout_cell;
if (lc == NULL)
lc = wp->layout_cell;
if (lc == NULL || (~lc->flags & LAYOUT_CELL_FLOATING))
return (0);
return (1);
}
static int
window_panes_pane_visible(struct window_pane *wp)
{
if (wp->saved_layout_cell != NULL)
return (1);
return (window_pane_is_visible(wp));
return (window_pane_is_floating(wp));
}
static int
@@ -172,12 +158,10 @@ window_panes_get_geometry(struct window_pane *wp, struct layout_cell *root,
u_int osx, u_int osy, u_int dsx, u_int dsy, u_int *xp, u_int *yp,
u_int *sxp, u_int *syp)
{
struct layout_cell *lc = wp->saved_layout_cell;
struct layout_cell *lc = wp->layout_cell;
int status;
u_int x, y, sx, sy, x2, y2;
if (lc == NULL)
lc = wp->layout_cell;
if (lc == NULL || osx == 0 || osy == 0 || dsx == 0 || dsy == 0)
return (0);
@@ -375,12 +359,7 @@ window_panes_mark_pane_status_borders(u_char *map, struct window *w,
return;
TAILQ_FOREACH(wp, &w->panes, entry) {
if (!window_panes_pane_visible(wp))
continue;
lc = wp->saved_layout_cell;
if (lc == NULL)
lc = wp->layout_cell;
lc = wp->layout_cell;
if (lc == NULL ||
!layout_add_horizontal_border(root, lc, status))
continue;
@@ -404,9 +383,7 @@ window_panes_get_floating_borders(struct window_pane *wp, u_int osx, u_int osy,
{
struct layout_cell *lc;
lc = wp->saved_layout_cell;
if (lc == NULL)
lc = wp->layout_cell;
lc = wp->layout_cell;
if (lc == NULL || (~lc->flags & LAYOUT_CELL_FLOATING))
return (0);
@@ -801,8 +778,6 @@ window_panes_draw_pane(struct window_panes_modedata *data,
struct screen *s = &wp->base;
u_int pane, x, y, sx, sy;
if (!window_panes_pane_visible(wp))
return;
if (!window_panes_get_geometry(wp, root, osx, osy, dsx, dsy, &x, &y,
&sx, &sy))
return;
@@ -839,9 +814,7 @@ window_panes_draw_screen(struct window_mode_entry *wme)
if (!window_panes_get_source(data, NULL, NULL, &w))
return;
root = w->saved_layout_root;
if (root == NULL)
root = w->layout_root;
root = w->layout_root;
if (root == NULL)
return;
@@ -941,7 +914,7 @@ window_panes_init(struct window_mode_entry *wme, struct cmdq_item *item,
if (args_has(args, 'Z'))
data->zoomed = -1;
else {
data->zoomed = (w->flags & WINDOW_ZOOMED);
data->zoomed = (wp->flags & PANE_ZOOMED);
if (!data->zoomed)
window_panes_set_preview(data);
if (!data->zoomed && window_zoom(wp) == 0)
@@ -967,8 +940,8 @@ window_panes_free(struct window_mode_entry *wme)
evtimer_del(&data->timer);
if (data->zoomed == 0)
server_unzoom_window(w);
if (data->zoomed == 0 && window_unzoom_pane(wme->wp, 1) == 0)
server_redraw_window(w);
server_redraw_window(w);
server_redraw_window_borders(w);
server_status_window(w);
@@ -1092,8 +1065,6 @@ window_panes_key(struct window_mode_entry *wme, struct client *c,
return;
}
if (wp->window->flags & WINDOW_ZOOMED)
window_unzoom(wp->window, 1);
window_panes_run_command(data, c, target);
window_pane_reset_mode(wp);
}