From: czarkoff@gmail.com <czarkoff@gmail.com>
Date: Tue, 28 Oct 2014 11:55:28 +0000 (+0100)
Subject: Replace character with U+FFFD if wcwidth() is -1
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=11625c7166b7e4dad414606227acec2de1c36464;p=st.git

Replace character with U+FFFD if wcwidth() is -1

Helpful when new Unicode codepoints are not recognized by libc.
---

diff --git a/st.c b/st.c
index 23dd7f1..ad52280 100644
--- a/st.c
+++ b/st.c
@@ -2576,7 +2576,10 @@ tputc(char *c, int len) {
 		unicodep = ascii = *c;
 	} else {
 		utf8decode(c, &unicodep, UTF_SIZ);
-		width = wcwidth(unicodep);
+		if ((width = wcwidth(unicodep)) == -1) {
+			c = "\357\277\275";	/* UTF_INVALID */
+			width = 1;
+		}
 		control = ISCONTROLC1(unicodep);
 		ascii = unicodep;
 	}