aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2023-01-15 13:42:48 +0000
committerDaniel Eklöf <daniel@ekloef.se>2023-01-17 18:43:47 +0000
commita9298959a188013530257a665d839a6343229b85 (patch)
treeb17d9bbfd8395e91f86c18e6708e603f68d557da
parentterminfo: sync with ncurses 2023-01-14 (diff)
render: fix double-width glyphs glitching when surrounding cells overflow into it
If cells overflowed (for example, by using an italic font that isn’t truly monospaced) into a double-width glyph (that itself is *not* overflowing), then the double-width glyph would glitch when being rendered; typically the second half of it would occasionally disappear. This happened because we tried to rasterize the second cell of the double-width glyph. This cell contains a special “spacer” value. Rasterizing that typically results the font’s “not available” glyph. If _that_ glyph overflows, things broke; we’d later end up forcing a re-render of it (thus erasing half the double-width glyph). But since the double-width glyph _itself_ doesn’t overflow, _it_ wouldn’t be re-rendered, leaving it half erased. Fix by recognizing spacer cells, and not trying to rasterize them (set glyph count to 0, and cell count to 1). Closes #1256
-rw-r--r--CHANGELOG.md3
-rw-r--r--render.c16
2 files changed, 13 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2652f3ce..95aaab07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -121,6 +121,8 @@
* URL underlines sometimes still being visible after exiting URL mode.
* Text-bindings, and pipe-* bindings, with multiple key mappings
causing a crash (double-free) on exit ([#1259][1259]).
+* Double-width glyphs glitching when surrounded by glyphs overflowing
+ into the double-width glyph ([#1256][1256]).
[1173]: https://codeberg.org/dnkl/foot/issues/1173
[1190]: https://codeberg.org/dnkl/foot/issues/1190
@@ -128,6 +130,7 @@
[1209]: https://codeberg.org/dnkl/foot/issues/1209
[1218]: https://codeberg.org/dnkl/foot/issues/1218
[1259]: https://codeberg.org/dnkl/foot/issues/1259
+[1256]: https://codeberg.org/dnkl/foot/issues/1256
### Security
diff --git a/render.c b/render.c
index f5e7f627..92a37d7c 100644
--- a/render.c
+++ b/render.c
@@ -646,17 +646,21 @@ render_cell(struct terminal *term, pixman_image_t *pix,
}
}
-
if (single == NULL && grapheme == NULL) {
- xassert(base != 0);
- single = fcft_rasterize_char_utf32(font, base, term->font_subpixel);
- if (single == NULL) {
+ if (unlikely(base >= CELL_SPACER)) {
glyph_count = 0;
cell_cols = 1;
} else {
- glyph_count = 1;
- glyphs = &single;
+ xassert(base != 0);
+ single = fcft_rasterize_char_utf32(font, base, term->font_subpixel);
+ if (single == NULL) {
+ glyph_count = 0;
+ cell_cols = 1;
+ } else {
+ glyph_count = 1;
+ glyphs = &single;
cell_cols = single->cols;
+ }
}
}
}