2 files changed, 17 insertions, 4 deletions
diff --git a/src/support.c b/src/support.c
index 949c8dc52..ad0f93bd2 100644
--- a/src/support.c
+++ b/src/support.c
@@ -36,9 +36,19 @@ static gboolean noconvert = TRUE;
 size_t
 my_strlen(const char *str)
 {
-	if (g_utf8_validate(str, -1, NULL))
-		return g_utf8_strlen(str, -1);
-	else
+	if (g_utf8_validate(str, -1, NULL)) {
+		size_t len = g_utf8_strlen(str, -1);
+		size_t width = 0;
+		gunichar c;
+
+		while (len--) {
+			c = g_utf8_get_char(str);
+			width += g_unichar_iswide(c) ? 2 : 1;
+			str += g_unichar_to_utf8(c, NULL);
+		}
+
+		return width;
+	} else
 		return strlen(str);
 }
 
diff --git a/src/support.h b/src/support.h
index b80b9c8a2..3377f9a80 100644
--- a/src/support.h
+++ b/src/support.h
@@ -28,8 +28,11 @@ void charset_init(gboolean disable);
 char *utf8_to_locale(const char *str);
 char *locale_to_utf8(const char *str);
 
-/* number of characters in str */
+/**
+ * Returns the number of terminal cells occupied by this string.
+ */
 size_t my_strlen(const char *str);
+
 /* number of bytes in str */
 size_t my_strsize(char *str);