diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2009-08-13 16:24:33 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2009-08-13 16:24:33 +0000 |
commit | b02e429788af45110a09139069023e164f0a23be (patch) | |
tree | 9e0c5b384399f03cb3a80d4860d2832fa52ca672 | |
parent | 7a005b91b373aad3cfa877081b1df9c8d52f1d58 (diff) |
It was originally intended that scroll mode would show content that was
currently off-screen due to resize, but somewhere along the way this got
lost. Restore this behaviour to scroll mode by fixing screen_write_copy to read
up to the saved line length rather than the current screen width. Copy mode
remains unaltered for now.
-rw-r--r-- | screen-write.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/screen-write.c b/screen-write.c index 4e66b076..d735d450 100644 --- a/screen-write.c +++ b/screen-write.c @@ -184,24 +184,24 @@ screen_write_copy(struct screen_write_ctx *ctx, { struct screen *s = ctx->s; struct grid *gd = src->grid; + struct grid_line *gl; const struct grid_cell *gc; - struct grid_utf8 *gu; u_char *udata; u_int xx, yy, cx, cy; cx = s->cx; cy = s->cy; for (yy = py; yy < py + ny; yy++) { + gl = &gd->linedata[yy]; for (xx = px; xx < px + nx; xx++) { - if (xx >= gd->sx || yy >= gd->hsize + gd->sy) - gc = &grid_default_cell; - else - gc = grid_peek_cell(gd, xx, yy); + udata = NULL; - udata = NULL; - if (gc->flags & GRID_FLAG_UTF8) { - gu = grid_get_utf8(gd, xx, yy); - udata = gu->data; + if (xx >= gl->cellsize || yy >= gd->hsize + gd->sy) + gc = &grid_default_cell; + else { + gc = &gl->celldata[xx]; + if (gc->flags & GRID_FLAG_UTF8) + udata = gl->utf8data[xx].data; } screen_write_cell(ctx, gc, udata); |