1 files changed, 7 insertions, 1 deletions
diff --git a/utf8.c b/utf8.c
index 03918cd2..604be36f 100644
--- a/utf8.c
+++ b/utf8.c
@@ -22,7 +22,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <vis.h>
 #include <wchar.h>
 
 #include "tmux.h"
@@ -217,7 +216,11 @@ utf8_width(struct utf8_data *ud, int *width)
 {
 	wchar_t	wc;
 
+#ifdef HAVE_UTF8PROC
+	switch (utf8proc_mbtowc(&wc, ud->data, ud->size)) {
+#else
 	switch (mbtowc(&wc, ud->data, ud->size)) {
+#endif
 	case -1:
 		log_debug("UTF-8 %.*s, mbtowc() %d", (int)ud->size, ud->data,
 		    errno);
@@ -226,6 +229,9 @@ utf8_width(struct utf8_data *ud, int *width)
 	case 0:
 		return (UTF8_ERROR);
 	}
+#ifdef HAVE_UTF8PROC
+	*width = utf8proc_wcwidth(wc);
+#else
 	*width = wcwidth(wc);
 	log_debug("UTF-8 %.*s %#x, wcwidth() %d", (int)ud->size, ud->data,
 	    (u_int)wc, *width);