mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-14 23:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Calculate size when trimming RHS correctly.

Browse Source
This commit is contained in:
Nicholas Marriott
2018-09-24 12:17:29 +01:00
parent 71d2ab184b
commit ad71e7f9d2
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tty.c
View File

@@ -936,8 +936,13 @@ tty_clamp_line(struct tty *tty, const struct tty_ctx *ctx, u_int px, u_int py,
/* Right not visible. */
*i = 0;
*x = (ctx->xoff + px) - ctx->ox;
*rx = nx - ((ctx->xoff + px) + nx - ctx->sx);
*rx = ctx->sx - *x;
}
if (*rx > nx)
fatalx("%s: x too big, %u > %u", __func__, *rx, nx);
if (nx > *rx)
*rx = nx;
return (1);
}
@@ -1028,8 +1033,13 @@ tty_clamp_area(struct tty *tty, const struct tty_ctx *ctx, u_int px, u_int py,
/* Right not visible. */
*i = 0;
*x = (ctx->xoff + px) - ctx->ox;
*rx = nx - ((ctx->xoff + px) + nx - ctx->sx);
*rx = ctx->sx - *x;
}
if (*rx > nx)
fatalx("%s: x too big, %u > %u", __func__, *rx, nx);
if (nx > *rx)
*rx = nx;
if (yoff >= ctx->oy && yoff + ny <= ctx->oy + ctx->sy) {
/* All visible. */
*j = 0;
@@ -1049,8 +1059,13 @@ tty_clamp_area(struct tty *tty, const struct tty_ctx *ctx, u_int px, u_int py,
/* Right not visible. */
*j = 0;
*y = (ctx->yoff + py) - ctx->oy;
*ry = ny - ((ctx->yoff + py) + ny - ctx->sy);
*ry = ctx->sy - *y;
}
if (*ry > ny)
fatalx("%s: y too big, %u > %u", __func__, *ry, ny);
if (ny > *ry)
*ry = ny;
return (1);
}