From aca9af020241a4b7e4c172a009bf8d4fcfc4e16b Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Thu, 8 Feb 2024 17:09:27 +0100 Subject: vt: VS16 - variation selector 16 (emoji representation) should only affect emojis --- vt.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'vt.c') diff --git a/vt.c b/vt.c index 7529f302..4d2bf487 100644 --- a/vt.c +++ b/vt.c @@ -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; -- cgit v1.3