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

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2026-05-30 17:45:06 +01:00
parent 35df67c893 7a3b7ae812
commit 74b91d6dec
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
screen-redraw.c
View File

@@ -1131,17 +1131,8 @@ screen_redraw_get_visible_ranges(struct window_pane *base_wp, 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 (px + width <= 0 || py < 0)
if (r == NULL) { goto empty;
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) { if (px < 0) {
px = 0; px = 0;
width += px; width += px;
@@ -1160,6 +1151,8 @@ screen_redraw_get_visible_ranges(struct window_pane *base_wp, int px,
} }
w = base_wp->window; w = base_wp->window;
if ((u_int)py >= w->sy)
goto empty;
if (px + width > w->sx) if (px + width > w->sx)
width = w->sx - px; width = w->sx - px;
@@ -1271,6 +1264,17 @@ screen_redraw_get_visible_ranges(struct window_pane *base_wp, int px,
} }
} }
return (r); return (r);
empty:
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);
} }
/* Draw one pane. */ /* Draw one pane. */
@@ -1300,7 +1304,7 @@ screen_redraw_draw_pane(struct screen_redraw_ctx *ctx, struct window_pane *wp)
* tty_x = window_x - ctx->ox * tty_x = window_x - ctx->ox
* *
* window <-> tty (y-axis): * window <-> tty (y-axis):
* woy = (ctx->statustop) ? ctx->statuslines : 0 * woy = ctx->statustop ? ctx->statuslines : 0
* window_y = tty_y + ctx->oy - woy * window_y = tty_y + ctx->oy - woy
* tty_y = woy + window_y - ctx->oy * tty_y = woy + window_y - ctx->oy
* *