Sync OpenBSD patchset 997:

Calculate last position correctly for UTF-8 wide characters, reported by
Matthias Lederhofer.
This commit is contained in:
Tiago Cunha 2012-01-20 21:16:07 +00:00
parent db7570daab
commit ad5c4e719b

5
tty.c
View File

@ -969,7 +969,10 @@ tty_cmd_cell(struct tty *tty, const struct tty_ctx *ctx)
* move as far left as possible and redraw the last
* cell to move into the last position.
*/
cx = screen_size_x(s) - width;
if (ctx->last_cell.flags & GRID_FLAG_UTF8)
cx = screen_size_x(s) - ctx->last_utf8.width;
else
cx = screen_size_x(s) - 1;
tty_cursor_pane(tty, ctx, cx, ctx->ocy);
tty_cell(tty, &ctx->last_cell, &ctx->last_utf8);
}