From b7709cc013766c40a2f7cb286a043e84411d5dfa Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 2 Jun 2021 19:32:05 +0200 Subject: grid: don’t cut multi-column chars in half when resizing the alt screen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When we resize the alt screen, we don’t reflow the text, we simply truncate all the lines. When doing this, make sure we don’t truncate in the middle of a multi-column character. --- grid.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'grid.c') diff --git a/grid.c b/grid.c index c9080347..2787102f 100644 --- a/grid.c +++ b/grid.c @@ -194,11 +194,15 @@ grid_resize_without_reflow( new_row->dirty = old_row->dirty; new_row->linebreak = false; - /* Clear "new" columns */ if (new_cols > old_cols) { + /* Clear "new" columns */ memset(&new_row->cells[old_cols], 0, sizeof(struct cell) * (new_cols - old_cols)); new_row->dirty = true; + } else if (old_cols > new_cols) { + /* Make sure we don't cut a multi-column character in two */ + for (int i = new_cols; i > 0 && old_row->cells[i].wc > CELL_SPACER; i--) + new_row->cells[i - 1].wc = 0; } /* Map sixels on current "old" row to current "new row" */ -- cgit v1.3