diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-07-02 14:29:08 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-07-02 14:31:14 +0000 |
| commit | 396a5ff79b6d59e1f187ba8d0a99d3aa58870fcd (patch) | |
| tree | 711bfae798ecabb46fb509b625a62fd566238ead /render.c | |
| parent | foot.ini: mention Control+c in default "cancel" key bindings (diff) | |
allow-overflowing-double-width-glyphs: take glyph offset into account
A narrow, but offset:ed glyph should still be considered double
width.
This patch also fixes a crash, when the maybe-double width glyph is in
the last column. This is a regression.
Diffstat (limited to 'render.c')
| -rw-r--r-- | render.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -618,13 +618,13 @@ render_cell(struct terminal *term, pixman_image_t *pix, if (term->conf->tweak.allow_overflowing_double_width_glyphs && ((glyph_count > 0 && cell_cols == 1 && - glyphs[0]->width >= term->cell_width * 15 / 10 && - glyphs[0]->width < 3 * term->cell_width && - col < term->cols - 1) || + glyphs[0]->x + glyphs[0]->width >= term->cell_width * 15 / 10 && + glyphs[0]->x + glyphs[0]->width < 3 * term->cell_width) || (term->conf->tweak.pua_double_width && ((base >= 0x00e000 && base <= 0x00f8ff) || (base >= 0x0f0000 && base <= 0x0ffffd) || (base >= 0x100000 && base <= 0x10fffd)))) && + col < term->cols - 1 && (row->cells[col + 1].wc == 0 || row->cells[col + 1].wc == L' ')) { cell_cols = 2; |
