mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-02-23 01:40:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dont-split-multi-column-chars-when-resizing-alt-screen'

Browse source
This commit is contained in:
Daniel Eklöf 2021-06-02 20:12:01 +02:00
commit 2f7e5aed40
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -149,6 +149,8 @@
(https://codeberg.org/dnkl/foot/issues/565). (https://codeberg.org/dnkl/foot/issues/565).
* Off-by-one error in markup of auto-detected URLs when the URL ends * Off-by-one error in markup of auto-detected URLs when the URL ends
in the right-most column. in the right-most column.
* Multi-column characters being cut in half when resizing the
alternate screen.
### Security ### Security

6
grid.c
View file

@ -194,11 +194,15 @@ grid_resize_without_reflow(
new_row->dirty = old_row->dirty; new_row->dirty = old_row->dirty;
new_row->linebreak = false; new_row->linebreak = false;
/* Clear "new" columns */
if (new_cols > old_cols) { if (new_cols > old_cols) {
/* Clear "new" columns */
memset(&new_row->cells[old_cols], 0, memset(&new_row->cells[old_cols], 0,
sizeof(struct cell) * (new_cols - old_cols)); sizeof(struct cell) * (new_cols - old_cols));
new_row->dirty = true; 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" */ /* Map sixels on current "old" row to current "new row" */