--- lbbs/src/editor.c 2025/06/12 03:16:35 1.14 +++ lbbs/src/editor.c 2025/09/30 06:05:48 1.42 @@ -14,26 +14,69 @@ * * ***************************************************************************/ -#include "editor.h" #include "bbs.h" +#include "common.h" +#include "editor.h" #include "io.h" #include "log.h" -#include "common.h" +#include "memory_pool.h" #include "str_process.h" #include -#include -#include - -#define _POSIX_C_SOURCE 200809L #include +#include #define EDITOR_ESC_DISPLAY_STR "\033[32m*\033[m" +#define EDITOR_MEM_POOL_LINE_PER_CHUNK 1000 +#define EDITOR_MEM_POOL_CHUNK_LIMIT (MAX_EDITOR_DATA_LINES / EDITOR_MEM_POOL_LINE_PER_CHUNK + 1) + +static MEMORY_POOL *p_mp_data_line; +static MEMORY_POOL *p_mp_editor_data; + +int editor_memory_pool_init(void) +{ + if (p_mp_data_line != NULL || p_mp_editor_data != NULL) + { + log_error("Editor mem pool already initialized\n"); + return -1; + } + + p_mp_data_line = memory_pool_init(MAX_EDITOR_DATA_LINE_LENGTH, EDITOR_MEM_POOL_LINE_PER_CHUNK, EDITOR_MEM_POOL_CHUNK_LIMIT); + if (p_mp_data_line == NULL) + { + log_error("Memory pool init error\n"); + return -2; + } + + p_mp_editor_data = memory_pool_init(sizeof(EDITOR_DATA), 1, 1); + if (p_mp_data_line == NULL) + { + log_error("Memory pool init error\n"); + return -3; + } + + return 0; +} + +void editor_memory_pool_cleanup(void) +{ + if (p_mp_data_line != NULL) + { + memory_pool_cleanup(p_mp_data_line); + p_mp_data_line = NULL; + } + + if (p_mp_editor_data != NULL) + { + memory_pool_cleanup(p_mp_editor_data); + p_mp_editor_data = NULL; + } +} 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 line_offsets[MAX_EDITOR_DATA_LINES + 1]; long current_data_line_length = 0; long i; @@ -43,14 +86,15 @@ EDITOR_DATA *editor_data_load(const char return NULL; } - p_editor_data = malloc(sizeof(EDITOR_DATA)); + p_editor_data = memory_pool_alloc(p_mp_editor_data); if (p_editor_data == NULL) { - log_error("malloc(EDITOR_DATA) error: OOM\n"); + log_error("memory_pool_alloc() error\n"); return NULL; } - p_editor_data->display_line_total = split_data_lines(p_data, SCREEN_COLS, line_offsets, MAX_EDITOR_DATA_LINES); + p_editor_data->display_line_total = split_data_lines(p_data, SCREEN_COLS, line_offsets, MAX_EDITOR_DATA_LINES + 1, + 0, p_editor_data->display_line_widths); for (i = 0; i < p_editor_data->display_line_total; i++) { @@ -61,10 +105,10 @@ EDITOR_DATA *editor_data_load(const char (p_editor_data->display_line_lengths[i - 1] > 0 && p_data[line_offsets[i - 1] + p_editor_data->display_line_lengths[i - 1] - 1] == '\n')) { // Allocate new data line - p_data_line = malloc(MAX_EDITOR_DATA_LINE_LENGTH); + p_data_line = memory_pool_alloc(p_mp_data_line); if (p_data_line == NULL) { - log_error("malloc(MAX_EDITOR_DATA_LINE_LENGTH * %d) error: OOM\n", i); + log_error("memory_pool_alloc() error: i = %d\n", i); // Cleanup editor_data_cleanup(p_editor_data); return NULL; @@ -80,10 +124,20 @@ 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]; + + // Trim \n from last line + if (i + 1 == p_editor_data->display_line_total && + p_editor_data->display_line_lengths[i] > 0 && + p_editor_data->p_display_lines[i][p_editor_data->display_line_lengths[i] - 1] == '\n') + { + p_editor_data->display_line_lengths[i]--; + p_editor_data->display_line_widths[i]--; + current_data_line_length--; + } p_data_line[current_data_line_length] = '\0'; } - 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); + memset(p_editor_data->p_display_lines + p_editor_data->display_line_total, 0, MAX_EDITOR_DATA_LINES - (size_t)p_editor_data->display_line_total); return p_editor_data; } @@ -137,17 +191,17 @@ void editor_data_cleanup(EDITOR_DATA *p_ if (p_editor_data->display_line_lengths[i] > 0 && p_editor_data->p_display_lines[i][p_editor_data->display_line_lengths[i] - 1] == '\n') { - free(p_data_line); + memory_pool_free(p_mp_data_line, p_data_line); p_data_line = NULL; } } if (p_data_line != NULL) { - free(p_data_line); + memory_pool_free(p_mp_data_line, p_data_line); } - free(p_editor_data); + memory_pool_free(p_mp_editor_data, p_editor_data); } int editor_data_insert(EDITOR_DATA *p_editor_data, long *p_display_line, long *p_offset, @@ -160,8 +214,12 @@ int editor_data_insert(EDITOR_DATA *p_ed long offset_data_line; long last_display_line; // of data line long line_offsets[MAX_EDITOR_DATA_LINE_LENGTH + 1]; + int line_widths[MAX_EDITOR_DATA_LINE_LENGTH + 1]; long split_line_total; - long i, j; + long i; + int len; + int eol; + int display_len; if (p_editor_data == NULL || p_last_updated_line == NULL) { @@ -169,19 +227,6 @@ int editor_data_insert(EDITOR_DATA *p_ed return -1; } - // Get accurate offset of first character of CJK at offset position - for (i = 0; i < offset; i++) - { - if (p_editor_data->p_display_lines[display_line][i] < 0 || p_editor_data->p_display_lines[display_line][i] > 127) // GBK - { - i++; - } - } - if (i > offset) // offset was skipped - { - offset--; - } - // Get length of current data line len_data_line = 0; p_data_line = p_editor_data->p_display_lines[display_line]; @@ -211,24 +256,27 @@ int editor_data_insert(EDITOR_DATA *p_ed } // Split current data line if over-length - if (len_data_line + str_len + 1 > MAX_EDITOR_DATA_LINE_LENGTH || str[0] == CR) + if (len_data_line + str_len + 2 > MAX_EDITOR_DATA_LINE_LENGTH || str[0] == CR) { if (p_editor_data->display_line_total >= MAX_EDITOR_DATA_LINES) { +#ifdef _DEBUG log_error("Split line error, display_line_total(%ld) reach limit(%d)\n", p_editor_data->display_line_total, MAX_EDITOR_DATA_LINES); +#endif + return -2; } // Allocate new data line - p_data_line = malloc(MAX_EDITOR_DATA_LINE_LENGTH); + p_data_line = memory_pool_alloc(p_mp_data_line); if (p_data_line == NULL) { - log_error("malloc(MAX_EDITOR_DATA_LINE_LENGTH) error: OOM\n"); + log_error("memory_pool_alloc() error\n"); return -2; } - if (offset_data_line + str_len + 1 >= MAX_EDITOR_DATA_LINE_LENGTH || str[0] == CR) + if (offset_data_line + str_len + 2 >= MAX_EDITOR_DATA_LINE_LENGTH || str[0] == CR) { if (str[0] == CR) { @@ -274,6 +322,10 @@ int editor_data_insert(EDITOR_DATA *p_ed *p_offset = offset + str_len; } + // Update display width of current display line + len = split_line(p_editor_data->p_display_lines[display_line], SCREEN_COLS, &eol, &display_len, 0); + p_editor_data->display_line_widths[display_line] = display_len; + split_line_total = last_display_line - display_line + 3; // Set start display_line for spliting new data line @@ -296,7 +348,7 @@ int editor_data_insert(EDITOR_DATA *p_ed } // 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); + split_line_total = split_data_lines(p_data_line, SCREEN_COLS, line_offsets, split_line_total, 0, line_widths); for (i = 0; i < split_line_total; i++) { @@ -305,19 +357,52 @@ int editor_data_insert(EDITOR_DATA *p_ed // Insert blank display line after last_display_line if (p_editor_data->display_line_total >= MAX_EDITOR_DATA_LINES) { +#ifdef _DEBUG 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]; +#endif + + // Terminate prior display line with \n, to avoid error on cleanup + if (display_line + i - 1 >= 0 && p_editor_data->display_line_lengths[display_line + i - 1] > 0) + { + len = split_line(p_editor_data->p_display_lines[display_line + i - 1], SCREEN_COLS - 1, &eol, &display_len, 0); + p_editor_data->p_display_lines[display_line + i - 1][len] = '\n'; + p_editor_data->p_display_lines[display_line + i - 1][len + 1] = '\0'; + p_editor_data->display_line_lengths[display_line + i - 1] = len + 1; + p_editor_data->display_line_widths[display_line + i - 1] = display_len; + } + if (*p_offset >= p_editor_data->display_line_lengths[*p_display_line]) + { + *p_offset = p_editor_data->display_line_lengths[*p_display_line] - 1; + } + break; } + + // 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]; + // p_editor_data->display_line_widths[j] = p_editor_data->display_line_widths[j - 1]; + // } + memmove(p_editor_data->p_display_lines + last_display_line + 2, + p_editor_data->p_display_lines + last_display_line + 1, + (size_t)(p_editor_data->display_line_total - last_display_line - 1) * + sizeof(p_editor_data->p_display_lines[last_display_line + 1])); + memmove(p_editor_data->display_line_lengths + last_display_line + 2, + p_editor_data->display_line_lengths + last_display_line + 1, + (size_t)(p_editor_data->display_line_total - last_display_line - 1) * + sizeof(p_editor_data->display_line_lengths[last_display_line + 1])); + memmove(p_editor_data->display_line_widths + last_display_line + 2, + p_editor_data->display_line_widths + last_display_line + 1, + (size_t)(p_editor_data->display_line_total - last_display_line - 1) * + sizeof(p_editor_data->display_line_widths[last_display_line + 1])); + last_display_line++; + *p_last_updated_line = p_editor_data->display_line_total; (p_editor_data->display_line_total)++; } p_editor_data->display_line_lengths[display_line + i] = line_offsets[i + 1] - line_offsets[i]; + p_editor_data->display_line_widths[display_line + i] = line_widths[i]; p_editor_data->p_display_lines[display_line + i] = (i == 0 ? p_data_line @@ -334,29 +419,45 @@ int editor_data_insert(EDITOR_DATA *p_ed if (*p_offset >= p_editor_data->display_line_lengths[*p_display_line]) { - *p_offset -= p_editor_data->display_line_lengths[*p_display_line]; - (*p_display_line)++; + if (*p_display_line + 1 < p_editor_data->display_line_total) + { + *p_offset -= p_editor_data->display_line_lengths[*p_display_line]; + (*p_display_line)++; + } + } - if (*p_display_line >= p_editor_data->display_line_total) + // Prevent the last display line from being over-length + if (p_editor_data->display_line_total == MAX_EDITOR_DATA_LINES) + { + len = split_line(p_editor_data->p_display_lines[p_editor_data->display_line_total - 1], SCREEN_COLS - 1, &eol, &display_len, 0); + p_editor_data->p_display_lines[p_editor_data->display_line_total - 1][len] = '\0'; + p_editor_data->display_line_lengths[p_editor_data->display_line_total - 1] = len; + p_editor_data->display_line_widths[p_editor_data->display_line_total - 1] = display_len; + if (*p_display_line + 1 >= p_editor_data->display_line_total) { - log_error("*p_display_line(%d) >= display_line_total(%d)\n", *p_display_line, p_editor_data->display_line_total); + *p_offset = MIN(*p_offset, len); + *p_display_line = p_editor_data->display_line_total - 1; } } return 0; } -int editor_data_delete(EDITOR_DATA *p_editor_data, long display_line, long offset, +int editor_data_delete(EDITOR_DATA *p_editor_data, long *p_display_line, long *p_offset, long *p_last_updated_line) { + long display_line = *p_display_line; + long offset = *p_offset; char *p_data_line = NULL; long len_data_line; long offset_data_line; long last_display_line; // of data line long line_offsets[MAX_EDITOR_DATA_LINE_LENGTH + 1]; + int line_widths[MAX_EDITOR_DATA_LINE_LENGTH + 1]; long split_line_total; long i, j; int str_len = 0; + char c; if (p_editor_data == NULL || p_last_updated_line == NULL) { @@ -364,19 +465,6 @@ int editor_data_delete(EDITOR_DATA *p_ed return -1; } - // Get accurate offset of first character of CJK at offset position - for (i = 0; i < offset; i++) - { - if (p_editor_data->p_display_lines[display_line][i] < 0 || p_editor_data->p_display_lines[display_line][i] > 127) // GBK - { - i++; - } - } - if (i > offset) // offset was skipped - { - offset--; - } - // Get length of current data line len_data_line = 0; p_data_line = p_editor_data->p_display_lines[display_line]; @@ -405,20 +493,30 @@ int editor_data_delete(EDITOR_DATA *p_ed } } + if (offset_data_line >= len_data_line) // end-of-line + { + return 0; + } + // Check str to be deleted if (p_data_line[offset_data_line] > 0 && p_data_line[offset_data_line] < 127) { str_len = 1; } - else if (p_data_line[offset_data_line + 1] < 0 || p_data_line[offset_data_line] > 127) // GBK + else if (p_data_line[offset_data_line] & 0b10000000) // head of multi-byte character { - str_len = 2; + str_len = 1; + c = (p_data_line[offset_data_line] & 0b01110000) << 1; + while (c & 0b10000000) + { + str_len++; + c = (c & 0b01111111) << 1; + } } else { - log_error("Some strange character at display_line %ld, offset %ld: %d %d %d %d\n", - display_line, offset, p_data_line[offset_data_line], p_data_line[offset_data_line + 1], - p_data_line[offset_data_line + 2], p_data_line[offset_data_line + 3]); + log_error("Some strange character at display_line %ld, offset %ld: %d %d\n", + display_line, offset, p_data_line[offset_data_line], p_data_line[offset_data_line + 1]); str_len = 1; } @@ -455,7 +553,7 @@ int editor_data_delete(EDITOR_DATA *p_ed p_data_line[offset_data_line + len_data_line] = '\0'; // Recycle next data line - free(p_editor_data->p_display_lines[display_line + 1]); + memory_pool_free(p_mp_data_line, p_editor_data->p_display_lines[display_line + 1]); } else { @@ -469,11 +567,12 @@ int editor_data_delete(EDITOR_DATA *p_ed split_line_total = last_display_line - display_line + 2; // 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); + split_line_total = split_data_lines(p_data_line, SCREEN_COLS, line_offsets, split_line_total, 0, line_widths); for (i = 0; i < split_line_total; i++) { p_editor_data->display_line_lengths[display_line + i] = line_offsets[i + 1] - line_offsets[i]; + p_editor_data->display_line_widths[display_line + i] = line_widths[i]; p_editor_data->p_display_lines[display_line + i] = (i == 0 ? p_data_line @@ -488,21 +587,36 @@ int editor_data_delete(EDITOR_DATA *p_ed *p_last_updated_line = display_line + MIN(i, split_line_total - 1); - if (display_line + i < last_display_line) + if (*p_last_updated_line < last_display_line) { // Remove redundant display line after last_display_line - for (j = last_display_line + 1; j < p_editor_data->display_line_total; j++) - { - p_editor_data->p_display_lines[j - (last_display_line - (display_line + i))] = p_editor_data->p_display_lines[j]; - p_editor_data->display_line_lengths[j - (last_display_line - (display_line + i))] = p_editor_data->display_line_lengths[j]; - } - - (p_editor_data->display_line_total) -= (last_display_line - (display_line + i)); - last_display_line = display_line + i; - - *p_last_updated_line = p_editor_data->display_line_total - 1; + // for (j = last_display_line + 1; j < p_editor_data->display_line_total; j++) + // { + // p_editor_data->p_display_lines[j - (last_display_line - *p_last_updated_line)] = p_editor_data->p_display_lines[j]; + // p_editor_data->display_line_lengths[j - (last_display_line - *p_last_updated_line)] = p_editor_data->display_line_lengths[j]; + // p_editor_data->display_line_widths[j - (last_display_line - *p_last_updated_line)] = p_editor_data->display_line_widths[j]; + // } + memmove(p_editor_data->p_display_lines + *p_last_updated_line + 1, + p_editor_data->p_display_lines + last_display_line + 1, + (size_t)(p_editor_data->display_line_total - last_display_line - 1) * + sizeof(p_editor_data->p_display_lines[last_display_line + 1])); + memmove(p_editor_data->display_line_lengths + *p_last_updated_line + 1, + p_editor_data->display_line_lengths + last_display_line + 1, + (size_t)(p_editor_data->display_line_total - last_display_line - 1) * + sizeof(p_editor_data->display_line_lengths[last_display_line + 1])); + memmove(p_editor_data->display_line_widths + *p_last_updated_line + 1, + p_editor_data->display_line_widths + last_display_line + 1, + (size_t)(p_editor_data->display_line_total - last_display_line - 1) * + sizeof(p_editor_data->display_line_widths[last_display_line + 1])); + + j = p_editor_data->display_line_total; + (p_editor_data->display_line_total) -= (last_display_line - *p_last_updated_line); + *p_last_updated_line = MAX(j - 1, *p_last_updated_line); } + // Return real offset + *p_offset = offset; + return str_len; } @@ -512,7 +626,10 @@ static int editor_display_key_handler(in { case 0: // Set msg snprintf(p_ctx->msg, sizeof(p_ctx->msg), - "| ˳[\033[32mCtrl-C\033[33m] | [\033[32mh\033[33m] |"); + "| 退出[\033[32mCtrl-W\033[33m] |"); + break; + case KEY_CSI: + *p_key = KEY_ESC; break; } @@ -526,6 +643,7 @@ int editor_display(EDITOR_DATA *p_editor EDITOR_CTX ctx; int ch = 0; char input_str[4]; + char c; int str_len = 0; int input_ok; const int screen_begin_row = 1; @@ -553,8 +671,7 @@ int editor_display(EDITOR_DATA *p_editor return ch; } - loop = 1; - while (!SYS_server_exit && loop) + for (loop = 1; !SYS_server_exit && loop;) { if (line_current >= p_editor_data->display_line_total || output_current_row > output_end_row) { @@ -562,14 +679,14 @@ int editor_display(EDITOR_DATA *p_editor snprintf(buffer, sizeof(buffer), "\033[1;44;33m[\033[32m%ld\033[33m;\033[32m%ld\033[33m] " - "\033[32m%ld\033[33m/\033[32m%ld\033[33m [\033[32m%s\033[33m] " + "第\033[32m%ld\033[33m/\033[32m%ld\033[33m行 [\033[32m%s\033[33m] " "%s", row_pos, col_pos, ctx.line_cursor, p_editor_data->display_line_total, - key_insert ? "" : "д", + key_insert ? "插入" : "替换", ctx.msg); - len = split_line(buffer, SCREEN_COLS, &eol, &display_len); + len = split_line(buffer, SCREEN_COLS, &eol, &display_len, 1); for (; display_len < SCREEN_COLS; display_len++) { buffer[len++] = ' '; @@ -583,46 +700,65 @@ int editor_display(EDITOR_DATA *p_editor moveto((int)row_pos, (int)col_pos); iflush(); - input_ok = 0; - while (!SYS_server_exit && !input_ok) + str_len = 0; + ch = igetch_t(MAX_DELAY_TIME); + while (!SYS_server_exit) { - ch = igetch_t(MAX_DELAY_TIME); - input_ok = 1; - // extended key handler if (editor_display_key_handler(&ch, &ctx) != 0) { goto cleanup; } - if (ch > 127 && ch <= 255) // GBK - { - input_str[str_len] = (char)(ch - 256); - str_len++; - } - else + if (ch < 256 && (ch & 0b10000000)) // head of multi-byte character { str_len = 0; + c = (char)(ch & 0b11110000); + while (c & 0b10000000) + { + input_str[str_len] = (char)(ch - 256); + str_len++; + c = (c & 0b01111111) << 1; + + if ((c & 0b10000000) == 0) // Input completed + { + break; + } + + // Expect additional bytes of input + ch = igetch(100); // 0.1 second + if (ch == KEY_NULL || ch == KEY_TIMEOUT) // Ignore received bytes if no futher input + { +#ifdef _DEBUG + log_error("Ignore %d bytes of incomplete UTF8 character\n", str_len); +#endif + str_len = 0; + break; + } + } } - if ((ch >= 32 && ch < 127) || (ch > 127 && ch <= 255 && str_len == 2) || // Printable character or GBK - ch == CR || ch == KEY_ESC) // Special character + if ((ch >= 32 && ch < 127) || str_len >= 2 || // Printable character or multi-byte character + ch == CR || ch == KEY_ESC) // Special character { - if (str_len == 0) + BBS_last_access_tm = time(NULL); + + if (str_len == 0) // ch >= 32 && ch < 127 { input_str[0] = (char)ch; str_len = 1; } - last_updated_line = line_current; display_line_in = line_current - output_current_row + row_pos; - offset_in = col_pos - 1; + offset_in = split_line(p_editor_data->p_display_lines[display_line_in], (int)col_pos - 1, &eol, &display_len, 0); display_line_out = display_line_in; offset_out = offset_in; + last_updated_line = display_line_in; + if (!key_insert) // overwrite { - if (editor_data_delete(p_editor_data, display_line_in, offset_in, + if (editor_data_delete(p_editor_data, &display_line_out, &offset_out, &last_updated_line) < 0) { log_error("editor_data_delete() error\n"); @@ -633,12 +769,9 @@ int editor_display(EDITOR_DATA *p_editor input_str, str_len, &last_updated_line) < 0) { log_error("editor_data_insert(str_len=%d) error\n", str_len); - str_len = 0; } else { - str_len = 0; - output_end_row = MIN(SCREEN_ROWS - 1, output_current_row + (int)(last_updated_line - line_current)); line_current -= (output_current_row - row_pos); output_current_row = (int)row_pos; @@ -651,7 +784,8 @@ int editor_display(EDITOR_DATA *p_editor clrtoeol(); for (i = 0; i < scroll_rows; i++) { - prints("\033[S"); // Scroll up 1 line + // prints("\033[S"); // Scroll up 1 line + prints("\n"); // Legacy Cterm only works with this line } output_current_row -= scroll_rows; @@ -666,42 +800,76 @@ int editor_display(EDITOR_DATA *p_editor { row_pos += (display_line_out - display_line_in); } - col_pos = offset_out + 1; + + if (offset_out != offset_in) + { + if (display_line_out != display_line_in) + { + col_pos = 1; + } + if (offset_out > 0) + { + col_pos += (str_len == 1 ? 1 : 2); + } + } + } + + if (display_line_out != display_line_in) // Output on line change + { + break; } + ch = igetch(0); + if (ch == KEY_NULL || ch == KEY_TIMEOUT) // Output if no futher input + { + break; + } + + str_len = 0; continue; } else if (ch == KEY_DEL || ch == BACKSPACE) // Del { + BBS_last_access_tm = time(NULL); + if (ch == BACKSPACE) { - col_pos--; + if (line_current - output_current_row + row_pos <= 0 && col_pos <= 1) // Forbidden + { + break; // force output prior operation result if any + } + + offset_in = split_line(p_editor_data->p_display_lines[line_current - output_current_row + row_pos], + (int)col_pos - 1, &eol, &display_len, 0); + if (offset_in >= 1 && p_editor_data->p_display_lines[line_current - output_current_row + row_pos][offset_in - 1] < 0) // UTF8 + { + col_pos = display_len - 1; + } + else + { + col_pos = display_len; + } + if (col_pos < 1 && line_current - output_current_row + row_pos >= 0) { row_pos--; - col_pos = MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos]); + col_pos = MAX(1, p_editor_data->display_line_widths[line_current - output_current_row + row_pos]); } } - if ((str_len = editor_data_delete(p_editor_data, line_current - output_current_row + row_pos, col_pos - 1, + display_line_in = line_current - output_current_row + row_pos; + offset_in = split_line(p_editor_data->p_display_lines[display_line_in], (int)col_pos - 1, &eol, &display_len, 0); + display_line_out = display_line_in; + offset_out = offset_in; + + if ((str_len = editor_data_delete(p_editor_data, &display_line_out, &offset_out, &last_updated_line)) < 0) { log_error("editor_data_delete() error\n"); } else { - if (ch == BACKSPACE) - { - for (i = 1; i < str_len; i++) - { - col_pos--; - if (col_pos < 1 && line_current - output_current_row + row_pos >= 0) - { - row_pos--; - col_pos = MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos]); - } - } - } + col_pos = display_len + 1; // Set col_pos to accurate pos output_end_row = MIN(SCREEN_ROWS - 1, output_current_row + (int)(last_updated_line - line_current)); line_current -= (output_current_row - row_pos); @@ -725,19 +893,34 @@ int editor_display(EDITOR_DATA *p_editor row_pos += scroll_rows; output_current_row = screen_begin_row; output_end_row = SCREEN_ROWS - 1; - clrline(output_current_row, SCREEN_ROWS); } + + clrline(output_current_row, output_end_row); + } + + if (display_line_out != display_line_in) // Output on line change + { + break; } + ch = igetch(0); + if (ch == KEY_NULL || ch == KEY_TIMEOUT) // Output if no futher input + { + break; + } + + str_len = 0; continue; } + input_ok = 1; switch (ch) { case KEY_NULL: case KEY_TIMEOUT: goto cleanup; - case Ctrl('C'): + case Ctrl('W'): + case Ctrl('X'): loop = 0; break; case Ctrl('S'): // Start of line @@ -746,17 +929,38 @@ int editor_display(EDITOR_DATA *p_editor break; case Ctrl('E'): // End of line case KEY_CTRL_RIGHT: - col_pos = MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos]); + if (line_current - output_current_row + row_pos == p_editor_data->display_line_total - 1) // row_pos at end line + { + // last display line does NOT have \n in the end + col_pos = p_editor_data->display_line_widths[line_current - output_current_row + row_pos] + 1; + break; + } + col_pos = MAX(1, p_editor_data->display_line_widths[line_current - output_current_row + row_pos]); break; case Ctrl('T'): // Top of screen case KEY_CTRL_UP: row_pos = screen_begin_row; - col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos])); + col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_widths[line_current - output_current_row + row_pos])); break; case Ctrl('B'): // Bottom of screen case KEY_CTRL_DOWN: - row_pos = SCREEN_ROWS - 1; - col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos])); + if (p_editor_data->display_line_total < screen_row_total) + { + row_pos = p_editor_data->display_line_total; + } + else + { + row_pos = SCREEN_ROWS - 1; + } + if (line_current + (screen_row_total - (output_current_row - screen_begin_row)) >= p_editor_data->display_line_total) // Reach end + { + // last display line does NOT have \n in the end + col_pos = MIN(col_pos, p_editor_data->display_line_widths[line_current - output_current_row + row_pos] + 1); + } + else + { + col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_widths[line_current - output_current_row + row_pos])); + } break; case KEY_INS: key_insert = !key_insert; @@ -777,20 +981,29 @@ int editor_display(EDITOR_DATA *p_editor if (p_editor_data->display_line_total < screen_row_total) { row_pos = p_editor_data->display_line_total; - col_pos = MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos]); + col_pos = p_editor_data->display_line_widths[line_current - output_current_row + row_pos] + 1; break; } line_current = p_editor_data->display_line_total - screen_row_total; output_current_row = screen_begin_row; output_end_row = SCREEN_ROWS - 1; row_pos = SCREEN_ROWS - 1; - col_pos = MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos]); + col_pos = p_editor_data->display_line_widths[line_current - output_current_row + row_pos] + 1; clrline(output_current_row, SCREEN_ROWS); break; case KEY_LEFT: - if (col_pos > 1) + offset_in = split_line(p_editor_data->p_display_lines[line_current - output_current_row + row_pos], + (int)col_pos - 1, &eol, &display_len, 0); + if (offset_in >= 1 && p_editor_data->p_display_lines[line_current - output_current_row + row_pos][offset_in - 1] < 0) // UTF8 + { + col_pos = display_len - 1; + } + else + { + col_pos = display_len; + } + if (col_pos >= 1) { - col_pos--; break; } col_pos = SCREEN_COLS; // continue to KEY_UP @@ -798,7 +1011,7 @@ int editor_display(EDITOR_DATA *p_editor if (row_pos > screen_begin_row) { row_pos--; - col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos])); + col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_widths[line_current - output_current_row + row_pos])); break; } if (line_current - output_current_row < 0) // Reach begin @@ -811,14 +1024,24 @@ int editor_display(EDITOR_DATA *p_editor // screen_end_line = begin_line; // prints("\033[T"); // Scroll down 1 line output_end_row = SCREEN_ROWS - 1; // Legacy Fterm only works with this line - col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos])); + col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_widths[line_current - output_current_row + row_pos])); break; case KEY_SPACE: break; case KEY_RIGHT: - if (col_pos < p_editor_data->display_line_lengths[line_current - output_current_row + row_pos]) + offset_in = split_line(p_editor_data->p_display_lines[line_current - output_current_row + row_pos], + (int)col_pos - 1, &eol, &display_len, 0); + if (offset_in < p_editor_data->display_line_lengths[line_current - output_current_row + row_pos] && + p_editor_data->p_display_lines[line_current - output_current_row + row_pos][offset_in] < 0) // UTF8 + { + col_pos = display_len + 3; + } + else + { + col_pos = display_len + 2; + } + if (col_pos <= p_editor_data->display_line_widths[line_current - output_current_row + row_pos]) { - col_pos++; break; } col_pos = 1; // continue to KEY_DOWN @@ -826,21 +1049,23 @@ int editor_display(EDITOR_DATA *p_editor if (row_pos < MIN(screen_row_total, p_editor_data->display_line_total)) { row_pos++; - col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos])); + col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_widths[line_current - output_current_row + row_pos])); break; } - if (line_current + (screen_row_total - (output_current_row - screen_begin_row)) >= p_editor_data->display_line_total) // Reach end + if (line_current - output_current_row + row_pos == p_editor_data->display_line_total - 1) // row_pos at end line { - col_pos = MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos]); + // last display line does NOT have \n in the end + col_pos = p_editor_data->display_line_widths[line_current - output_current_row + row_pos] + 1; break; } line_current += (screen_row_total - (output_current_row - screen_begin_row)); output_current_row = screen_row_total; output_end_row = SCREEN_ROWS - 1; - col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos])); + col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_widths[line_current - output_current_row + row_pos])); moveto(SCREEN_ROWS, 0); clrtoeol(); - prints("\033[S"); // Scroll up 1 line + // prints("\033[S"); // Scroll up 1 line + prints("\n"); // Legacy Cterm only works with this line break; case KEY_PGUP: if (line_current - output_current_row < 0) // Reach begin @@ -854,7 +1079,7 @@ int editor_display(EDITOR_DATA *p_editor } output_current_row = screen_begin_row; output_end_row = SCREEN_ROWS - 1; - col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos])); + col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_widths[line_current - output_current_row + row_pos])); clrline(output_current_row, SCREEN_ROWS); break; case KEY_PGDN: @@ -869,7 +1094,7 @@ int editor_display(EDITOR_DATA *p_editor } output_current_row = screen_begin_row; output_end_row = SCREEN_ROWS - 1; - col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos])); + col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_widths[line_current - output_current_row + row_pos])); clrline(output_current_row, SCREEN_ROWS); break; case KEY_F1: @@ -895,12 +1120,14 @@ int editor_display(EDITOR_DATA *p_editor break; } - BBS_last_access_tm = time(0); + BBS_last_access_tm = time(NULL); if (input_ok) { break; } + + ch = igetch_t(MAX_DELAY_TIME); } continue;