mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-03-18 05:34:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

render: require glyph count > 0 and cell-cols also for forced double-width PUAs

Browse source
This commit is contained in:
Daniel Eklöf 2021-07-02 16:48:46 +02:00
parent 396a5ff79b
commit 85b63b5e4a
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
render.c
View file

@ -616,15 +616,15 @@ render_cell(struct terminal *term, pixman_image_t *pix,
* - *this* cells is followed by an empty cell, or a space * - *this* cells is followed by an empty cell, or a space
*/ */
if (term->conf->tweak.allow_overflowing_double_width_glyphs && if (term->conf->tweak.allow_overflowing_double_width_glyphs &&
((glyph_count > 0 && glyph_count > 0 &&
cell_cols == 1 && cell_cols == 1 &&
glyphs[0]->x + glyphs[0]->width >= term->cell_width * 15 / 10 && 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) || glyphs[0]->x + glyphs[0]->width < 3 * term->cell_width) ||
(term->conf->tweak.pua_double_width && (term->conf->tweak.pua_double_width &&
((base >= 0x00e000 && base <= 0x00f8ff) || ((base >= 0x00e000 && base <= 0x00f8ff) ||
(base >= 0x0f0000 && base <= 0x0ffffd) || (base >= 0x0f0000 && base <= 0x0ffffd) ||
(base >= 0x100000 && base <= 0x10fffd)))) && (base >= 0x100000 && base <= 0x10fffd)))) &&
col < term->cols - 1 &&
(row->cells[col + 1].wc == 0 || row->cells[col + 1].wc == L' ')) (row->cells[col + 1].wc == 0 || row->cells[col + 1].wc == L' '))
{ {
cell_cols = 2; cell_cols = 2;