--- lbbs/src/editor.c	2025/06/10 06:48:23	1.3
+++ lbbs/src/editor.c	2025/06/11 04:57:19	1.5
@@ -22,6 +22,7 @@
 #include "str_process.h"
 #include <stdlib.h>
 #include <sys/param.h>
+#include <strings.h>
 
 #define _POSIX_C_SOURCE 200809L
 #include <string.h>
@@ -29,6 +30,7 @@
 EDITOR_DATA *editor_data_load(const char *p_data)
 {
 	EDITOR_DATA *p_editor_data;
+	char *p_data_line = NULL;
 	long line_offsets[MAX_EDITOR_DATA_LINES];
 	long current_data_line_length = 0;
 	long i, j;
@@ -64,8 +66,8 @@ EDITOR_DATA *editor_data_load(const char
 			}
 
 			// Allocate new data line
-			p_editor_data->p_data_lines[p_editor_data->data_line_total] = malloc(MAX_EDITOR_DATA_LINE_LENGTH);
-			if (p_editor_data->p_data_lines[p_editor_data->data_line_total] == NULL)
+			p_data_line = malloc(MAX_EDITOR_DATA_LINE_LENGTH);
+			if (p_data_line == NULL)
 			{
 				log_error("malloc(MAX_EDITOR_DATA_LINE_LENGTH * %d) error: OOM\n", i);
 				// Cleanup
@@ -76,9 +78,10 @@ EDITOR_DATA *editor_data_load(const char
 				free(p_editor_data);
 				return NULL;
 			}
-
-			p_editor_data->p_display_lines[i] = p_editor_data->p_data_lines[p_editor_data->data_line_total];
+			p_editor_data->p_data_lines[p_editor_data->data_line_total] = p_data_line;
 			(p_editor_data->data_line_total)++;
+
+			p_editor_data->p_display_lines[i] = p_data_line;
 			current_data_line_length = 0;
 		}
 		else
@@ -88,9 +91,12 @@ EDITOR_DATA *editor_data_load(const char
 
 		memcpy(p_editor_data->p_display_lines[i], p_data + line_offsets[i], (size_t)p_editor_data->display_line_lengths[i]);
 		current_data_line_length += p_editor_data->display_line_lengths[i];
-		p_editor_data->p_data_lines[p_editor_data->data_line_total - 1][current_data_line_length] = '\0';
+		p_data_line[current_data_line_length] = '\0';
 	}
 
+	bzero(p_editor_data->p_data_lines + p_editor_data->data_line_total, MAX_EDITOR_DATA_LINES - (size_t)p_editor_data->data_line_total);
+	bzero(p_editor_data->p_display_lines + p_editor_data->display_line_total, MAX_EDITOR_DATA_LINES - (size_t)p_editor_data->display_line_total);
+
 	return p_editor_data;
 }
 
@@ -146,20 +152,13 @@ int editor_data_insert(EDITOR_DATA *p_ed
 {
 	long display_line = *p_display_line;
 	long offset = *p_offset;
-	int done = 0;
-	int len;
-	int display_len;
-	int eol;
-	char *p_data_line;
+	char *p_data_line = NULL;
 	long len_data_line;
 	long offset_data_line;
 	long last_display_line; // of data line
-	char buf_insert[MAX_EDITOR_DATA_LINE_LENGTH];
-	long len_insert;
-	int display_len_insert;
-	char buf_catenate[MAX_EDITOR_DATA_LINE_LENGTH];
-	long len_catenate;
-	long i;
+	long line_offsets[MAX_EDITOR_DATA_LINE_LENGTH + 1];
+	long split_line_total;
+	long i, j;
 
 	if (p_editor_data == NULL || p_last_updated_line == NULL)
 	{
@@ -167,10 +166,6 @@ int editor_data_insert(EDITOR_DATA *p_ed
 		return -1;
 	}
 
-	memcpy(buf_insert, str, (size_t)str_len);
-	buf_insert[str_len] = '\0';
-	len_insert = str_len;
-
 	// Get accurate offset of first character of CJK at offset position
 	for (i = 0; i < offset; i++)
 	{
@@ -223,57 +218,23 @@ int editor_data_insert(EDITOR_DATA *p_ed
 		}
 
 		// Allocate new data line
-		p_editor_data->p_data_lines[p_editor_data->data_line_total] = malloc(MAX_EDITOR_DATA_LINE_LENGTH);
-		if (p_editor_data->p_data_lines[p_editor_data->data_line_total] == NULL)
+		p_data_line = malloc(MAX_EDITOR_DATA_LINE_LENGTH);
+		if (p_data_line == NULL)
 		{
 			log_error("malloc(MAX_EDITOR_DATA_LINE_LENGTH) error: OOM\n");
 			return -2;
 		}
-
-		if (last_display_line > display_line)
-		{
-			// Copy rest part of current data line (since next display line) to new data line
-			memcpy(p_editor_data->p_data_lines[p_editor_data->data_line_total],
-				   p_editor_data->p_display_lines[display_line + 1],
-				   (size_t)(len_data_line - (p_editor_data->p_display_lines[display_line + 1] - p_data_line)));
-			p_editor_data->p_data_lines[p_editor_data->data_line_total]
-									   [len_data_line - (p_editor_data->p_display_lines[display_line + 1] - p_data_line)] = '\0';
-
-			// Relocate rest display lines (since next one) of current data line
-			p_data_line = p_editor_data->p_display_lines[display_line + 1];
-			for (i = display_line + 1; i <= last_display_line; i++)
-			{
-				p_editor_data->p_display_lines[i] =
-					p_editor_data->p_data_lines[p_editor_data->data_line_total] +
-					(p_editor_data->p_display_lines[i] - p_data_line);
-			}
-		}
-		else // last_display_line == display_line
-		{
-			// Insert blank display line pointing to new data line
-			for (i = p_editor_data->display_line_total; i > display_line + 1; i--)
-			{
-				p_editor_data->p_display_lines[i] = p_editor_data->p_display_lines[i - 1];
-				p_editor_data->display_line_lengths[i] = p_editor_data->display_line_lengths[i - 1];
-			}
-			p_editor_data->p_display_lines[display_line + 1] = p_editor_data->p_data_lines[p_editor_data->data_line_total];
-			p_editor_data->display_line_lengths[display_line + 1] = 0;
-
-			(p_editor_data->display_line_total)++;
-			last_display_line++;
-		}
-
-		*p_last_updated_line = p_editor_data->display_line_total;
+		p_editor_data->p_data_lines[p_editor_data->data_line_total] = p_data_line;
 		(p_editor_data->data_line_total)++;
 
-		if (offset_data_line + str_len + 2 < MAX_EDITOR_DATA_LINE_LENGTH)
+		if (offset_data_line + str_len + 1 < MAX_EDITOR_DATA_LINE_LENGTH)
 		{
-			// Copy rest part of current display line to insert buffer
-			memcpy(buf_insert,
+			// Copy rest part of current data line to new data line
+			memcpy(p_data_line,
 				   p_editor_data->p_display_lines[display_line] + offset,
-				   (size_t)(p_editor_data->display_line_lengths[display_line] - offset));
-			len_insert = (p_editor_data->display_line_lengths[display_line] - offset);
-			buf_insert[len_insert] = '\0';
+				   (size_t)(len_data_line - offset_data_line));
+
+			p_data_line[len_data_line - offset_data_line] = '\0';
 
 			// Append str to current display line
 			memcpy(p_editor_data->p_display_lines[display_line] + offset, str, (size_t)str_len);
@@ -283,127 +244,98 @@ int editor_data_insert(EDITOR_DATA *p_ed
 			p_editor_data->p_display_lines[display_line][offset + str_len + 1] = '\0';
 			p_editor_data->display_line_lengths[display_line] = offset + str_len + 1;
 
-			if (!done)
-			{
-				*p_display_line = display_line;
-				*p_offset = offset + str_len;
-				done = 1;
-			}
+			*p_display_line = display_line;
+			*p_offset = offset + str_len;
 		}
 		else
 		{
-			// Append rest part of current display line to insert buffer
-			memcpy(buf_insert + len_insert,
+			// Copy str to new data line
+			memcpy(p_data_line, str, (size_t)str_len);
+
+			// Copy rest part of current data line to new data line
+			memcpy(p_data_line + str_len,
 				   p_editor_data->p_display_lines[display_line] + offset,
-				   (size_t)(p_editor_data->display_line_lengths[display_line] - offset));
-			len_insert += (p_editor_data->display_line_lengths[display_line] - offset);
-			buf_insert[len_insert] = '\0';
+				   (size_t)(len_data_line - offset_data_line));
+
+			p_data_line[str_len + len_data_line - offset_data_line] = '\0';
 
 			// Add line ending to current display line (data line)
 			p_editor_data->p_display_lines[display_line][offset] = '\n';
 			p_editor_data->p_display_lines[display_line][offset + 1] = '\0';
 			p_editor_data->display_line_lengths[display_line] = offset + 1;
-		}
-
-		display_line++;
-		offset = 0;
-	}
-
-	for (i = display_line; len_insert > 0 && i <= last_display_line; i++)
-	{
-		len = split_line(buf_insert, SCREEN_COLS, &eol, &display_len_insert);
-		if (len != len_insert)
-		{
-			log_error("buf_insert is truncated at display_line(%ld): len(%d) != len_insert(%d), buf_insert: %s\n",
-					  i, len, len_insert, buf_insert);
-			return -3;
-		}
 
-		memcpy(buf_catenate, p_editor_data->p_display_lines[i], (size_t)p_editor_data->display_line_lengths[i]);
-		buf_catenate[p_editor_data->display_line_lengths[i]] = '\0';
-
-		len = split_line(buf_catenate, SCREEN_COLS - display_len_insert, &eol, &display_len);
-		if (len < offset) // offset out of current display line
-		{
-			offset -= len;
-			continue;
+			*p_display_line = display_line + 1;
+			*p_offset = str_len;
 		}
 
-		// move \n to next display line if current line is full
-		if (len > 0 && buf_catenate[len - 1] == '\n' && display_len + display_len_insert >= SCREEN_COLS)
-		{
-			len--;
-		}
+		split_line_total = last_display_line - display_line + 3;
 
-		memcpy(buf_catenate, p_editor_data->p_display_lines[i], (size_t)offset);
-		memcpy(buf_catenate + offset, buf_insert, (size_t)len_insert);
-		memcpy(buf_catenate + offset + len_insert, p_editor_data->p_display_lines[i] + offset, (size_t)(len - offset));
-		len_catenate = len_insert + len;
-		buf_catenate[len_catenate] = '\0';
+		// Set start display_line for spliting new data line
+		display_line++;
 
-		len_insert = p_editor_data->display_line_lengths[i] - len;
-		if (len_insert > 0)
-		{
-			memcpy(buf_insert, p_editor_data->p_display_lines[i] + len, (size_t)len_insert);
-			buf_insert[len_insert] = '\0';
-		}
+		*p_last_updated_line = p_editor_data->display_line_total;
+	}
+	else // insert str into current data line at offset_data_line
+	{
+		log_error("Insert %d chars into display_line = %d, offset = %d\n", str_len, display_line, offset);
 
-		memcpy(p_editor_data->p_display_lines[i], buf_catenate, (size_t)len_catenate);
-		p_editor_data->display_line_lengths[i] = len_catenate;
+		memmove(p_data_line + offset_data_line + str_len, p_data_line + offset_data_line, (size_t)(len_data_line - offset_data_line));
+		memcpy(p_data_line + offset_data_line, str, (size_t)str_len);
+		p_data_line[len_data_line + str_len] = '\0';
 
-		if (!done)
-		{
-			*p_display_line = i;
-			*p_offset = offset + str_len;
-			done = 1;
-		}
+		// Set p_data_line to head of current display line
+		p_data_line = p_editor_data->p_display_lines[display_line];
+		split_line_total = last_display_line - display_line + 3;
 
-		offset = 0;
+		*p_display_line = display_line;
+		*p_offset = offset + str_len;
 	}
 
-	*p_last_updated_line = MAX(i, *p_last_updated_line);
+	// Split current data line since beginning of current display line
+	split_line_total = split_data_lines(p_data_line, SCREEN_COLS, line_offsets, split_line_total);
+	log_error("Debug: split data line, display_line = %ld, j = %ld\n", display_line, split_line_total);
 
-	if (len_insert > 0)
+	for (i = 0; i < split_line_total; i++)
 	{
-		if (p_editor_data->display_line_total >= MAX_EDITOR_DATA_LINES)
+		if (display_line + i > last_display_line)
 		{
-			log_error("Append line error, display_line_total(%ld) reach limit(%d)\n",
-					  p_editor_data->display_line_total, MAX_EDITOR_DATA_LINES);
-			return -2;
-		}
-
-		// Prepare one blank display line after last_display_line
-		for (i = p_editor_data->display_line_total; i > last_display_line + 1; i--)
-		{
-			p_editor_data->p_display_lines[i] = p_editor_data->p_display_lines[i - 1];
-			p_editor_data->display_line_lengths[i] = p_editor_data->display_line_lengths[i - 1];
+			// Insert blank display line after last_display_line
+			if (p_editor_data->display_line_total >= MAX_EDITOR_DATA_LINES)
+			{
+				log_error("display_line_total over limit %d >= %d\n", p_editor_data->display_line_total, MAX_EDITOR_DATA_LINES);
+				return -3;
+			}
+			for (j = p_editor_data->display_line_total; j > last_display_line + 1; j--)
+			{
+				p_editor_data->p_display_lines[j] = p_editor_data->p_display_lines[j - 1];
+				p_editor_data->display_line_lengths[j] = p_editor_data->display_line_lengths[j - 1];
+			}
+			last_display_line++;
+			(p_editor_data->display_line_total)++;
 		}
-		p_editor_data->p_display_lines[last_display_line + 1] =
-			p_editor_data->p_display_lines[last_display_line] + p_editor_data->display_line_lengths[last_display_line];
-		p_editor_data->display_line_lengths[last_display_line + 1] = 0;
 
-		(p_editor_data->display_line_total)++;
-		last_display_line++;
+		p_editor_data->display_line_lengths[display_line + i] = line_offsets[i + 1] - line_offsets[i];
+		p_editor_data->p_display_lines[display_line + i] =
+			(i == 0
+				 ? p_data_line
+				 : (p_editor_data->p_display_lines[display_line + i - 1] + p_editor_data->display_line_lengths[display_line + i - 1]));
 
-		// Fill data into blank display line
-		memcpy(p_editor_data->p_display_lines[last_display_line], buf_insert, (size_t)len_insert);
-		p_editor_data->p_display_lines[last_display_line][len_insert] = '\0';
-		p_editor_data->display_line_lengths[last_display_line] = len_insert;
-
-		if (!done)
+		if (p_editor_data->display_line_lengths[display_line + i] > 0 &&
+			p_editor_data->p_display_lines[display_line + i][p_editor_data->display_line_lengths[display_line + i] - 1] == '\n')
 		{
-			*p_display_line = last_display_line;
-			*p_offset = str_len;
-			done = 1;
+			log_error("Debug: reach end of data line, i = %ld, j = %ld\n", i, split_line_total);
+			break;
 		}
-
-		*p_last_updated_line = MAX(last_display_line, *p_last_updated_line);
 	}
 
-	if (done && *p_offset >= SCREEN_COLS)
+	*p_last_updated_line = MAX(display_line + split_line_total - 1, *p_last_updated_line);
+
+	if (*p_offset > p_editor_data->display_line_lengths[*p_display_line] ||
+		(*p_offset > 0 && *p_offset == p_editor_data->display_line_lengths[*p_display_line] &&
+		 p_editor_data->p_display_lines[*p_display_line][*p_offset - 1] == '\n'))
 	{
+		*p_offset -= p_editor_data->display_line_lengths[*p_display_line];
 		(*p_display_line)++;
-		*p_offset = 0;
 
 		if (*p_display_line >= p_editor_data->display_line_total)
 		{
@@ -411,7 +343,7 @@ int editor_data_insert(EDITOR_DATA *p_ed
 		}
 	}
 
-	return done;
+	return 0;
 }
 
 int editor_data_delete(EDITOR_DATA *p_editor_data, long display_line, long offset,
@@ -439,7 +371,7 @@ int editor_display(EDITOR_DATA *p_editor
 	char buffer[MAX_EDITOR_DATA_LINE_LENGTH];
 	EDITOR_CTX ctx;
 	int ch = 0;
-	char insert_str[4];
+	char input_str[4];
 	int str_len = 0;
 	int input_ok;
 	int screen_current_row;
@@ -510,7 +442,7 @@ int editor_display(EDITOR_DATA *p_editor
 
 				if (ch > 127 && ch <= 255) // GBK
 				{
-					insert_str[str_len] = (char)(ch - 256);
+					input_str[str_len] = (char)(ch - 256);
 					str_len++;
 				}
 				else
@@ -522,7 +454,7 @@ int editor_display(EDITOR_DATA *p_editor
 				{
 					if (str_len == 0)
 					{
-						insert_str[0] = (char)ch;
+						input_str[0] = (char)ch;
 						str_len = 1;
 					}
 
@@ -533,9 +465,9 @@ int editor_display(EDITOR_DATA *p_editor
 					offset_out = offset_in;
 
 					if (editor_data_insert(p_editor_data, &display_line_out, &offset_out,
-										   insert_str, str_len, &last_updated_line) < 0)
+										   input_str, str_len, &last_updated_line) < 0)
 					{
-						log_error("editor_data_insert(%s) error\n", insert_str);
+						log_error("editor_data_insert(%s) error\n", input_str);
 						str_len = 0;
 					}
 					else