circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2026-06-22 07:36:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge offset and size clamp functions.

Browse Source
This commit is contained in:
Nicholas Marriott
2026-06-19 09:48:15 +01:00
parent f02df683b3
commit 17e583d377
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
screen-redraw.c
View File

@@ -260,12 +260,15 @@ redraw_flags_string(int flags)
return (s); return (s);
} }
/* Expand size to cover any part of the client outside the window. */ /* Get window offset and expand size to cover any part outside the window. */
static void static void
redraw_expand_size(struct client *c, u_int *sx, u_int *sy) redraw_get_window_offset(struct client *c, u_int *ox, u_int *oy, u_int *sx,
u_int *sy)
{ {
u_int tty_sx, tty_sy; u_int tty_sx, tty_sy;
tty_window_offset(&c->tty, ox, oy, sx, sy);
tty_sx = c->tty.sx; tty_sx = c->tty.sx;
tty_sy = c->tty.sy - status_line_size(c); tty_sy = c->tty.sy - status_line_size(c);
if (*sx < tty_sx) if (*sx < tty_sx)
@@ -285,8 +288,7 @@ redraw_set_context(struct client *c, struct redraw_build_ctx *bctx)
memset(bctx, 0, sizeof *bctx); memset(bctx, 0, sizeof *bctx);
bctx->c = c; bctx->c = c;
bctx->w = w; bctx->w = w;
tty_window_offset(&c->tty, &bctx->ox, &bctx->oy, &bctx->sx, &bctx->sy); redraw_get_window_offset(c, &bctx->ox, &bctx->oy, &bctx->sx, &bctx->sy);
redraw_expand_size(c, &bctx->sx, &bctx->sy);
bctx->sb = options_get_number(oo, "pane-scrollbars"); bctx->sb = options_get_number(oo, "pane-scrollbars");
bctx->sbp = options_get_number(oo, "pane-scrollbars-position"); bctx->sbp = options_get_number(oo, "pane-scrollbars-position");
@@ -1005,8 +1007,7 @@ redraw_get_scene(struct client *c)
const char *reason = NULL; const char *reason = NULL;
u_int ox, oy, sx, sy; u_int ox, oy, sx, sy;
tty_window_offset(&c->tty, &ox, &oy, &sx, &sy); redraw_get_window_offset(c, &ox, &oy, &sx, &sy);
redraw_expand_size(c, &sx, &sy);
if (scene == NULL) if (scene == NULL)
reason = "missing"; reason = "missing";
else if (scene->w != w) else if (scene->w != w)