aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-07-02 14:48:46 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-07-02 14:48:46 +0000
commit85b63b5e4a774b2c6f04859fd2a202ad362c6a5e (patch)
treed40d4e1a6bca18b5ef2ad557d52b466a9c3aeb2d
parentallow-overflowing-double-width-glyphs: take glyph offset into account (diff)
render: require glyph count > 0 and cell-cols also for forced double-width PUAs
-rw-r--r--render.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/render.c b/render.c
index dbca64aa..80d5efb5 100644
--- a/render.c
+++ b/render.c
@@ -616,15 +616,15 @@ render_cell(struct terminal *term, pixman_image_t *pix,
* - *this* cells is followed by an empty cell, or a space
*/
if (term->conf->tweak.allow_overflowing_double_width_glyphs &&
- ((glyph_count > 0 &&
- cell_cols == 1 &&
- glyphs[0]->x + glyphs[0]->width >= term->cell_width * 15 / 10 &&
+ glyph_count > 0 &&
+ cell_cols == 1 &&
+ 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;