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

unicode-combine: only compose if we don't have any other combining characters

Browse source 
If the client sent the sequence SAB, where SA does NOT have a composed
representation, but SB does, the old code would compose SB and throw
away A.

This patch fixes this by only allowing a compose if there aren't
any pre-existing combining characters.
This commit is contained in:
Daniel Eklöf 2020-05-01 20:17:37 +02:00
parent a6cd151cc7
commit 50543983ad
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

42
vt.c
View file

@ -575,27 +575,35 @@ action_utf8_print(struct terminal *term, uint8_t c)
if (base != 0 && base_width > 0) { if (base != 0 && base_width > 0) {
/* /*
* First, see if there's a pre-composed character of this * If this is the *first* combining characger, see if
* combo, with the same column width as the base * there's a pre-composed character of this combo, with
* character. If there is, replace the base character with * the same column width as the base character.
* the pre-composed character, as that is likely to *
* produce a better looking result. * If there is, replace the base character with the
* pre-composed character, as that is likely to produce a
* better looking result.
*
* TODO: we could perhaps remove this is we improve our
* positioning of the combining characters when rendering
* the glyph.
*/ */
wchar_t composed[] = {base, wc};
ssize_t composed_length = utf8proc_normalize_utf32(
composed, ALEN(composed), UTF8PROC_COMPOSE | UTF8PROC_STABLE);
int composed_width = wcwidth(composed[0]);
if (composed_length == 1 && composed_width == base_width) {
term->grid->cursor.point.col = base_col;
term->grid->cursor.lcf = false;
term_print(term, composed[0], composed_width);
return;
}
struct combining_chars *comb_chars = &row->comb_chars[base_col]; struct combining_chars *comb_chars = &row->comb_chars[base_col];
if (comb_chars->count == 0) {
wchar_t composed[] = {base, wc};
ssize_t composed_length = utf8proc_normalize_utf32(
composed, ALEN(composed), UTF8PROC_COMPOSE | UTF8PROC_STABLE);
int composed_width = wcwidth(composed[0]);
if (composed_length == 1 && composed_width == base_width) {
term->grid->cursor.point.col = base_col;
term->grid->cursor.lcf = false;
term_print(term, composed[0], composed_width);
return;
}
}
if (comb_chars->count < ALEN(comb_chars->chars)) if (comb_chars->count < ALEN(comb_chars->chars))
comb_chars->chars[comb_chars->count++] = wc; comb_chars->chars[comb_chars->count++] = wc;
else { else {