--- lbbs/src/editor.c 2025/06/11 07:21:59 1.7 +++ lbbs/src/editor.c 2025/06/11 12:56:52 1.12 @@ -27,6 +27,8 @@ #define _POSIX_C_SOURCE 200809L #include +#define EDITOR_ESC_DISPLAY_STR "\033[32m*\033[m" + EDITOR_DATA *editor_data_load(const char *p_data) { EDITOR_DATA *p_editor_data; @@ -169,7 +171,7 @@ int editor_data_insert(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) // GBK + if (p_editor_data->p_display_lines[display_line][i] < 0 || p_editor_data->p_display_lines[display_line][i] > 127) // GBK { i++; } @@ -368,7 +370,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) // GBK + if (p_editor_data->p_display_lines[display_line][i] < 0 || p_editor_data->p_display_lines[display_line][i] > 127) // GBK { i++; } @@ -417,21 +419,56 @@ int editor_data_delete(EDITOR_DATA *p_ed } else { - log_error("Some strange character at display_line %ld, offset %ld\n", display_line, offset); - return -2; + 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]); + str_len = 1; } // Current display line is (almost) empty if (offset_data_line + str_len > len_data_line || (offset_data_line + str_len == len_data_line && p_data_line[offset_data_line] == '\n')) { - log_error("Nothing to be delete\n"); - return 0; - } + 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; + } + + len_data_line = 0; // Next data line + last_display_line = p_editor_data->display_line_total - 1; + for (i = display_line + 1; i < p_editor_data->display_line_total; i++) + { + len_data_line += p_editor_data->display_line_lengths[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') // reach end of current data line + { + last_display_line = i; + break; + } + } + + 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; + } - memmove(p_data_line + offset_data_line, p_data_line + offset_data_line + str_len, (size_t)(len_data_line - offset_data_line - str_len)); - p_data_line[len_data_line - str_len] = '\0'; - len_data_line -= str_len; + // Append next data line to current one + memcpy(p_data_line + offset_data_line, p_editor_data->p_display_lines[display_line + 1], (size_t)len_data_line); + 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]); + } + else + { + memmove(p_data_line + offset_data_line, p_data_line + offset_data_line + str_len, (size_t)(len_data_line - offset_data_line - str_len)); + p_data_line[len_data_line - str_len] = '\0'; + len_data_line -= str_len; + } // Set p_data_line to head of current display line p_data_line = p_editor_data->p_display_lines[display_line]; @@ -472,7 +509,7 @@ int editor_data_delete(EDITOR_DATA *p_ed *p_last_updated_line = p_editor_data->display_line_total - 1; } - return 0; + return str_len; } static int editor_display_key_handler(int *p_key, EDITOR_CTX *p_ctx) @@ -510,8 +547,9 @@ int editor_display(EDITOR_DATA *p_editor long display_line_out, offset_out; int scroll_rows; long last_updated_line = 0; - int insert = 1; - int i; + int key_insert = 1; + int i, j; + char *p_str; screen_current_row = screen_begin_row; clrline(screen_begin_row, SCREEN_ROWS); @@ -531,10 +569,11 @@ 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%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 ? "插入" : "改写", ctx.msg); len = split_line(buffer, SCREEN_COLS, &eol, &display_len); @@ -552,11 +591,9 @@ int editor_display(EDITOR_DATA *p_editor iflush(); 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) { @@ -573,7 +610,8 @@ int editor_display(EDITOR_DATA *p_editor 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) { @@ -587,6 +625,15 @@ int editor_display(EDITOR_DATA *p_editor 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, + &last_updated_line) < 0) + { + log_error("editor_data_delete() error\n"); + } + } + if (editor_data_insert(p_editor_data, &display_line_out, &offset_out, input_str, str_len, &last_updated_line) < 0) { @@ -625,29 +672,70 @@ int editor_display(EDITOR_DATA *p_editor row_pos += (display_line_out - display_line_in); } col_pos = offset_out + 1; + } - continue; + // Check whether there is additional input + ch = igetch(0); + if (ch == KEY_TIMEOUT) + { + input_ok = 1; } + continue; } - else if (ch == KEY_DEL) // Del + else if (ch == KEY_DEL || ch == BACKSPACE) // Del { - last_updated_line = line_current; + if (ch == BACKSPACE) + { + 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]); + } + } - if (editor_data_delete(p_editor_data, line_current - screen_current_row + row_pos, col_pos - 1, - &last_updated_line) < 0) + if ((str_len = editor_data_delete(p_editor_data, line_current - screen_current_row + row_pos, col_pos - 1, + &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]); + } + } + } + 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; + + if (screen_current_row < screen_begin_row) // row_pos <= 0 + { + screen_current_row = screen_begin_row; + row_pos = screen_begin_row; + screen_end_row = SCREEN_ROWS - 1; + } } + // Check whether there is additional input + ch = igetch(0); + if (ch == KEY_TIMEOUT) + { + input_ok = 1; + } continue; } + input_ok = 1; switch (ch) { case KEY_NULL: @@ -671,7 +759,7 @@ int editor_display(EDITOR_DATA *p_editor col_pos = MIN(col_pos, MAX(1, p_editor_data->display_line_lengths[line_current - screen_current_row + row_pos])); break; case KEY_INS: - insert = !insert; + key_insert = !key_insert; break; case KEY_HOME: row_pos = 1; @@ -784,8 +872,6 @@ int editor_display(EDITOR_DATA *p_editor 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: - break; case KEY_F1: if (!show_help) // Not reentrant { @@ -810,6 +896,10 @@ int editor_display(EDITOR_DATA *p_editor } BBS_last_access_tm = time(0); + if (!input_ok) + { + ch = igetch_t(MAX_DELAY_TIME); + } } continue; @@ -827,8 +917,23 @@ 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); clrtoeol();