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

unicode-combining: don't limit ourselves to the (western) diacritics blocks

Browse source
This commit is contained in:
Daniel Eklöf 2020-05-02 16:11:51 +02:00
parent 3b29aa95c9
commit 8389c76549
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

38
vt.c
View file

@ -539,22 +539,28 @@ action_utf8_print(struct terminal *term, uint8_t c)
if ((ssize_t)count < 0) if ((ssize_t)count < 0)
wc = 0; wc = 0;
#if FOOT_UNICODE_COMBINING int width = wcwidth(wc);
/*
* Try to combine with the previous character.
*
* We _could_ try regardless of what 'wc' is. However, for
* performance reasons, we only do it when 'wc' is in a known
* 'combining' range.
*/
if (((wc >= 0x0300 && wc <= 0x036F) || /* diacritical marks */ #if FOOT_UNICODE_COMBINING
(wc >= 0x1AB0 && wc <= 0x1AFF) || /* diacritical marks, extended */
(wc >= 0x1DC0 && wc <= 0x1DFF) || /* diacritical marks, supplement */ /*
(wc >= 0x20D0 && wc <= 0x20FF) || /* diacritical marks, for symbols */ * Is this is combining character? The basic assumption is that if
(wc >= 0xFE20 && wc <= 0xFE2F)) /* half marks */ * wcwdith() returns 0, then it *is* a combining character.
&& term->grid->cursor.point.col > 0) *
{ * We hen optimize this by ignoring all characters before 0x0300,
* since there aren't any zero-width characters there. This means
* all "normal" western characters will quickly be categorized as
* *not* being combining characters.
*
* TODO: xterm does more or less the same, but also filters a
* small subset of BIDI control characters. Should we too? I think
* what we have here is good enough - a control character
* shouldn't have a glyph associated with it, so rendering
* shouldn't be affected.
*
* TODO: handle line-wrap when locating the base character.
*/
if (wc >= 0x0300 && width == 0 && term->grid->cursor.point.col > 0) {
const struct row *row = term->grid->cur_row; const struct row *row = term->grid->cur_row;
int base_col = term->grid->cursor.point.col; int base_col = term->grid->cursor.point.col;
@ -618,7 +624,7 @@ action_utf8_print(struct terminal *term, uint8_t c)
} }
#endif /* FOOT_UNICODE_COMBINING */ #endif /* FOOT_UNICODE_COMBINING */
term_print(term, wc, wcwidth(wc)); term_print(term, wc, width);
} }
static enum state static enum state