circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-05-30 14:16:18 +00:00
Code Issues Projects Releases Wiki Activity

Missed this file from previous.

Browse Source
This commit is contained in:
nicm
2026-05-30 11:20:03 +00:00
parent f8ab7a5158
commit 290303e64f
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
screen-redraw.c
View File

@@ -1117,11 +1117,11 @@ screen_redraw_is_visible(struct visible_ranges *r, u_int px)
/* /*
* Construct ranges array for the line at starting at px,py of width cells of * Construct ranges array for the line at starting at px,py of width cells of
* base_wp that are unobsructed. * base_wp that are unobsructed. All ranges are in window coordinates.
*/ */
struct visible_ranges * struct visible_ranges *
screen_redraw_get_visible_ranges(struct window_pane *base_wp, u_int px, screen_redraw_get_visible_ranges(struct window_pane *base_wp, int px,
u_int py, u_int width, struct visible_ranges *r) int py, u_int width, struct visible_ranges *r)
{ {
struct window_pane *wp; struct window_pane *wp;
struct window *w; struct window *w;
@@ -1131,11 +1131,25 @@ screen_redraw_get_visible_ranges(struct window_pane *base_wp, u_int px,
u_int lb, rb, tb, bb; u_int lb, rb, tb, bb;
u_int i, s; u_int i, s;
if (px + width <= 0 || py < 0) {
if (r == NULL) {
if (sr.ranges == NULL)
sr.ranges = xcalloc(1, sizeof *sr.ranges);
sr.size = 1;
sr.used = 0;
return (&sr);
}
r->used = 0;
return (r);
}
if (px < 0) {
px = 0;
width += px;
}
if (base_wp == NULL) { if (base_wp == NULL) {
if (r != NULL) if (r != NULL)
return (r); return (r);
/* Return static range as last resort. */
if (sr.ranges == NULL) if (sr.ranges == NULL)
sr.ranges = xcalloc(1, sizeof *sr.ranges); sr.ranges = xcalloc(1, sizeof *sr.ranges);
sr.ranges[0].px = px; sr.ranges[0].px = px;
@@ -1172,10 +1186,10 @@ screen_redraw_get_visible_ranges(struct window_pane *base_wp, u_int px,
bb = wp->yoff + wp->sy; bb = wp->yoff + wp->sy;
if (!found_self || if (!found_self ||
!window_pane_visible(wp) || !window_pane_visible(wp) ||
py < tb || (u_int)py < tb ||
py > bb) (u_int)py > bb)
continue; continue;
if (~wp->flags & PANE_FLOATING && py == bb) if (~wp->flags & PANE_FLOATING && (u_int)py == bb)
continue; continue;
sb_w = wp->scrollbar_style.width + wp->scrollbar_style.pad; sb_w = wp->scrollbar_style.width + wp->scrollbar_style.pad;