--- lbbs/src/editor.c 2025/06/15 04:43:33 1.22 +++ lbbs/src/editor.c 2025/06/16 01:36:56 1.24 @@ -96,7 +96,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 + 1); + 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++) { @@ -238,7 +238,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 || p_editor_data->p_display_lines[display_line][i] > 127) // GBK + if (p_editor_data->p_display_lines[display_line][i] < 0) // GBK { i++; } @@ -362,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++) { @@ -375,7 +375,7 @@ int editor_data_insert(EDITOR_DATA *p_ed // 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; @@ -422,7 +422,7 @@ int editor_data_insert(EDITOR_DATA *p_ed // 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); + 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) @@ -435,9 +435,11 @@ int editor_data_insert(EDITOR_DATA *p_ed 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; @@ -456,7 +458,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++; } @@ -504,7 +506,7 @@ int editor_data_delete(EDITOR_DATA *p_ed { 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; } @@ -562,7 +564,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++) { @@ -595,6 +597,9 @@ int editor_data_delete(EDITOR_DATA *p_ed *p_last_updated_line = MAX(j - 1, *p_last_updated_line); } + // Return real offset + *p_offset = offset; + return str_len; } @@ -606,6 +611,9 @@ static int editor_display_key_handler(in snprintf(p_ctx->msg, sizeof(p_ctx->msg), "| Í˳ö[\033[32mCtrl-W\033[33m] | °ïÖú[\033[32mh\033[33m] |"); break; + case KEY_CSI: + *p_key = KEY_ESC; + break; } return 0; @@ -658,10 +666,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++] = ' '; @@ -715,7 +723,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"); @@ -756,7 +764,7 @@ 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 } str_len = 0; @@ -773,6 +781,12 @@ int editor_display(EDITOR_DATA *p_editor } 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--; @@ -780,25 +794,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); @@ -845,7 +853,7 @@ int editor_display(EDITOR_DATA *p_editor break; case Ctrl('E'): // End of line case KEY_CTRL_RIGHT: - 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 { // 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; @@ -911,6 +919,12 @@ int editor_display(EDITOR_DATA *p_editor 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 @@ -938,6 +952,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; } @@ -949,7 +968,7 @@ 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 { // 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;