aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-06-02 18:12:01 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-06-02 18:12:01 +0000
commit2f7e5aed40d963fc065f50d1601f7204db93fb32 (patch)
treea5c02d4cccb081ecce2e1e6ae36e02552fa436d5
parentMerge branch 'url-mode-off-by-one' (diff)
parentgrid: don’t cut multi-column chars in half when resizing the alt screen (diff)
Merge branch 'dont-split-multi-column-chars-when-resizing-alt-screen'
-rw-r--r--CHANGELOG.md2
-rw-r--r--grid.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6305093..7e727ad6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -149,6 +149,8 @@
(https://codeberg.org/dnkl/foot/issues/565).
* Off-by-one error in markup of auto-detected URLs when the URL ends
in the right-most column.
+* Multi-column characters being cut in half when resizing the
+ alternate screen.
### Security
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" */