aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-01-02 21:24:49 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-01-21 10:46:01 +0000
commit9c705b26ee2cefe8e9710c6dc8dbbd1ac5a5c53f (patch)
tree345d2b426e1ea3693be5ec21c1e13ab2ada07c47 /render.c
parentdoc: foot.ini: remove FONT FORMAT section, expand description of ‘font’ (diff)
render: mark cell overflowed into as dirty
When tweak.allow-overflowing-double-width-glyphs=yes, then certain glyphs are allowed to overflow into the neighbouring cell. However, if the cell “owning” the double-width glyph is erased (_only_ that cell), then the cell overflowed into is not redrawn, causing part of the double-width glyph to remain on screen. To avoid checking for these glyphs when printing to the terminal (i.e at parse time), simply mark both cells as dirty when we render the overflowing glyph. Yes, this means that the cells will always be re-rendered. We count on them only making up a small portion of the screen.
Diffstat (limited to 'render.c')
-rw-r--r--render.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/render.c b/render.c
index f66e277e..2951c466 100644
--- a/render.c
+++ b/render.c
@@ -481,7 +481,16 @@ render_cell(struct terminal *term, pixman_image_t *pix,
col < term->cols - 1 &&
(row->cells[col + 1].wc == 0 || row->cells[col + 1].wc == L' '))
{
- cell_cols = min(2, cols_left);
+ cell_cols = 2;
+
+ /*
+ * Ensure the cell we’re overflowing into gets re-rendered, to
+ * ensure it is erased if *this* cell is erased. Note that we
+ * do *not* mark the row as dirty - we don’t need to re-render
+ * the cell if nothing else on the row has changed.
+ */
+ row->cells[col].attrs.clean = 0;
+ row->cells[col + 1].attrs.clean = 0;
}
pixman_region32_t clip;