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

config: add grapheme-width-method=default

Browse source 
This is the new default mode, and tries to do "the right thing". That
is, recognize and handle:

* Variation Selector 16 (graphical presentation)
* ZWJ sequences
* Skin tones and hair-styles
* Country flags

Things known to be incorrect:

* "Invalid" country letter combinations are still treated as
  flags. That is, the combined width is 2, even though it should be 4.
This commit is contained in:
Daniel Eklöf 2022-12-14 14:35:00 +01:00
parent 3b9aca6a3d
commit ab39ed99df
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 80 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
vt.c
View file

@ -831,6 +831,32 @@ action_utf8_print(struct terminal *term, char32_t wc)
composed != NULL ? composed->width : base_width;
switch (term->conf->tweak.grapheme_width_method) {
case GRAPHEME_WIDTH_DEFAULT:
if (last == 0x200d) {
/* Last character is ZWJ - ignore this characters width */
width = grapheme_width;
} else if ((wc >= 0x1f3fb && wc <= 0x1f3ff /* skin-tone */) ||
(wc >= 0x1f9b0 && wc <= 0x1f9b3 /* hair-style */))
{
width = max(2, grapheme_width);
} else if (last >= 0x1f1e6 && last <= 0x1f1ff &&
wc >= 0x1f1e6 && wc <= 0x1f1ff)
{
/* Last character and this character are country
* letters, meaning the grapheme is a flag */
/* TODO: only do this for valid flag combinations */
width = 2;
} else if (unlikely(wc == 0xfe0f)) {
/* Variation selector 16 - graphical presentation */
width = 2;
} else {
/* Emulate wcswidth() */
width += grapheme_width;
}
new_cc->width = width;
break;
case GRAPHEME_WIDTH_MAX:
new_cc->width = max(grapheme_width, width);
break;