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

Fix floating panes not being detected as obscuring the pane behind them,

Browse Source 
GitHub issue 5641 from Michael Grant.
This commit is contained in:
nicm
2026-09-28 10:10:16 +00:00
committed by tmux update bot
parent 884101263e
commit bbecdc802f
3 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
screen-write.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: screen-write.c,v 1.293 2026/09/24 11:19:39 nicm Exp $ */
/* $OpenBSD: screen-write.c,v 1.294 2026/09/28 10:10:16 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -201,15 +201,7 @@ screen_write_pane_is_obscured(struct screen_write_ctx *ctx)
}
while ((wp = TAILQ_PREV(wp, window_panes, zentry)) != NULL) {
if (window_pane_is_floating(wp) &&
((wp->yoff >= ctx->wp->yoff &&
wp->yoff <= ctx->wp->yoff + (int)ctx->wp->sy) ||
(wp->yoff + (int)wp->sy >= ctx->wp->yoff &&
wp->yoff + wp->sy <= ctx->wp->yoff + ctx->wp->sy)) &&
((wp->xoff >= ctx->wp->xoff &&
wp->xoff <= ctx->wp->xoff + (int)ctx->wp->sx) ||
(wp->xoff + (int)wp->sx >= ctx->wp->xoff &&
wp->xoff + wp->sx <= ctx->wp->xoff + ctx->wp->sx))) {
if (window_pane_floating_overlaps(wp, ctx->wp)) {
ctx->flags |= SCREEN_WRITE_OBSCURED;
return (1);
}

4
tmux.h
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: tmux.h,v 1.1448 2026/09/24 11:19:39 nicm Exp $ */
/* $OpenBSD: tmux.h,v 1.1449 2026/09/28 10:10:16 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -3655,6 +3655,8 @@ struct window_pane *window_find_string(struct window *, const char *);
int window_has_floating_panes(struct window *);
int window_has_pane(struct window *, struct window_pane *);
int window_pane_contains(struct window_pane *, u_int, u_int);
int window_pane_floating_overlaps(struct window_pane *,
struct window_pane *);
int window_set_active_pane(struct window *, struct window_pane *,
int);
void window_fire_pane_moved(struct window_pane *, struct window *,

30
window.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: window.c,v 1.380 2026/09/28 09:56:05 nicm Exp $ */
/* $OpenBSD: window.c,v 1.381 2026/09/28 10:10:16 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -660,6 +660,34 @@ window_pane_contains(struct window_pane *wp, u_int x, u_int y)
return (1);
}
/*
* Does floating pane, including its borders and scrollbar, overlap any cell of
* another pane, including its scrollbar?
*/
int
window_pane_floating_overlaps(struct window_pane *fwp, struct window_pane *wp)
{
int fxoff, fyoff, xoff, yoff, border = 0;
u_int fsx, fsy, sx, sy;
if (!window_pane_is_floating(fwp))
return (0);
window_pane_full_size_offset(fwp, &fxoff, &fyoff, &fsx, &fsy);
window_pane_full_size_offset(wp, &xoff, &yoff, &sx, &sy);
if (window_pane_get_pane_lines(fwp) != PANE_LINES_NONE)
border = 1;
if (fxoff - border >= xoff + (int)sx ||
fxoff + (int)fsx + border <= xoff)
return (0);
if (fyoff - border >= yoff + (int)sy ||
fyoff + (int)fsy + border <= yoff)
return (0);
return (1);
}
void
window_update_focus(struct window *w)
{