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

Merge branch 'master' into hidden-panes

Browse Source
This commit is contained in:
Michael Grant
2026-10-03 22:20:57 +01:00
parent 6b64ff92e6 59387debff
commit b9272d2f7b
50 changed files with 3974 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
window.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: window.c,v 1.383 2026/09/28 10:42:01 nicm Exp $ */
/* $OpenBSD: window.c,v 1.384 2026/10/02 12:48:52 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -427,6 +427,7 @@ window_create(u_int sx, u_int sy, u_int xpixel, u_int ypixel)
TAILQ_INIT(&w->panes);
TAILQ_INIT(&w->z_index);
TAILQ_INIT(&w->last_panes);
TAILQ_INIT(&w->damage);
w->active = NULL;
w->lastlayout = -1;
@@ -470,6 +471,7 @@ window_destroy(struct window *w)
menu_destroy(w);
window_destroy_panes(w);
redraw_free_damage(w);
if (event_initialized(&w->name_event))
evtimer_del(&w->name_event);
@@ -762,6 +764,7 @@ window_activate_pane(struct window *w, struct window_pane *wp, int notify,
int raise)
{
struct window_pane *lastwp;
int full = 0;
log_debug("%s: pane %%%u", __func__, wp->id);
@@ -770,6 +773,7 @@ window_activate_pane(struct window *w, struct window_pane *wp, int notify,
if (wp->flags & PANE_HIDDEN) {
if (window_show_pane(wp) != 0)
return (0);
full = 1;
if (wp == w->active)
return (1);
}
@@ -785,6 +789,7 @@ window_activate_pane(struct window *w, struct window_pane *wp, int notify,
window_raise_pane(wp);
else
window_hide_zoomed(w);
full = 1;
} else if (raise) {
/* Raise the pane if the option says to. */
switch (options_get_number(w->options, "pane-raise-on-focus")) {
@@ -813,7 +818,19 @@ window_activate_pane(struct window *w, struct window_pane *wp, int notify,
}
tty_update_window_offset(w);
server_redraw_window(w);
/*
* Showing, hiding or unzooming changes what is visible and needs a
* full window redraw. Otherwise, only the previous and new active
* pane's border and status appearance changed, so avoid redrawing
* unaffected pane content.
*/
if (full)
server_redraw_window(w);
else {
server_redraw_window_borders(w);
server_status_window(w);
}
if (notify)
window_fire_pane_changed(w, w->active, lastwp);
@@ -3259,3 +3276,40 @@ window_pane_is_raised(struct window_pane *wp)
return (1);
return (window_pane_is_floating(wp));
}
/* Report damage for a floating pane, including its border and scrollbar. */
static void
window_damage_floating_pane(struct window_pane *wp, int xoff, int yoff,
int sx, int sy)
{
struct window *w = wp->window;
int x0, x1, y0, y1, sb_left = 0, sb_right = 0;
struct style *sb_sy = &wp->scrollbar_style;
if (window_pane_scrollbar_reserve(wp)) {
if (w->sb_pos == PANE_SCROLLBARS_LEFT)
sb_left = sb_sy->width + sb_sy->pad;
else
sb_right = sb_sy->width + sb_sy->pad;
}
x0 = xoff - 1 - sb_left;
x1 = xoff + sx + sb_right;
y0 = yoff - 1;
y1 = yoff + sy;
if (x0 < 0)
x0 = 0;
if (y0 < 0)
y0 = 0;
if (x1 >= x0 && y1 >= y0)
redraw_damage_window(w, x0, y0, x1 - x0 + 1U, y1 - y0 + 1U);
}
/* Report damage for a floating pane's old and new areas. */
void
window_redraw_floating_pane(struct window_pane *wp, int oxoff, int oyoff,
int osx, int osy)
{
window_damage_floating_pane(wp, oxoff, oyoff, osx, osy);
window_damage_floating_pane(wp, wp->xoff, wp->yoff, wp->sx, wp->sy);
server_status_window(wp->window);
}