From 80e6ab5ec9fdb0f4a3b3fa35e4ea502a54b85e1a Mon Sep 17 00:00:00 2001
From: Albert Cervin <albert@acervin.com>
Date: Wed, 27 Mar 2024 11:01:08 +0100
Subject: Do something better when wcwidth returns -1

On systems that has unkown widths for emojis for example,
using -1 for width is not a good fallback.
---
 src/dged/utf8.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/dged')

diff --git a/src/dged/utf8.c b/src/dged/utf8.c
index b71a7e1..52de2da 100644
--- a/src/dged/utf8.c
+++ b/src/dged/utf8.c
@@ -72,9 +72,10 @@ uint32_t utf8_visual_char_width(uint8_t *bytes, uint32_t len) {
     wchar_t wc;
     size_t nbytes = 0;
     if ((nbytes = mbrtowc(&wc, (char *)bytes, len, NULL)) > 0) {
-      return wcwidth(wc);
+      size_t w = wcwidth(wc);
+      return w > 0 ? w : 2;
     } else {
-      return 0;
+      return 1;
     }
   } else if (utf8_byte_is_unicode_continuation(*bytes)) {
     return 0;
-- 
cgit v1.2.3