diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-03-06 10:01:21 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-03-06 10:01:21 +0000 |
| commit | 69257bc0aa8b5fbafb459f8e46985a97f840da63 (patch) | |
| tree | 9c53ef26dae1a338df879462abfd93df6941b562 /screen-write.c | |
| parent | 8684e60f51050cf48e76d9f9e488dc56e2250723 (diff) | |
| parent | dc8fefe902279836958c7438718e838d3687aed2 (diff) | |
| download | rtmux-69257bc0aa8b5fbafb459f8e46985a97f840da63.tar.gz rtmux-69257bc0aa8b5fbafb459f8e46985a97f840da63.tar.bz2 rtmux-69257bc0aa8b5fbafb459f8e46985a97f840da63.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'screen-write.c')
| -rw-r--r-- | screen-write.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/screen-write.c b/screen-write.c index 937870f9..d9d37437 100644 --- a/screen-write.c +++ b/screen-write.c @@ -1151,7 +1151,7 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc) struct grid_cell tmp_gc, now_gc; struct tty_ctx ttyctx; u_int sx = screen_size_x(s), sy = screen_size_y(s); - u_int width = gc->data.width, xx, last; + u_int width = gc->data.width, xx, last, cx, cy; int selected, skip = 1; /* Ignore padding cells. */ @@ -1163,10 +1163,12 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc) if (width == 0) { screen_write_collect_flush(ctx, 0); if ((gc = screen_write_combine(ctx, &gc->data, &xx)) != 0) { + cx = s->cx; cy = s->cy; screen_write_cursormove(ctx, xx, s->cy); screen_write_initctx(ctx, &ttyctx); ttyctx.cell = gc; tty_write(tty_cmd_cell, &ttyctx); + s->cx = cx; s->cy = cy; } return; } |