--- lbbs/src/editor.c 2025/06/12 10:34:21 1.16 +++ lbbs/src/editor.c 2025/06/21 02:15:18 1.31 @@ -14,19 +14,16 @@ * * ***************************************************************************/ -#include "editor.h" #include "bbs.h" +#include "common.h" +#include "editor.h" #include "io.h" #include "log.h" -#include "common.h" -#include "str_process.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 @@ -79,7 +76,7 @@ EDITOR_DATA *editor_data_load(const char { 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; @@ -96,7 +93,7 @@ EDITOR_DATA *editor_data_load(const char 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); for (i = 0; i < p_editor_data->display_line_total; i++) { @@ -126,10 +123,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_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; } @@ -218,10 +224,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++; } @@ -264,8 +278,11 @@ int editor_data_insert(EDITOR_DATA *p_ed { if (p_editor_data->display_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); +#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; } @@ -345,7 +362,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++) { @@ -354,11 +371,14 @@ 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); +#ifdef _DEBUG + log_error("display_line_total over limit %d >= %d\n", p_editor_data->display_line_total, MAX_EDITOR_DATA_LINES); +#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); + 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; @@ -395,24 +415,34 @@ 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]; - - if (*p_display_line + 1 >= p_editor_data->display_line_total) + 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 -= p_editor_data->display_line_lengths[*p_display_line]; + (*p_display_line)++; } - else + } + + // 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) { - (*p_display_line)++; + *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; @@ -431,7 +461,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++; } @@ -469,20 +499,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; } @@ -533,7 +567,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++) { @@ -552,21 +586,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; } @@ -576,7 +612,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; } @@ -630,10 +669,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++] = ' '; @@ -647,12 +686,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) { @@ -664,15 +702,18 @@ 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) || // 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; @@ -686,7 +727,7 @@ int editor_display(EDITOR_DATA *p_editor 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"); @@ -697,12 +738,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; @@ -730,16 +768,42 @@ int editor_display(EDITOR_DATA *p_editor { row_pos += (display_line_out - display_line_in); } - col_pos = offset_out + 1; + col_pos = offset_out + 1; // Set col_pos to accurate pos } + 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 && + 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--; @@ -747,25 +811,19 @@ int editor_display(EDITOR_DATA *p_editor } } - 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 = 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 - 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 = offset_out + 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); @@ -789,19 +847,33 @@ 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'): loop = 0; break; case Ctrl('S'): // Start of line @@ -810,6 +882,12 @@ int editor_display(EDITOR_DATA *p_editor break; case Ctrl('E'): // End of line case KEY_CTRL_RIGHT: + 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 @@ -819,8 +897,23 @@ int editor_display(EDITOR_DATA *p_editor 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_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; @@ -841,20 +934,26 @@ 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_lengths[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_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 @@ -882,6 +981,11 @@ int editor_display(EDITOR_DATA *p_editor case KEY_RIGHT: 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; } @@ -893,9 +997,10 @@ int editor_display(EDITOR_DATA *p_editor 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 - (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_lengths[line_current - output_current_row + row_pos] + 1; break; } line_current += (screen_row_total - (output_current_row - screen_begin_row)); @@ -959,12 +1064,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;