kamkow1/mop3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CE edit display command

Browse Source
This commit is contained in:
Kamil Kowalczyk
2026-03-09 17:57:22 +01:00
parent c2726bc261
commit 29e377aea3
1 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
ce/edit.c
View File

@@ -48,8 +48,9 @@ static const char* string_modes[] = {
[EDIT_MODE_COMAMND] = "Command", [EDIT_MODE_COMAMND] = "Command",
}; };
struct edit_select { struct edit_command_buf {
struct list_node_link* lines; char buffer[256];
size_t len;
}; };
struct editor { struct editor {
@@ -59,10 +60,10 @@ struct editor {
size_t col_offset; size_t col_offset;
size_t row_offset; size_t row_offset;
size_t total_lines; size_t total_lines;
struct edit_select select;
int mode; int mode;
const char* volume; const char* volume;
const char* path; const char* path;
struct edit_command_buf cmdbuf;
}; };
static struct editor editor; static struct editor editor;
@@ -218,16 +219,17 @@ void edit_start (const char* volume, const char* file_path, const char* text, si
current_idx++; current_idx++;
} }
bbptr += char* command_str = (editor.mode == EDIT_MODE_COMAMND) ? editor.cmdbuf.buffer : "";
snprintf (bbptr, (backbuffer_max - (bbptr - backbuffer)),
ANSIQ_DYN_CUR_SET ANSIQ_SCR_CLR_LINE STATUS_LINE_STYLE bbptr += snprintf (
"%*s" ANSIQ_DYN_CUR_SET bbptr, (backbuffer_max - (bbptr - backbuffer)),
" Editing %s:%s; line %zu col %zu; Mode: %s" ANSIQ_GR_RESET ANSIQ_DYN_CUR_SET ANSIQ_DYN_CUR_SET ANSIQ_SCR_CLR_LINE STATUS_LINE_STYLE
ANSIQ_CUR_VISIBLE, "%*s" ANSIQ_DYN_CUR_SET
(int)rows, 1, (int)cols, "", (int)rows, 1, volume, file_path, " %s | %s:%s | %zu:%zu | Mode: %s" ANSIQ_GR_RESET ANSIQ_DYN_CUR_SET ANSIQ_CUR_VISIBLE,
editor.cursor.line + 1, editor.cursor.col + 1, string_modes[editor.mode], (int)rows, 1, (int)cols, "", (int)rows, 1, command_str, volume, file_path,
(int)(editor.cursor.line - editor.row_offset) + 1, editor.cursor.line + 1, editor.cursor.col + 1, string_modes[editor.mode],
(int)(editor.cursor.col - editor.col_offset) + 1 + (int)gutter_width); (int)(editor.cursor.line - editor.row_offset) + 1,
(int)(editor.cursor.col - editor.col_offset) + 1 + (int)gutter_width);
mail_send (e_pgid, backbuffer, bbptr - backbuffer); mail_send (e_pgid, backbuffer, bbptr - backbuffer);
@@ -299,6 +301,32 @@ void edit_start (const char* volume, const char* file_path, const char* text, si
editor.cursor.line++; editor.cursor.line++;
editor.current_line = new_line; editor.current_line = new_line;
editor.total_lines++; editor.total_lines++;
} else if (editor.mode == EDIT_MODE_COMAMND) {
if (strcmp (editor.cmdbuf.buffer, "q") == 0) {
edit_run = false;
editor.mode = EDIT_MODE_NORMAL;
} else if (strcmp (editor.cmdbuf.buffer, "w") == 0) {
struct filewriter fw;
if (!(filewriter_init (&fw, editor.volume, editor.path, FW_CREATE_FILE | FW_APPEND) <
0)) {
struct list_node_link *line_link, *tmp_line_link;
list_foreach (editor.lines, line_link, tmp_line_link) {
struct edit_line* line = list_entry (line_link, struct edit_line, lines_link);
filewriter_write (&fw, (uint8_t*)line->gb.buffer, line->gb.gap_start);
filewriter_write (&fw, (uint8_t*)line->gb.buffer + line->gb.gap_end,
line->gb.size - line->gb.gap_end);
if (line->lines_link.next != NULL)
filewriter_write (&fw, (uint8_t*)"\n", 1);
}
filewriter_fini (&fw);
}
editor.mode = EDIT_MODE_NORMAL;
} else {
editor.mode = EDIT_MODE_NORMAL;
}
} }
} break; } break;
case KB_DELETE: case KB_DELETE:
@@ -358,41 +386,23 @@ void edit_start (const char* volume, const char* file_path, const char* text, si
editor.cursor.col = gapbuffer_length (&editor.current_line->gb); editor.cursor.col = gapbuffer_length (&editor.current_line->gb);
break; break;
case KB_ESCAPE: case KB_ESCAPE:
editor.mode = EDIT_MODE_NORMAL; if (editor.mode == EDIT_MODE_COMAMND) {
editor.mode = EDIT_MODE_NORMAL;
editor.cmdbuf.len = 0;
memset (editor.cmdbuf.buffer, 0, sizeof (editor.cmdbuf.buffer));
}
break; break;
case KB_CTRL ('X'): case KB_CTRL ('X'):
editor.mode = EDIT_MODE_COMAMND; editor.mode = EDIT_MODE_COMAMND;
editor.cmdbuf.len = 0;
memset (editor.cmdbuf.buffer, 0, sizeof (editor.cmdbuf.buffer));
break;
default: default:
if (isprint (ch)) { if (isprint (ch)) {
if (editor.mode == EDIT_MODE_COMAMND) { if (editor.mode == EDIT_MODE_COMAMND) {
switch (ch) { if (editor.cmdbuf.len < sizeof (editor.cmdbuf.buffer) - 1) {
case 'q': editor.cmdbuf.buffer[editor.cmdbuf.len++] = ch;
edit_run = false; editor.cmdbuf.buffer[editor.cmdbuf.len] = '\0';
editor.mode = EDIT_MODE_NORMAL;
break;
case 'w': {
struct filewriter fw;
if (!(filewriter_init (&fw, editor.volume, editor.path, FW_CREATE_FILE | FW_APPEND) <
0)) {
struct list_node_link *line_link, *tmp_line_link;
list_foreach (editor.lines, line_link, tmp_line_link) {
struct edit_line* line = list_entry (line_link, struct edit_line, lines_link);
filewriter_write (&fw, (uint8_t*)line->gb.buffer, line->gb.gap_start);
filewriter_write (&fw, (uint8_t*)line->gb.buffer + line->gb.gap_end,
line->gb.size - line->gb.gap_end);
if (line->lines_link.next != NULL)
filewriter_write (&fw, (uint8_t*)"\n", 1);
}
filewriter_fini (&fw);
}
editor.mode = EDIT_MODE_NORMAL;
} break;
default:
editor.mode = EDIT_MODE_NORMAL;
break;
} }
} else if (editor.mode == EDIT_MODE_NORMAL) { } else if (editor.mode == EDIT_MODE_NORMAL) {
gapbuffer_move (&editor.current_line->gb, editor.cursor.col); gapbuffer_move (&editor.current_line->gb, editor.cursor.col);