--- lbbs/src/editor.c 2025/06/11 11:01:07 1.10 +++ lbbs/src/editor.c 2025/06/17 13:17:04 1.28 @@ -20,20 +20,66 @@ #include "log.h" #include "common.h" #include "str_process.h" +#include "memory_pool.h" #include #include #include - -#define _POSIX_C_SOURCE 200809L #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, j; + long i; if (p_data == NULL) { @@ -41,15 +87,14 @@ 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->data_line_total = 0; - 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); for (i = 0; i < p_editor_data->display_line_total; i++) { @@ -59,27 +104,15 @@ EDITOR_DATA *editor_data_load(const char current_data_line_length + p_editor_data->display_line_lengths[i] + 1 > MAX_EDITOR_DATA_LINE_LENGTH || (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')) { - if (p_editor_data->data_line_total >= MAX_EDITOR_DATA_LINES) - { - log_error("Append line error, data_line_total(%ld) reach limit(%d)\n", p_editor_data->data_line_total, MAX_EDITOR_DATA_LINES); - return NULL; - } - // 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 - for (j = p_editor_data->data_line_total - 1; j >= 0; j--) - { - free(p_editor_data->p_data_lines[j]); - } - free(p_editor_data); + editor_data_cleanup(p_editor_data); return NULL; } - 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; @@ -91,11 +124,19 @@ 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]--; + current_data_line_length--; + } 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); + 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; } @@ -131,6 +172,7 @@ long editor_data_save(const EDITOR_DATA void editor_data_cleanup(EDITOR_DATA *p_editor_data) { + char *p_data_line = NULL; long i; if (p_editor_data == NULL) @@ -138,13 +180,27 @@ void editor_data_cleanup(EDITOR_DATA *p_ return; } - for (i = p_editor_data->data_line_total - 1; i >= 0; i--) + for (i = 0; i < p_editor_data->display_line_total; i++) { - free(p_editor_data->p_data_lines[i]); - p_editor_data->p_data_lines[i] = NULL; + if (p_data_line == NULL) + { + p_data_line = p_editor_data->p_display_lines[i]; + } + + 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') + { + memory_pool_free(p_mp_data_line, p_data_line); + p_data_line = NULL; + } } - free(p_editor_data); + if (p_data_line != NULL) + { + memory_pool_free(p_mp_data_line, p_data_line); + } + + 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, @@ -159,6 +215,9 @@ int editor_data_insert(EDITOR_DATA *p_ed long line_offsets[MAX_EDITOR_DATA_LINE_LENGTH + 1]; long split_line_total; long i, j; + int len; + int eol; + int display_len; if (p_editor_data == NULL || p_last_updated_line == NULL) { @@ -166,10 +225,18 @@ int editor_data_insert(EDITOR_DATA *p_ed return -1; } + // Validate str + if ((str_len == 1 && str[0] <= 0) || + (str_len == 2 && (str[0] >= 0 || str[1] >= 0))) + { + log_error("Invalid input str, len=%d\n", str_len); + return -2; + } + // 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 + if (p_editor_data->p_display_lines[display_line][i] < 0) // GBK { i++; } @@ -210,22 +277,20 @@ 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 (p_editor_data->display_line_total >= MAX_EDITOR_DATA_LINES || p_editor_data->data_line_total >= MAX_EDITOR_DATA_LINES) + if (p_editor_data->display_line_total >= MAX_EDITOR_DATA_LINES) { - log_error("Split line error, display_line_total(%ld) or data_line_total(%ld) reach limit(%d)\n", - p_editor_data->display_line_total, p_editor_data->data_line_total, MAX_EDITOR_DATA_LINES); + // log_error("Split line error, display_line_total(%ld) reach limit(%d)\n", + // p_editor_data->display_line_total, MAX_EDITOR_DATA_LINES); 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; } - 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 + 1 >= MAX_EDITOR_DATA_LINE_LENGTH || str[0] == CR) { @@ -295,7 +360,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); for (i = 0; i < split_line_total; i++) { @@ -304,8 +369,20 @@ 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) { - log_error("display_line_total over limit %d >= %d\n", p_editor_data->display_line_total, MAX_EDITOR_DATA_LINES); - return -3; + // log_error("display_line_total over limit %d >= %d\n", p_editor_data->display_line_total, MAX_EDITOR_DATA_LINES); + // 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; + } + 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--) { @@ -331,25 +408,36 @@ int editor_data_insert(EDITOR_DATA *p_ed *p_last_updated_line = MAX(display_line + MIN(i, 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')) + 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; + 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; @@ -368,7 +456,7 @@ int editor_data_delete(EDITOR_DATA *p_ed // 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 + if (p_editor_data->p_display_lines[display_line][i] < 0) // GBK { i++; } @@ -406,20 +494,24 @@ 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 + 1] < 0) // GBK { str_len = 2; } 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; } @@ -429,7 +521,6 @@ int editor_data_delete(EDITOR_DATA *p_ed { if (display_line + 1 >= p_editor_data->display_line_total) // No additional display line (data line) { - log_common("Debug: No additional display line: %ld + 1 >= %ld\n", display_line, p_editor_data->display_line_total); return 0; } @@ -449,8 +540,6 @@ int editor_data_delete(EDITOR_DATA *p_ed if (offset_data_line + len_data_line + 1 > MAX_EDITOR_DATA_LINE_LENGTH) // No enough buffer to merge current data line with next data line { - log_common("Debug: No enough buffer to merge with next data line: %ld > %ld\n", - offset_data_line + len_data_line + 1, MAX_EDITOR_DATA_LINE_LENGTH); return 0; } @@ -459,7 +548,7 @@ int editor_data_delete(EDITOR_DATA *p_ed p_data_line[offset_data_line + len_data_line] = '\0'; // Recycle next data line - // TODO: 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 { @@ -473,7 +562,7 @@ 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); for (i = 0; i < split_line_total; i++) { @@ -492,21 +581,23 @@ 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->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_total) -= (last_display_line - (display_line + i)); - last_display_line = display_line + i; - - *p_last_updated_line = p_editor_data->display_line_total - 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; } @@ -516,7 +607,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; } @@ -532,10 +626,10 @@ int editor_display(EDITOR_DATA *p_editor char input_str[4]; int str_len = 0; int input_ok; - int screen_current_row; const int screen_begin_row = 1; - int screen_end_row = SCREEN_ROWS - 1; - const int screen_row_total = screen_end_row - screen_begin_row + 1; + const int screen_row_total = SCREEN_ROWS - screen_begin_row; + int output_current_row = screen_begin_row; + int output_end_row = SCREEN_ROWS - 1; long int line_current = 0; long int len; int loop; @@ -546,10 +640,10 @@ int editor_display(EDITOR_DATA *p_editor int scroll_rows; long last_updated_line = 0; int key_insert = 1; - int i; + int i, j; + char *p_str; - screen_current_row = screen_begin_row; - clrline(screen_begin_row, SCREEN_ROWS); + clrline(output_current_row, SCREEN_ROWS); // update msg_ext with extended key handler if (editor_display_key_handler(&ch, &ctx) != 0) @@ -560,9 +654,9 @@ int editor_display(EDITOR_DATA *p_editor loop = 1; while (!SYS_server_exit && loop) { - if (line_current >= p_editor_data->display_line_total || screen_current_row > screen_end_row) + if (line_current >= p_editor_data->display_line_total || output_current_row > output_end_row) { - ctx.line_cursor = line_current - screen_current_row + row_pos + 1; + ctx.line_cursor = line_current - output_current_row + row_pos + 1; snprintf(buffer, sizeof(buffer), "\033[1;44;33m[\033[32m%ld\033[33m;\033[32m%ld\033[33m] " @@ -570,10 +664,10 @@ int editor_display(EDITOR_DATA *p_editor "%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++] = ' '; @@ -587,12 +681,11 @@ int editor_display(EDITOR_DATA *p_editor moveto((int)row_pos, (int)col_pos); iflush(); + str_len = 0; input_ok = 0; + ch = igetch_t(MAX_DELAY_TIME); while (!SYS_server_exit && !input_ok) { - ch = igetch_t(MAX_DELAY_TIME); - input_ok = 1; - // extended key handler if (editor_display_key_handler(&ch, &ctx) != 0) { @@ -604,28 +697,32 @@ int editor_display(EDITOR_DATA *p_editor input_str[str_len] = (char)(ch - 256); str_len++; } - else + else if (str_len > 0) { + log_error("Received %d character over 127 followed by character less than 127\n", str_len); str_len = 0; } - if ((ch >= 32 && ch < 127) || (ch > 127 && ch <= 255 && str_len == 2) || ch == CR) // printable character or GBK + if ((ch >= 32 && ch < 127) || (ch > 127 && ch <= 255 && str_len == 2) || // Printable character or GBK + 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 - screen_current_row + row_pos; + display_line_in = line_current - output_current_row + row_pos; offset_in = col_pos - 1; display_line_out = display_line_in; offset_out = offset_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"); @@ -635,18 +732,15 @@ int editor_display(EDITOR_DATA *p_editor if (editor_data_insert(p_editor_data, &display_line_out, &offset_out, input_str, str_len, &last_updated_line) < 0) { - log_error("editor_data_insert(%s) error\n", input_str); - str_len = 0; + log_error("editor_data_insert(str_len=%d) error\n", str_len); } 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; - screen_end_row = MIN(SCREEN_ROWS - 1, screen_current_row + (int)(last_updated_line - line_current)); - line_current -= (screen_current_row - row_pos); - screen_current_row = (int)row_pos; - - scroll_rows = MAX(0, (int)(display_line_out - display_line_in) - (screen_end_row - screen_current_row)); + scroll_rows = MAX(0, (int)(display_line_out - display_line_in) - (output_end_row - output_current_row)); if (scroll_rows > 0) { @@ -657,91 +751,164 @@ int editor_display(EDITOR_DATA *p_editor prints("\033[S"); // Scroll up 1 line } - screen_current_row -= scroll_rows; - if (screen_current_row < screen_begin_row) + output_current_row -= scroll_rows; + if (output_current_row < screen_begin_row) { - line_current += (screen_begin_row - screen_current_row); - screen_current_row = screen_begin_row; + line_current += (screen_begin_row - output_current_row); + output_current_row = screen_begin_row; } - row_pos = screen_end_row; + row_pos = output_end_row; } else // if (scroll_lines == 0) { row_pos += (display_line_out - display_line_in); } - col_pos = offset_out + 1; + col_pos = offset_out + 1; // Set col_pos to accurate pos + } - continue; + 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) { + if (line_current - output_current_row + row_pos <= 0 && col_pos <= 1) // Forbidden + { + ch = igetch_t(MAX_DELAY_TIME); + continue; + } + col_pos--; - if (col_pos < 1 && line_current - screen_current_row + row_pos >= 0) + if (col_pos > 1 && + p_editor_data->p_display_lines[line_current - output_current_row + row_pos][col_pos - 1] < 0) // GBK + { + 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 - screen_current_row + row_pos]); + col_pos = MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos]); } } - if ((str_len = editor_data_delete(p_editor_data, line_current - screen_current_row + row_pos, col_pos - 1, + display_line_in = line_current - output_current_row + row_pos; + offset_in = col_pos - 1; + 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 - screen_current_row + row_pos >= 0) - { - row_pos--; - col_pos = MAX(1, p_editor_data->display_line_lengths[line_current - screen_current_row + row_pos]); - } - } - } + col_pos = offset_out + 1; // Set col_pos to accurate pos - screen_end_row = MIN(SCREEN_ROWS - 1, screen_current_row + (int)(last_updated_line - line_current)); - line_current -= (screen_current_row - row_pos); - screen_current_row = (int)row_pos; + 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; - if (screen_current_row < screen_begin_row) // row_pos <= 0 + if (output_current_row < screen_begin_row) // row_pos <= 0 { - screen_current_row = screen_begin_row; + output_current_row = screen_begin_row; row_pos = screen_begin_row; - screen_end_row = SCREEN_ROWS - 1; + output_end_row = SCREEN_ROWS - 1; + } + + // Exceed end + if (line_current + (screen_row_total - output_current_row) >= p_editor_data->display_line_total && + p_editor_data->display_line_total > screen_row_total) + { + scroll_rows = (int)((line_current - (output_current_row - screen_begin_row)) - + (p_editor_data->display_line_total - screen_row_total)); + + line_current = p_editor_data->display_line_total - screen_row_total; + row_pos += scroll_rows; + output_current_row = screen_begin_row; + output_end_row = SCREEN_ROWS - 1; } + + 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'): loop = 0; break; + case Ctrl('S'): // Start of line case KEY_CTRL_LEFT: col_pos = 1; break; + case Ctrl('E'): // End of line case KEY_CTRL_RIGHT: - col_pos = MAX(1, p_editor_data->display_line_lengths[line_current - screen_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_lengths[line_current - output_current_row + row_pos] + 1; + break; + } + col_pos = MAX(1, p_editor_data->display_line_lengths[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 - screen_current_row + row_pos])); + col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_lengths[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 - screen_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_lengths[line_current - output_current_row + row_pos] + 1); + } + else + { + col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos])); + } break; case KEY_INS: key_insert = !key_insert; @@ -749,33 +916,39 @@ int editor_display(EDITOR_DATA *p_editor case KEY_HOME: row_pos = 1; col_pos = 1; - if (line_current - screen_current_row < 0) // Reach begin + if (line_current - output_current_row < 0) // Reach begin { break; } line_current = 0; - screen_current_row = screen_begin_row; - screen_end_row = SCREEN_ROWS - 1; - clrline(screen_begin_row, SCREEN_ROWS); + output_current_row = screen_begin_row; + output_end_row = SCREEN_ROWS - 1; + clrline(output_current_row, SCREEN_ROWS); break; case KEY_END: 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 - screen_current_row + row_pos]); + col_pos = p_editor_data->display_line_lengths[line_current - output_current_row + row_pos] + 1; break; } line_current = p_editor_data->display_line_total - screen_row_total; - screen_current_row = screen_begin_row; - screen_end_row = SCREEN_ROWS - 1; - row_pos = screen_row_total; - col_pos = MAX(1, p_editor_data->display_line_lengths[line_current - screen_current_row + row_pos]); - clrline(screen_begin_row, SCREEN_ROWS); + output_current_row = screen_begin_row; + output_end_row = SCREEN_ROWS - 1; + row_pos = SCREEN_ROWS - 1; + col_pos = p_editor_data->display_line_lengths[line_current - output_current_row + row_pos] + 1; + clrline(output_current_row, SCREEN_ROWS); break; case KEY_LEFT: if (col_pos > 1) { col_pos--; + if (col_pos > 1 && + p_editor_data->p_display_lines[line_current - output_current_row + row_pos][col_pos - 1] < 0 && + p_editor_data->p_display_lines[line_current - output_current_row + row_pos][col_pos - 2] < 0) // GBK + { + col_pos--; + } break; } col_pos = SCREEN_COLS; // continue to KEY_UP @@ -783,26 +956,31 @@ 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 - screen_current_row + row_pos])); + col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos])); break; } - if (line_current - screen_current_row < 0) // Reach begin + if (line_current - output_current_row < 0) // Reach begin { col_pos = 1; break; } - line_current -= screen_current_row; - screen_current_row = screen_begin_row; + line_current -= output_current_row; + output_current_row = screen_begin_row; // screen_end_line = begin_line; // prints("\033[T"); // Scroll down 1 line - screen_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 - screen_current_row + row_pos])); + 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])); break; case KEY_SPACE: break; case KEY_RIGHT: - if (col_pos < p_editor_data->display_line_lengths[line_current - screen_current_row + row_pos]) + if (col_pos < p_editor_data->display_line_lengths[line_current - output_current_row + row_pos]) { + if (p_editor_data->p_display_lines[line_current - output_current_row + row_pos][col_pos - 1] < 0 && + p_editor_data->p_display_lines[line_current - output_current_row + row_pos][col_pos] < 0) // GBK + { + col_pos++; + } col_pos++; break; } @@ -811,53 +989,52 @@ 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 - screen_current_row + row_pos])); + col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_lengths[line_current - output_current_row + row_pos])); break; } - if (line_current + (screen_row_total - (screen_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 - screen_current_row + row_pos]); + // last display line does NOT have \n in the end + col_pos = p_editor_data->display_line_lengths[line_current - output_current_row + row_pos] + 1; break; } - line_current += (screen_row_total - (screen_current_row - screen_begin_row)); - screen_current_row = screen_row_total; - screen_end_row = SCREEN_ROWS - 1; - col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_lengths[line_current - screen_current_row + row_pos])); + 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])); moveto(SCREEN_ROWS, 0); clrtoeol(); prints("\033[S"); // Scroll up 1 line break; case KEY_PGUP: - if (line_current - screen_current_row < 0) // Reach begin + if (line_current - output_current_row < 0) // Reach begin { break; } - line_current -= ((screen_row_total - 1) + (screen_current_row - screen_begin_row)); + line_current -= ((screen_row_total - 1) + (output_current_row - screen_begin_row)); if (line_current < 0) { line_current = 0; } - screen_current_row = screen_begin_row; - screen_end_row = SCREEN_ROWS - 1; - col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_lengths[line_current - screen_current_row + row_pos])); - clrline(screen_begin_row, SCREEN_ROWS); + 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])); + clrline(output_current_row, SCREEN_ROWS); break; case KEY_PGDN: - if (line_current + screen_row_total - (screen_current_row - screen_begin_row) >= p_editor_data->display_line_total) // Reach end + if (line_current + screen_row_total - (output_current_row - screen_begin_row) >= p_editor_data->display_line_total) // Reach end { break; } - line_current += (screen_row_total - 1) - (screen_current_row - screen_begin_row); + line_current += (screen_row_total - 1) - (output_current_row - screen_begin_row); if (line_current + screen_row_total > p_editor_data->display_line_total) // No enough lines to display { line_current = p_editor_data->display_line_total - screen_row_total; } - screen_current_row = screen_begin_row; - screen_end_row = SCREEN_ROWS - 1; - col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_lengths[line_current - screen_current_row + row_pos])); - clrline(screen_begin_row, SCREEN_ROWS); - break; - case KEY_ESC: + 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])); + clrline(output_current_row, SCREEN_ROWS); break; case KEY_F1: if (!show_help) // Not reentrant @@ -870,10 +1047,10 @@ int editor_display(EDITOR_DATA *p_editor show_help = 1; case KEY_F5: // Refresh after display help information - line_current -= (screen_current_row - screen_begin_row); - screen_current_row = screen_begin_row; - screen_end_row = SCREEN_ROWS - 1; - clrline(screen_begin_row, SCREEN_ROWS); + line_current -= (output_current_row - screen_begin_row); + output_current_row = screen_begin_row; + output_end_row = SCREEN_ROWS - 1; + clrline(output_current_row, SCREEN_ROWS); break; case 0: // Refresh bottom line break; @@ -882,7 +1059,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; @@ -900,14 +1084,29 @@ int editor_display(EDITOR_DATA *p_editor len = 0; } - memcpy(buffer, (const char *)p_editor_data->p_display_lines[line_current], (size_t)len); - buffer[len] = '\0'; + // memcpy(buffer, p_editor_data->p_display_lines[line_current], (size_t)len); + // Replace '\033' with '*' + p_str = p_editor_data->p_display_lines[line_current]; + for (i = 0, j = 0; i < len; i++) + { + if (p_str[i] == '\033') + { + memcpy(buffer + j, EDITOR_ESC_DISPLAY_STR, sizeof(EDITOR_ESC_DISPLAY_STR) - 1); + j += (int)(sizeof(EDITOR_ESC_DISPLAY_STR) - 1); + } + else + { + buffer[j] = p_str[i]; + j++; + } + } + buffer[j] = '\0'; - moveto(screen_current_row, 0); + moveto(output_current_row, 0); clrtoeol(); prints("%s", buffer); line_current++; - screen_current_row++; + output_current_row++; } cleanup: