--- lbbs/src/str_process.c	2025/11/07 14:22:31	1.26
+++ lbbs/src/str_process.c	2025/11/11 00:28:05	1.30
@@ -6,15 +6,27 @@
  * Copyright (C) 2004-2025  Leaflet <leaflet@leafok.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "common.h"
 #include "log.h"
 #include "str_process.h"
 #include <ctype.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <wchar.h>
+
+int UTF8_fixed_width = 1;
 
 int str_length(const char *str, int skip_ctrl_seq)
 {
+	int str_len;
+	char input_str[5];
+	wchar_t wcs[2];
+	int wc_len;
 	int i;
 	char c;
 	int ret = 0;
@@ -52,14 +64,30 @@ int str_length(const char *str, int skip
 		// Process UTF-8 Chinese characters
 		if (c & 0x80) // head of multi-byte character
 		{
-			c = (c & 0x70) << 1;
+			str_len = 0;
+			c = (char)(c & 0xf0);
 			while (c & 0x80)
 			{
-				i++;
+				input_str[str_len] = str[i + str_len];
+				str_len++;
 				c = (c & 0x7f) << 1;
 			}
+			input_str[str_len] = '\0';
 
-			ret += 2;
+			if (mbstowcs(wcs, input_str, 1) == (size_t)-1)
+			{
+#ifdef _DEBUG
+				log_error("mbstowcs(%s) error\n", input_str);
+#endif
+				wc_len = (UTF8_fixed_width ? 2 : 1); // Fallback
+			}
+			else
+			{
+				wc_len = (UTF8_fixed_width ? 2 : wcwidth(wcs[0]));
+			}
+
+			i += (str_len - 1);
+			ret += wc_len;
 		}
 		else
 		{
@@ -76,6 +104,10 @@ int split_line(const char *buffer, int m
 	*p_eol = 0;
 	*p_display_len = 0;
 	char c;
+	int str_len;
+	char input_str[5];
+	wchar_t wcs[2];
+	int wc_len;
 
 	for (i = 0; buffer[i] != '\0'; i++)
 	{
@@ -98,19 +130,35 @@ int split_line(const char *buffer, int m
 
 		if (c & 0x80) // head of multi-byte character
 		{
-			if (*p_display_len + 2 > max_display_len)
+			str_len = 0;
+			c = (char)(c & 0xf0);
+			while (c & 0x80)
 			{
-				break;
+				input_str[str_len] = buffer[i + str_len];
+				str_len++;
+				c = (c & 0x7f) << 1;
 			}
+			input_str[str_len] = '\0';
 
-			c = (c & 0x70) << 1;
-			while (c & 0x80)
+			if (mbstowcs(wcs, input_str, 1) == (size_t)-1)
 			{
-				i++;
-				c = (c & 0x7f) << 1;
+#ifdef _DEBUG
+				log_error("mbstowcs(%s) error\n", input_str);
+#endif
+				wc_len = (UTF8_fixed_width ? 2 : 1); // Fallback
+			}
+			else
+			{
+				wc_len = (UTF8_fixed_width ? 2 : wcwidth(wcs[0]));
+			}
+
+			if (*p_display_len + wc_len > max_display_len)
+			{
+				break;
 			}
 
-			(*p_display_len) += 2;
+			i += (str_len - 1);
+			(*p_display_len) += wc_len;
 		}
 		else
 		{
@@ -162,7 +210,7 @@ long split_data_lines(const char *p_buf,
 		p_line_offsets[line_cnt + 1] = p_line_offsets[line_cnt] + len;
 		line_cnt++;
 		p_buf += len;
-	} while (p_buf[0] != '\0');
+	} while (p_buf[0] != '\0' || end_of_line);
 
 	return line_cnt;
 }