vt: VS16 - variation selector 16 (emoji representation) should only affect emojis

This commit is contained in:
Daniel Eklöf 2024-02-08 17:09:27 +01:00
parent 9ca84e6b48
commit aca9af0202
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 10 additions and 2 deletions

View file

@ -116,6 +116,8 @@
exactly 0 rows. This happens when `[scrollback].line = 0`, and the
window size (number of rows) is a power of two (i.e. 2, 4, 8, 16
etc) ([#1610][1610]).
* VS16 (variation selector 16 - emoji representation) should only
affect emojis.
[1531]: https://codeberg.org/dnkl/foot/issues/1531
[1573]: https://codeberg.org/dnkl/foot/issues/1573

10
vt.c
View file

@ -850,8 +850,14 @@ action_utf8_print(struct terminal *term, char32_t wc)
break;
case GRAPHEME_WIDTH_DOUBLE:
if (unlikely(wc == 0xfe0f))
width = 2;
if (unlikely(wc == 0xfe0f && new_cc->count == 2)) {
/* Only emojis should be affected by VS16 */
const utf8proc_property_t *props =
utf8proc_get_property(new_cc->chars[0]);
if (props->boundclass == UTF8PROC_BOUNDCLASS_EXTENDED_PICTOGRAPHIC)
width = 2;
}
new_cc->width = min(grapheme_width + width, 2);
break;