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

render: use column count from grapheme instead of first glyph, when we have one

Browse source
This commit is contained in:
Daniel Eklöf 2021-05-30 19:37:53 +02:00
parent 6c70cd9366
commit bd98cb6a73
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
render.c
View file

@ -507,6 +507,7 @@ render_cell(struct terminal *term, pixman_image_t *pix,
unsigned glyph_count = 0; unsigned glyph_count = 0;
wchar_t base = cell->wc; wchar_t base = cell->wc;
int cell_cols;
if (base != 0) { if (base != 0) {
if (unlikely( if (unlikely(
@ -553,6 +554,7 @@ render_cell(struct terminal *term, pixman_image_t *pix,
glyph_count = 1; glyph_count = 1;
glyphs = &single; glyphs = &single;
cell_cols = single->cols;
} }
else if (base >= CELL_COMB_CHARS_LO && else if (base >= CELL_COMB_CHARS_LO &&
@ -571,7 +573,9 @@ render_cell(struct terminal *term, pixman_image_t *pix,
composed = NULL; composed = NULL;
glyphs = grapheme->glyphs; glyphs = grapheme->glyphs;
glyph_count = grapheme->count; glyph_count = grapheme->count;
} cell_cols = grapheme->cols;
} else
base = composed->chars[0];
} }
@ -580,12 +584,14 @@ render_cell(struct terminal *term, pixman_image_t *pix,
single = fcft_glyph_rasterize(font, base, term->font_subpixel); single = fcft_glyph_rasterize(font, base, term->font_subpixel);
glyph_count = 1; glyph_count = 1;
glyphs = &single; glyphs = &single;
cell_cols = single->cols;
} }
} }
assert(glyph_count == 0 || glyphs != NULL); assert(glyph_count == 0 || glyphs != NULL);
const int cols_left = term->cols - col; const int cols_left = term->cols - col;
int cell_cols = glyph_count > 0 ? max(1, min(glyphs[0]->cols, cols_left)) : 1; cell_cols = max(1, min(cell_cols, cols_left));
/* /*
* Hack! * Hack!