diff options
| author | Thomas Adam <thomas@xteddy.org> | 2023-09-14 16:01:10 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2023-09-14 16:01:10 +0100 |
| commit | c57a09269b2a40bc78cb03febb24acfdaddd7331 (patch) | |
| tree | 6df6b0ab1074ef889cbf6f074d6b64072505e66c /screen-write.c | |
| parent | f68d35c52962c095e81db0de28219529fd6f355e (diff) | |
| parent | 8191c587378b0bb6f9f6818b1d721cea56fe08ff (diff) | |
Merge branch 'obsd-master'
Diffstat (limited to 'screen-write.c')
| -rw-r--r-- | screen-write.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/screen-write.c b/screen-write.c index d76d8a66..389dfd4c 100644 --- a/screen-write.c +++ b/screen-write.c @@ -1832,6 +1832,7 @@ screen_write_collect_end(struct screen_write_ctx *ctx) if (ci->used == 0) return; + ctx->flags &= ~SCREEN_WRITE_COMBINE; before = screen_write_collect_trim(ctx, s->cy, s->cx, ci->used, &wrapped); @@ -1887,8 +1888,6 @@ screen_write_collect_add(struct screen_write_ctx *ctx, u_int sx = screen_size_x(s); int collect; - ctx->flags &= ~SCREEN_WRITE_COMBINE; - /* * Don't need to check that the attributes and whatnot are still the * same - input_parse will end the collection when anything that isn't @@ -1968,7 +1967,7 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc) screen_write_collect_flush(ctx, 0, __func__); gc = screen_write_combine(ctx, combine, &xx, &cx); if (gc != NULL) { - cy = s->cy; + cx = s->cx; cy = s->cy; screen_write_set_cursor(ctx, xx, s->cy); screen_write_initctx(ctx, &ttyctx, 0); ttyctx.cell = gc; |