diff options
author | Thomas Adam <thomas@xteddy.org> | 2023-01-06 09:02:00 +0000 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2023-01-06 09:02:00 +0000 |
commit | 21e00e46359478f95c15f1672e5796e86eb0f529 (patch) | |
tree | 12e23d6fe45d82cdd73373d3b3566bada6fce4f2 /screen-write.c | |
parent | 70ff8cfe1e06987501a55a32df31d1f69acd2f99 (diff) | |
parent | 09afc6c8ee971918d925c441c41a9de7f598efb7 (diff) | |
download | rtmux-21e00e46359478f95c15f1672e5796e86eb0f529.tar.gz rtmux-21e00e46359478f95c15f1672e5796e86eb0f529.tar.bz2 rtmux-21e00e46359478f95c15f1672e5796e86eb0f529.zip |
Merge branch 'obsd-master'
Diffstat (limited to 'screen-write.c')
-rw-r--r-- | screen-write.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/screen-write.c b/screen-write.c index 24195708..59d289ec 100644 --- a/screen-write.c +++ b/screen-write.c @@ -1820,7 +1820,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, cx, cy; + u_int width = gc->data.width, xx, last, cy; int selected, skip = 1; /* Ignore padding cells. */ @@ -1853,12 +1853,12 @@ screen_write_cell(struct screen_write_ctx *ctx, const struct grid_cell *gc) ctx->flags &= ~SCREEN_WRITE_ZWJ; screen_write_collect_flush(ctx, 0, __func__); if ((gc = screen_write_combine(ctx, ud, &xx)) != NULL) { - cx = s->cx; cy = s->cy; + cy = s->cy; screen_write_set_cursor(ctx, xx, s->cy); screen_write_initctx(ctx, &ttyctx, 0); ttyctx.cell = gc; tty_write(tty_cmd_cell, &ttyctx); - s->cx = cx; s->cy = cy; + s->cx = xx + 1 + gc->data.width; s->cy = cy; } return; } @@ -2016,6 +2016,14 @@ screen_write_combine(struct screen_write_ctx *ctx, const struct utf8_data *ud, memcpy(gc.data.data + gc.data.size, ud->data, ud->size); gc.data.size += ud->size; + /* If this is U+FE0F VARIATION SELECTOR-16, force the width to 2. */ + if (gc.data.width == 1 && + ud->size == 3 && + memcmp(ud->data, "\357\270\217", 3) == 0) { + grid_view_set_padding(gd, (*xx) + 1, s->cy); + gc.data.width = 2; + } + /* Set the new cell. */ grid_view_set_cell(gd, *xx, s->cy, &gc); |