From 63d56de4c84acb805921185d07b7749fbbaa07bb Mon Sep 17 00:00:00 2001 From: Alexander Zhylin Date: Mon, 13 Jul 2026 18:23:52 +0300 Subject: [PATCH 01/14] text edit window [initial] --- TODO.md | 2 +- src/connection.c | 2 +- src/windows/main_window.c | 4 ++ src/windows/text_edit.c | 140 ++++++++++++++++++++++++++++++++++++++ src/windows/text_edit.h | 30 ++++++++ 5 files changed, 176 insertions(+), 2 deletions(-) create mode 100644 src/windows/text_edit.c create mode 100644 src/windows/text_edit.h diff --git a/TODO.md b/TODO.md index e0f9c8d..a5ed23d 100644 --- a/TODO.md +++ b/TODO.md @@ -1,11 +1,11 @@ # TODO: ## Current: -- [ ] Rewrite cancel download. Use packages and check every time for a confirmation to continue download - [ ] File upload multiline description (window) - [ ] Sorting in the file list - [ ] Resume download - [ ] Separate common structures in the common.h +- [x] Rewrite cancel download. Use packages and check every time for a confirmation to continue download - [x] Show download/upload progress in percentages - [x] Break line automatically in modal widgets - [x] Cancel upload/download diff --git a/src/connection.c b/src/connection.c index 38a4870..71cf921 100644 --- a/src/connection.c +++ b/src/connection.c @@ -31,7 +31,7 @@ bool connect_to_server(app_t *app) { return false; } app->query_args->state = S_WAIT_SERVER; - app->params->is_connected = TRUE; + app->params->is_connected = true; app->query_args->sd = app->params->sd; app_draw_bars(app); return true; diff --git a/src/windows/main_window.c b/src/windows/main_window.c index 71d5f41..dda4ff9 100644 --- a/src/windows/main_window.c +++ b/src/windows/main_window.c @@ -4,6 +4,7 @@ #include "main_window.h" #include "file_list.h" #include "fs_file_list.h" +#include "text_edit.h" void main_window_set(app_t *app, enum main_window_type type) { if (app->main_ui.ui != NULL) { @@ -19,6 +20,7 @@ void main_window_set(app_t *app, enum main_window_type type) { w_lfl_init_win(app); break; case mw_f_desc: + w_te_init_win(app); break; default: break; @@ -34,6 +36,7 @@ void main_window_draw(app_t *app) { w_lfl_draw((w_lfl_ui_t *)app->main_ui.ui); break; case mw_f_desc: + w_te_draw((w_te_ui_t *) app->main_ui.ui); break; } app_draw_bbar(app); @@ -48,6 +51,7 @@ void main_window_destroy(app_t *app) { w_lfl_destroy((w_lfl_ui_t **)&(app->main_ui.ui)); break; case mw_f_desc: + w_te_destroy((w_te_ui_t **) &(app->main_ui.ui)); break; } MAIN_UI_RESET(app); diff --git a/src/windows/text_edit.c b/src/windows/text_edit.c new file mode 100644 index 0000000..9795808 --- /dev/null +++ b/src/windows/text_edit.c @@ -0,0 +1,140 @@ +/* SPDX-License-Identifier: MIT */ +/* Copyright (c) 2026 Oleksandr Zhylin */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "text_edit.h" +#include "widget_core.h" + +static void w_te_cb(w_cb_args_t *args) { + app_t *app = args->app; + int32_t key = *((int32_t *)args->data); + w_te_ui_t *fui = app->query_args->main_ui->ui; + switch (key) { + case '\n': + // TODO: new line case + break; + case '\b': + // TODO: new line case + break; + default: + fui->text[fui->text_len++] = key; + fui->text[fui->text_len] = 0; + } +} + +static void w_te_cb_refresh(void *data) { + app_t *app = (app_t *)data; + if (app->main_ui.type != mw_f_desc) { + return; + } + w_te_ui_t *fui = app->main_ui.ui; + wnoutrefresh(fui->win); +} + +static struct action_key action_keys[] = { + {.key = "Esc", .title = "Back", .code = '\33'}, + {.key = "F9", .title = "Quit", .code = KEY_F(9)}, +}; + +static int32_t process_user_input(app_t *app, w_cb_args_t *d_args) { + int32_t c; + w_te_ui_t *fui = (w_te_ui_t *)app->query_args->main_ui->ui; + c = wgetch(app->win); + switch (c) { + case KEY_F(9): + app_destroy(app, 0); + return OK; + case 'D': + case 'd': + // case '\33': /* ESC key */ + // if (!app->modal.is_initiated) { + // server_send_string(app->query_args, "file list %d %d\n", + // fui->max_lines - 1, 1); + // main_window_set(app, mw_fl_server); + // d_args->element = app->main_ui.ui; + // break; + // } + default: + d_args->data = (void *)&c; + app->active_callback(d_args); + break; + } + return OK; +} + +void w_te_reset_app(void *app); + +w_te_ui_t *w_te_init_win(app_t *app) { + w_te_ui_t *fui = malloc(sizeof(w_te_ui_t)); + app->main_ui.ui = fui; + app->main_ui.type = mw_f_desc; + app->main_ui.cb_ui_refresh = w_te_cb_refresh; + app->main_ui.b_keys = action_keys; + app->main_ui.b_keys_len = 2; + app->main_ui.cb_b_press = (w_cb_press_t)process_user_input; + app->main_ui.reset = w_te_reset_app; + app->main_ui.draw = (draw_f_t *)w_te_draw; + app->active_callback = w_te_cb; + fui->w.callback = w_te_cb; + w_init(&(fui->w), NULL, &(app->win), ""); + + fui->w.sz.x = getmaxx(app->win); + fui->w.sz.y = getmaxy(app->win); + fui->w.parent_win = &(app->win); + /* * INIT UI * */ + + /* define the width for each sub window */ + int32_t left_w_x = app->coordinates.max_x / 10 * 5; + int32_t right_w_x = app->coordinates.max_x - left_w_x - 2; + return fui; +} + +void w_te_reset(w_te_ui_t *fl_ui) { + fl_ui->text[0] = 0; + fl_ui->scroll_pos = 0; + fl_ui->text_len = 0; +} + +void w_te_reset_app(void *app) { + app_t *_app = app; + w_te_ui_t *fl_ui = (w_te_ui_t *)_app->main_ui.ui; + w_te_reset(fl_ui); +} + +void w_te_draw(w_te_ui_t *fui) { + int32_t sz_y, sz_x; + int32_t p_y, p_x; + WINDOW *win = fui->win; + getmaxyx(win, sz_y, sz_x); + int32_t sz_y_f = sz_y - 1; // actual size (without box) + int32_t sz_x_f = sz_x - 1; // actual size (without box) + + p_y = 1; + p_x = 1; + + for (int i = 0; i < fui->w.sz.y; i++) { + mvwaddnwstr(win, p_y, p_x, fui->text + fui->w.sz.x * i, fui->w.sz.x); + } + + box(fui->win, 0, 0); + p_x = 1; + + wattroff(win, A_BOLD); + curs_set(false); +} + +void w_te_destroy(w_te_ui_t **fui) { + w_te_ui_t *f = *fui; + free(*fui); + *fui = NULL; +} \ No newline at end of file diff --git a/src/windows/text_edit.h b/src/windows/text_edit.h new file mode 100644 index 0000000..14a503d --- /dev/null +++ b/src/windows/text_edit.h @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: MIT */ +/* Copyright (c) 2026 Oleksandr Zhylin */ + +#ifndef W_TEXT_EDIT_H /* LOCAL FILE LIST */ +#define W_TEXT_EDIT_H + +#include "../app.h" +#include +#include +#include +#include +#include +#include + +typedef struct { + w_t w; + WINDOW *win; + wchar_t text[INBUFSIZE * 10]; + int text_len; + int scroll_pos; + void *file_pt; // TODO: уточнить +} w_te_ui_t; + +void w_te_draw(w_te_ui_t *fl_ui); +void w_te_destroy(w_te_ui_t **fui); +void w_te_reset(w_te_ui_t *fl_ui); +w_te_ui_t *w_te_init(WINDOW **win, w_t *w_parent); +w_te_ui_t *w_te_init_win(app_t *app); + +#endif \ No newline at end of file From 2bc3ee438e992bf48cfc1449c82ee5cd6d1e34e8 Mon Sep 17 00:00:00 2001 From: Alexander Zhylin Date: Tue, 14 Jul 2026 19:12:26 +0300 Subject: [PATCH 02/14] further development in text edit window. main_dev_widget mode. --- CMakeLists.txt | 2 + README.md | 4 +- src/CMakeLists.txt | 6 +++ src/app.c | 30 ++++++----- src/app.h | 2 +- src/main.c | 36 ++++++------- src/main.h | 2 +- src/main_dev_widget.c | 117 ++++++++++++++++++++++++++++++++++++++++ src/query.c | 1 - src/windows/text_edit.c | 36 +++++++------ src/windows/text_edit.h | 5 +- 11 files changed, 186 insertions(+), 55 deletions(-) create mode 100644 src/main_dev_widget.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fb08a7..006dfd3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,7 @@ cmake_minimum_required(VERSION 3.23) +set(CACHE DEV_WIDGET BOOL OFF "Enable development widget mode") + project(ZBBSClientTUI VERSION 1.0.0 ) diff --git a/README.md b/README.md index 7806cb8..5073f01 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,9 @@ It will create all necessary file structure in order to run the program correctl 2. Build the binary running `$ make` or `$ make bbs-client` 3. Run it by `$ make run` -## Develop +## Development +### Widget development +In order to switch to widget/screen development, configure cmake with `-DDEV_WIDGET=ON` ### Name conventions: diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5523a2b..f2bdb97 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -22,6 +22,12 @@ endif() file(GLOB M_SOURCES "*.c") +if(DEV_WIDGET) + list(FILTER M_SOURCES EXCLUDE REGEX "main\\.c$") +else() + list(FILTER M_SOURCES EXCLUDE REGEX "main_dev_widget\\.c$") +endif() + target_sources(zbbs-client-tui PRIVATE ${M_SOURCES} diff --git a/src/app.c b/src/app.c index 111cf0a..789c5c6 100644 --- a/src/app.c +++ b/src/app.c @@ -14,41 +14,43 @@ void ac_file(WINDOW *win, int is_action_w); -app_t *app_init(void) { +app_t *app_init(app_t *app) { /* get values from terminal size */ int32_t y_max, x_max; getmaxyx(stdscr, y_max, x_max); /* allocate app struct memory */ - app_t *_app = calloc(1, sizeof(app_t)); + if (app == NULL) { + app = calloc(1, sizeof(app_t)); + } /* associate values for screen size */ - _app->coordinates.max_x = _app->coordinates.cur_x = x_max; - _app->coordinates.max_y = _app->coordinates.cur_y = y_max; + app->coordinates.max_x = app->coordinates.cur_x = x_max; + app->coordinates.max_y = app->coordinates.cur_y = y_max; - _app->win = newwin(_app->coordinates.cur_y, _app->coordinates.cur_x, 0, 0); + app->win = newwin(app->coordinates.cur_y, app->coordinates.cur_x, 0, 0); /* dialogue */ - _app->modal.win = NULL; - _app->modal.is_initiated = 0; + app->modal.win = NULL; + app->modal.is_initiated = 0; /* print top and bottom bars */ - _app->main_ui.b_keys_len = 0; - app_draw_bars(_app); + app->main_ui.b_keys_len = 0; + app_draw_bars(app); /* here goes box borders */ - app_draw_borders(_app); + app_draw_borders(app); /* NULL to main_ui */ - MAIN_UI_RESET(_app); + MAIN_UI_RESET(app); - keypad(_app->win, TRUE); + keypad(app->win, TRUE); /* refresh the windows */ - wnoutrefresh(_app->win); + wnoutrefresh(app->win); doupdate(); - return _app; + return app; } void app_init_nc(void) { diff --git a/src/app.h b/src/app.h index c79523d..4e72f20 100644 --- a/src/app.h +++ b/src/app.h @@ -27,7 +27,7 @@ typedef struct { main_window_t main_ui; } app_t; -app_t *app_init(void); +app_t *app_init(app_t *app); void app_init_nc(void); void app_destroy(app_t *app, int32_t exit_code); void app_draw_borders(app_t *app); diff --git a/src/main.c b/src/main.c index 3b128d1..ce1c16c 100644 --- a/src/main.c +++ b/src/main.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -15,11 +14,11 @@ #include #include -#include "main.h" #include "../app.h" #include "alert.h" #include "connection.h" -#include "file_list.h" +// #include "file_list.h" +#include "main.h" #include "query.h" int32_t m_id = 0; @@ -27,42 +26,39 @@ int32_t m_id = 0; int32_t process_user_input(app_t *app, w_cb_args_t *d_args); int main(int argc, char **argv) { - app_t *app; + app_t app; params_t params; - query_args_t *q_args = malloc(sizeof(query_args_t)); - - app = calloc(1, sizeof(app_t)); + query_args_t q_args; app_init_nc(); - app = app_init(); + app.params = ¶ms; + app_init(&app); init_params(¶ms); - app->params = ¶ms; analyze_args(argc, argv, ¶ms); /* init alert */ - w_alert_init(app); + w_alert_init(&app); - init_query_args(q_args, app->params); - q_args->buf = malloc(INBUFSIZE); - app->query_args = q_args; + init_query_args(&q_args, app.params); + app.query_args = &q_args; - main_window_set(app, mw_fl_server); + main_window_set(&app, mw_fl_server); /* init client to connect to the server */ - app->params->sd = init_client(); + app.params->sd = init_client(); if (params.addr == 0) { - app->query_args->state = S_ASK_SEVER_IP; + app.query_args->state = S_ASK_SEVER_IP; } else { - connect_to_server(app); + connect_to_server(&app); } - app->query_args->main_ui = &(app->main_ui); + app.query_args->main_ui = &(app.main_ui); - query_loop(app); + query_loop(&app); clear_params(¶ms); - app_destroy(app, 0); + app_destroy(&app, 0); return OK; } diff --git a/src/main.h b/src/main.h index 4b07ae3..c458f1d 100644 --- a/src/main.h +++ b/src/main.h @@ -119,7 +119,7 @@ typedef struct query_args { int32_t buf_used; p_file_t *file; enum state state; - char *buf; + char buf[INBUFSIZE]; bool from_server; params_t *params; struct { diff --git a/src/main_dev_widget.c b/src/main_dev_widget.c new file mode 100644 index 0000000..9ab67ec --- /dev/null +++ b/src/main_dev_widget.c @@ -0,0 +1,117 @@ +/* SPDX-License-Identifier: MIT */ +/* Copyright (c) 2026 Oleksandr Zhylin */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../app.h" +#include "alert.h" +#include "connection.h" +#include "main.h" +#include "query.h" + +int32_t m_id = 0; + + +void mini_loop(app_t *app) { + w_cb_args_t d_args = { + .app = app, .element = NULL, .data = NULL, .resp_data.code = cbrc_none}; + + fd_set readfds; + + while (true) { + app_draw_modal(app); + main_window_draw(app); + app_refresh(app); + + FD_ZERO(&readfds); + FD_SET(STDIN_FILENO, &readfds); + int maxfd = STDIN_FILENO; + + int sr = select(maxfd + 1, &readfds, NULL, NULL, NULL); + + if (sr == -1) { + /* perror("select"); */ + exit(3); + } + + if (app->main_ui.cb_b_press != NULL && app->modal.is_initiated == false) { + if (ERR == app->main_ui.cb_b_press(app, &d_args)) { + w_alert("error while processing user input"); + } + } + } + +} + +int main(void) { + app_t app; + file_args_t fargs; + query_args_t q_args; + params_t params; + p_file_t file; + + app.params = ¶ms; + app.query_args = &q_args; + app.file_args = &fargs; + q_args.file = &file; + app.query_args->main_ui = &(app.main_ui); + + file.name = "Test file #1"; + params.is_connected = false; + app.modal.is_initiated = false; + + app_init_nc(); + app_init(&app); + init_params(¶ms); + init_query_args(&q_args, app.params); + w_alert_init(&app); + app_init(&app); + main_window_set(&app, mw_f_desc); + mini_loop(&app); + exit(0); +} + +int32_t process_user_input(app_t *app, w_cb_args_t *d_args) { + int32_t c; + w_ui_file_list_t *fui = (w_ui_file_list_t *)app->query_args->main_ui->ui; + c = wgetch(app->win); + switch (c) { + case KEY_F(9): + app_destroy(app, 0); + return OK; + case 'U': + case 'u': + if (!app->modal.is_initiated && !fui->active_search && + app->main_ui.type != mw_fl_local) { + /* app->query_args->state = S_UPLOAD_FILE_SELECT; */ + main_window_set(app, mw_fl_local); + main_window_draw(app); + d_args->element = app->main_ui.ui; + break; + } + case 's': + case 'S': + if (!app->modal.is_initiated && !fui->active_search) { + fui->active_search = true; + w_fl_draw(fui); + return OK; + } + default: + d_args->data = (void *)&c; + app->active_callback(d_args); + break; + } + return OK; +} \ No newline at end of file diff --git a/src/query.c b/src/query.c index fd0b4c6..8a2d4ba 100644 --- a/src/query.c +++ b/src/query.c @@ -291,7 +291,6 @@ static int process_command(app_t *app, wait_server_cb *callback) { } void init_query_args(query_args_t *q_args, params_t *params) { - q_args->buf = NULL; q_args->sd = -1; q_args->state = S_N_D; q_args->buf_used = 0; diff --git a/src/windows/text_edit.c b/src/windows/text_edit.c index 9795808..749db9f 100644 --- a/src/windows/text_edit.c +++ b/src/windows/text_edit.c @@ -20,11 +20,9 @@ static void w_te_cb(w_cb_args_t *args) { int32_t key = *((int32_t *)args->data); w_te_ui_t *fui = app->query_args->main_ui->ui; switch (key) { - case '\n': - // TODO: new line case - break; - case '\b': - // TODO: new line case + case KEY_BACKSPACE: + case KEY_DL: + fui->text[fui->text_len--] = 0; break; default: fui->text[fui->text_len++] = key; @@ -92,16 +90,14 @@ w_te_ui_t *w_te_init_win(app_t *app) { fui->w.sz.y = getmaxy(app->win); fui->w.parent_win = &(app->win); /* * INIT UI * */ - - /* define the width for each sub window */ - int32_t left_w_x = app->coordinates.max_x / 10 * 5; - int32_t right_w_x = app->coordinates.max_x - left_w_x - 2; + fui->win = newwin(fui->w.sz.y - 4, fui->w.sz.x - 2, 2, 1); return fui; } void w_te_reset(w_te_ui_t *fl_ui) { fl_ui->text[0] = 0; - fl_ui->scroll_pos = 0; + fl_ui->cur_pos.x = 0; + fl_ui->cur_pos.y = 0; fl_ui->text_len = 0; } @@ -119,18 +115,26 @@ void w_te_draw(w_te_ui_t *fui) { int32_t sz_y_f = sz_y - 1; // actual size (without box) int32_t sz_x_f = sz_x - 1; // actual size (without box) - p_y = 1; - p_x = 1; + p_y = 0; + p_x = 0; - for (int i = 0; i < fui->w.sz.y; i++) { - mvwaddnwstr(win, p_y, p_x, fui->text + fui->w.sz.x * i, fui->w.sz.x); + wattrset(win, COLOR_PAIR(modal_color_pair) | A_BOLD | A_REVERSE); + + int i = 0; + for (i = 0; i < fui->w.sz.y; i++) { + mvwprintw(win, p_y + i, p_x, "%*s", fui->w.sz.x, ""); } - box(fui->win, 0, 0); + int len_rest = fui->text_len; + mvwaddnwstr(win, p_y, p_x, fui->text, fui->text_len); + + fui->cur_pos.y = i; + p_x = 1; wattroff(win, A_BOLD); - curs_set(false); + + curs_set(true); } void w_te_destroy(w_te_ui_t **fui) { diff --git a/src/windows/text_edit.h b/src/windows/text_edit.h index 14a503d..6e8a529 100644 --- a/src/windows/text_edit.h +++ b/src/windows/text_edit.h @@ -17,7 +17,10 @@ typedef struct { WINDOW *win; wchar_t text[INBUFSIZE * 10]; int text_len; - int scroll_pos; + struct { + int x; + int y; + } cur_pos; void *file_pt; // TODO: уточнить } w_te_ui_t; From bee3921c6242af97773f1e683c4b72685d9f50b1 Mon Sep 17 00:00:00 2001 From: Alexander Zhylin Date: Wed, 15 Jul 2026 15:44:45 +0300 Subject: [PATCH 03/14] text edit: display text correctly --- src/windows/text_edit.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/windows/text_edit.c b/src/windows/text_edit.c index 749db9f..fdef631 100644 --- a/src/windows/text_edit.c +++ b/src/windows/text_edit.c @@ -11,6 +11,7 @@ #include #include #include +#include #include "text_edit.h" #include "widget_core.h" @@ -126,7 +127,23 @@ void w_te_draw(w_te_ui_t *fui) { } int len_rest = fui->text_len; - mvwaddnwstr(win, p_y, p_x, fui->text, fui->text_len); + + wchar_t *cur_ptr = fui->text; + wchar_t *nl_ptr = wcschr(cur_ptr, '\n'); + + if (nl_ptr == NULL) { + mvwaddnwstr(win, p_y++, p_x, cur_ptr, fui->text_len); + } else { + while (true) { + mvwaddnwstr(win, p_y++, p_x, cur_ptr, nl_ptr - cur_ptr); + cur_ptr = nl_ptr + 1; + nl_ptr = wcschr(cur_ptr, '\n'); + if (nl_ptr == NULL) { + mvwaddnwstr(win, p_y++, p_x, cur_ptr, wcslen(cur_ptr)); + break; + } + } + } fui->cur_pos.y = i; From 84ab8a3777c6eedc19f2a76765f4e16a8dd36216 Mon Sep 17 00:00:00 2001 From: Alexander Zhylin Date: Wed, 15 Jul 2026 18:24:47 +0300 Subject: [PATCH 04/14] text edit: move cursor logic (not finished). --- src/app.c | 17 +++++++---------- src/app.h | 1 + src/main.c | 1 - src/main_dev_widget.c | 27 +++++++++++++-------------- src/windows/main_window.c | 5 +++-- src/windows/text_edit.c | 38 ++++++++++++++++++++++++++++++++------ src/windows/text_edit.h | 39 ++++++++++++++++++++++----------------- 7 files changed, 78 insertions(+), 50 deletions(-) diff --git a/src/app.c b/src/app.c index 789c5c6..5f37273 100644 --- a/src/app.c +++ b/src/app.c @@ -11,10 +11,12 @@ #include #include #include +#include void ac_file(WINDOW *win, int is_action_w); app_t *app_init(app_t *app) { + app->top_text = NULL; /* get values from terminal size */ int32_t y_max, x_max; getmaxyx(stdscr, y_max, x_max); @@ -34,13 +36,6 @@ app_t *app_init(app_t *app) { app->modal.win = NULL; app->modal.is_initiated = 0; - /* print top and bottom bars */ - app->main_ui.b_keys_len = 0; - app_draw_bars(app); - - /* here goes box borders */ - app_draw_borders(app); - /* NULL to main_ui */ MAIN_UI_RESET(app); @@ -108,15 +103,17 @@ void app_draw_bars(app_t *app) { mvwprintw(app->win, app->coordinates.cur_y - 2, i, " "); } - /* add content to the top bar */ - if (app->params && app->params->is_connected) { + if (app->top_text != NULL) { + mvwaddnwstr(app->win, 1, 2, app->top_text, wcslen(app->top_text)); + } else if (app->params && app->params->is_connected) { int32_t ip_address = app->params->addr; u_char ip_addr[4]; mempcpy(ip_addr, &ip_address, 4); sprintf(top_text, "Connected to %u.%u.%u.%u, user: %s", ip_addr[0], ip_addr[1], ip_addr[2], ip_addr[3], app->params->uname); + mvwprintw(app->win, 1, 2, "%s", top_text); } - mvwprintw(app->win, 1, 2, "%s", top_text); + wattroff(app->win, A_REVERSE); /* add content to the bottom bar */ diff --git a/src/app.h b/src/app.h index 4e72f20..0b57f74 100644 --- a/src/app.h +++ b/src/app.h @@ -24,6 +24,7 @@ typedef struct { file_args_t *file_args; void (*active_callback)(w_cb_args_t *args); void *active_widget; + wchar_t *top_text; main_window_t main_ui; } app_t; diff --git a/src/main.c b/src/main.c index ce1c16c..847b872 100644 --- a/src/main.c +++ b/src/main.c @@ -44,7 +44,6 @@ int main(int argc, char **argv) { app.query_args = &q_args; main_window_set(&app, mw_fl_server); - /* init client to connect to the server */ app.params->sd = init_client(); diff --git a/src/main_dev_widget.c b/src/main_dev_widget.c index 9ab67ec..459393d 100644 --- a/src/main_dev_widget.c +++ b/src/main_dev_widget.c @@ -23,7 +23,6 @@ int32_t m_id = 0; - void mini_loop(app_t *app) { w_cb_args_t d_args = { .app = app, .element = NULL, .data = NULL, .resp_data.code = cbrc_none}; @@ -34,25 +33,24 @@ void mini_loop(app_t *app) { app_draw_modal(app); main_window_draw(app); app_refresh(app); - + FD_ZERO(&readfds); FD_SET(STDIN_FILENO, &readfds); int maxfd = STDIN_FILENO; - + int sr = select(maxfd + 1, &readfds, NULL, NULL, NULL); - + if (sr == -1) { /* perror("select"); */ exit(3); } - + if (app->main_ui.cb_b_press != NULL && app->modal.is_initiated == false) { if (ERR == app->main_ui.cb_b_press(app, &d_args)) { w_alert("error while processing user input"); } } } - } int main(void) { @@ -62,22 +60,23 @@ int main(void) { params_t params; p_file_t file; + init_query_args(&q_args, app.params); + app.params = ¶ms; app.query_args = &q_args; app.file_args = &fargs; + + app_init_nc(); + init_params(¶ms); + w_alert_init(&app); + app_init(&app); + q_args.file = &file; app.query_args->main_ui = &(app.main_ui); - file.name = "Test file #1"; params.is_connected = false; app.modal.is_initiated = false; - - app_init_nc(); - app_init(&app); - init_params(¶ms); - init_query_args(&q_args, app.params); - w_alert_init(&app); - app_init(&app); + main_window_set(&app, mw_f_desc); mini_loop(&app); exit(0); diff --git a/src/windows/main_window.c b/src/windows/main_window.c index dda4ff9..52245c7 100644 --- a/src/windows/main_window.c +++ b/src/windows/main_window.c @@ -25,6 +25,7 @@ void main_window_set(app_t *app, enum main_window_type type) { default: break; } + app_draw_bars(app); } void main_window_draw(app_t *app) { @@ -36,7 +37,7 @@ void main_window_draw(app_t *app) { w_lfl_draw((w_lfl_ui_t *)app->main_ui.ui); break; case mw_f_desc: - w_te_draw((w_te_ui_t *) app->main_ui.ui); + w_te_draw((w_te_ui_t *)app->main_ui.ui); break; } app_draw_bbar(app); @@ -51,7 +52,7 @@ void main_window_destroy(app_t *app) { w_lfl_destroy((w_lfl_ui_t **)&(app->main_ui.ui)); break; case mw_f_desc: - w_te_destroy((w_te_ui_t **) &(app->main_ui.ui)); + w_te_destroy((w_te_ui_t **)&(app->main_ui.ui)); break; } MAIN_UI_RESET(app); diff --git a/src/windows/text_edit.c b/src/windows/text_edit.c index fdef631..aa2b56c 100644 --- a/src/windows/text_edit.c +++ b/src/windows/text_edit.c @@ -7,7 +7,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -16,6 +18,8 @@ #include "text_edit.h" #include "widget_core.h" +/* TODO: create dynamic array of endline positions */ + static void w_te_cb(w_cb_args_t *args) { app_t *app = args->app; int32_t key = *((int32_t *)args->data); @@ -25,6 +29,15 @@ static void w_te_cb(w_cb_args_t *args) { case KEY_DL: fui->text[fui->text_len--] = 0; break; + case KEY_UP: + fui->cur_shift_pos.y--; + wchar_t *nl_ptr = NULL; + wchar_t *line_start = fui->text; + + break; + case KEY_DOWN: + fui->cur_shift_pos.y++; + break; default: fui->text[fui->text_len++] = key; fui->text[fui->text_len] = 0; @@ -74,6 +87,8 @@ static int32_t process_user_input(app_t *app, w_cb_args_t *d_args) { void w_te_reset_app(void *app); w_te_ui_t *w_te_init_win(app_t *app) { + wchar_t top_text[INBUFSIZE]; + int top_text_len = 0; w_te_ui_t *fui = malloc(sizeof(w_te_ui_t)); app->main_ui.ui = fui; app->main_ui.type = mw_f_desc; @@ -86,19 +101,24 @@ w_te_ui_t *w_te_init_win(app_t *app) { app->active_callback = w_te_cb; fui->w.callback = w_te_cb; w_init(&(fui->w), NULL, &(app->win), ""); - + fui->file_ptr = app->query_args->file; fui->w.sz.x = getmaxx(app->win); fui->w.sz.y = getmaxy(app->win); fui->w.parent_win = &(app->win); /* * INIT UI * */ fui->win = newwin(fui->w.sz.y - 4, fui->w.sz.x - 2, 2, 1); + top_text_len = + swprintf(top_text, INBUFSIZE, L"Description: %s", fui->file_ptr->name); + app->top_text = malloc(sizeof(wchar_t) * (top_text_len + 1)); + wcsncpy(app->top_text, top_text, top_text_len); + app->top_text[top_text_len] = 0; return fui; } void w_te_reset(w_te_ui_t *fl_ui) { fl_ui->text[0] = 0; - fl_ui->cur_pos.x = 0; - fl_ui->cur_pos.y = 0; + fl_ui->cur_shift_pos.x = 0; + fl_ui->cur_shift_pos.y = 0; fl_ui->text_len = 0; } @@ -132,20 +152,26 @@ void w_te_draw(w_te_ui_t *fui) { wchar_t *nl_ptr = wcschr(cur_ptr, '\n'); if (nl_ptr == NULL) { - mvwaddnwstr(win, p_y++, p_x, cur_ptr, fui->text_len); + mvwaddnwstr(win, p_y, p_x, cur_ptr, fui->text_len); + p_x += fui->text_len; } else { while (true) { mvwaddnwstr(win, p_y++, p_x, cur_ptr, nl_ptr - cur_ptr); cur_ptr = nl_ptr + 1; nl_ptr = wcschr(cur_ptr, '\n'); if (nl_ptr == NULL) { - mvwaddnwstr(win, p_y++, p_x, cur_ptr, wcslen(cur_ptr)); + int tlen = wcslen(cur_ptr); + mvwaddnwstr(win, p_y, p_x, cur_ptr, tlen); + p_x += tlen; break; } } } - fui->cur_pos.y = i; + fui->cur_abs_pos.y = p_y; + fui->cur_abs_pos.x = p_x; + + wmove(win, fui->cur_abs_pos.y + fui->cur_shift_pos.y, fui->cur_abs_pos.x + fui->cur_shift_pos.x); p_x = 1; diff --git a/src/windows/text_edit.h b/src/windows/text_edit.h index 6e8a529..75db0ad 100644 --- a/src/windows/text_edit.h +++ b/src/windows/text_edit.h @@ -5,29 +5,34 @@ #define W_TEXT_EDIT_H #include "../app.h" -#include -#include -#include #include +#include #include #include +#include +#include typedef struct { - w_t w; - WINDOW *win; - wchar_t text[INBUFSIZE * 10]; - int text_len; - struct { - int x; - int y; - } cur_pos; - void *file_pt; // TODO: уточнить + w_t w; + WINDOW *win; + wchar_t text[INBUFSIZE * 10]; + int text_len; + int text_cur_pos; + struct { + int x; + int y; + } cur_shift_pos; + struct { + int x; + int y; + } cur_abs_pos; + p_file_t *file_ptr; // TODO: уточнить } w_te_ui_t; -void w_te_draw(w_te_ui_t *fl_ui); -void w_te_destroy(w_te_ui_t **fui); -void w_te_reset(w_te_ui_t *fl_ui); -w_te_ui_t *w_te_init(WINDOW **win, w_t *w_parent); -w_te_ui_t *w_te_init_win(app_t *app); +void w_te_draw(w_te_ui_t *fl_ui); +void w_te_destroy(w_te_ui_t **fui); +void w_te_reset(w_te_ui_t *fl_ui); +w_te_ui_t *w_te_init(WINDOW **win, w_t *w_parent); +w_te_ui_t *w_te_init_win(app_t *app); #endif \ No newline at end of file From 35c666126ef7ee4e958f7c1b1daa219f456370be Mon Sep 17 00:00:00 2001 From: Alexander Zhylin Date: Fri, 17 Jul 2026 16:43:11 +0300 Subject: [PATCH 05/14] text edit: new line processing mechanism [not finished] --- src/utils/d_array.c | 18 +++++++++ src/utils/d_array.h | 7 ++++ src/utils/dlist.c | 63 +++++++++++++++++++++++++++++++ src/windows/text_edit.c | 83 ++++++++++++++++++++++++++--------------- src/windows/text_edit.h | 15 ++++++-- 5 files changed, 151 insertions(+), 35 deletions(-) create mode 100644 src/utils/dlist.c diff --git a/src/utils/d_array.c b/src/utils/d_array.c index f0fba1d..ca9968a 100644 --- a/src/utils/d_array.c +++ b/src/utils/d_array.c @@ -13,6 +13,12 @@ void u_d_arr_ptr_init(d_array_ptr_t *arr, int32_t init_capacity) { memset(arr->arr, 0, sizeof(void *) * init_capacity); } +/* TODO: check out the correctness */ +void u_d_array_append(d_array_ptr_t *arr, void *el_ptr, size_t el_len) { + void *el = malloc(el_len); + u_d_arr_ptr_add(arr, el, arr->length); +} + void u_d_arr_ptr_add(d_array_ptr_t *arr, void *ptr, int32_t idx) { if (idx > arr->capacity - 1) { int32_t new_capacity = idx * 2; @@ -31,4 +37,16 @@ void u_d_arr_ptr_free(d_array_ptr_t *arr) { arr->length = 0; free(arr->arr); arr->arr = NULL; +} + +void u_d_arr_free_cb(d_array_ptr_t *arr, u_d_arr_free_callback *callback) { + for (int i = 0; i < arr->length; i++) { + if (arr->arr[i] != NULL) { + callback(arr->arr[i]); + } + } + arr->capacity = 0; + arr->length = 0; + free(arr->arr); + arr->arr = NULL; } \ No newline at end of file diff --git a/src/utils/d_array.h b/src/utils/d_array.h index a486f90..93c699c 100644 --- a/src/utils/d_array.h +++ b/src/utils/d_array.h @@ -1,7 +1,10 @@ #ifndef D_ARRAY_H #define D_ARRAY_H /* Dynamic array of numbers */ + +#include #include + typedef struct d_array_ptr_t { int32_t capacity; int32_t length; @@ -10,8 +13,12 @@ typedef struct d_array_ptr_t { void *last_el; } d_array_ptr_t; +typedef void *u_d_arr_free_callback(void *arg); + void u_d_arr_ptr_init(d_array_ptr_t *arr, int32_t init_capacity); void u_d_arr_ptr_add(d_array_ptr_t *arr, void *ptr, int32_t idx); void u_d_arr_ptr_free(d_array_ptr_t *arr); +void u_d_array_append(d_array_ptr_t *arr, void *el_ptr, size_t el_len); +void u_d_arr_free_cb(d_array_ptr_t *arr, u_d_arr_free_callback *callback); #endif \ No newline at end of file diff --git a/src/utils/dlist.c b/src/utils/dlist.c new file mode 100644 index 0000000..81c43ab --- /dev/null +++ b/src/utils/dlist.c @@ -0,0 +1,63 @@ +#include +#include +#include +#include +#include + +typedef struct dlist_el_t { + struct dlist_el_t *next; + struct dlist_el_t *previous; + void *el_ptr; +} dlist_el_t; + +typedef struct dlist_t { + dlist_el_t *start; + dlist_el_t *current; + size_t len; +} dlist_t; + +void dlist_add(dlist_t *dlist, void *el_ptr, int el_siz, bool prepend); + +dlist_t *dlist_init(void *el_ptr, int el_siz) { + dlist_t *dlist = malloc(sizeof(dlist_t)); + dlist->len = 0; + dlist->current = NULL; + dlist->start = NULL; + + if (el_ptr != NULL) { + dlist_add(dlist, el_ptr, el_siz, false); + } + + return dlist; +} + +void dlist_add(dlist_t *dlist, void *el_ptr, int el_siz, bool prepend) { + dlist_el_t *d_el = malloc(sizeof(dlist_el_t)); + d_el->el_ptr = malloc(el_siz); + memcpy(d_el->el_ptr, el_ptr, el_siz); + + if (dlist->start == NULL) { + d_el->previous = NULL; + d_el->next = NULL; + dlist->start = d_el; + dlist->current = d_el; + } else if (prepend) { + d_el->previous = NULL; + d_el->next = dlist->start; + dlist->start = d_el; + } else { + d_el->next = NULL; + dlist->current->next = d_el; + dlist->current = d_el; + } + dlist->len++; +} + +void *dlist_get_current(dlist_t *dlist) { + return dlist->current->el_ptr; +} + +void *dlist_it_prev(dlist_t *dlist) { + dlist->current = dlist->current->previous; + return dlist->current; +} \ No newline at end of file diff --git a/src/windows/text_edit.c b/src/windows/text_edit.c index aa2b56c..3d3d9cc 100644 --- a/src/windows/text_edit.c +++ b/src/windows/text_edit.c @@ -7,9 +7,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -20,27 +18,42 @@ /* TODO: create dynamic array of endline positions */ +/* + Массив d_array, состоящие из элементов, описывающий строки. + В строках записывать: длину, номер строки. +*/ + static void w_te_cb(w_cb_args_t *args) { app_t *app = args->app; int32_t key = *((int32_t *)args->data); w_te_ui_t *fui = app->query_args->main_ui->ui; + w_te_ui_line_t *line = NULL; + switch (key) { case KEY_BACKSPACE: case KEY_DL: - fui->text[fui->text_len--] = 0; + fui->line[fui->line_len--] = 0; break; case KEY_UP: fui->cur_shift_pos.y--; wchar_t *nl_ptr = NULL; - wchar_t *line_start = fui->text; - + wchar_t *line_start = fui->line; break; case KEY_DOWN: fui->cur_shift_pos.y++; break; + case '\n': + line = malloc(sizeof (w_te_ui_line_t)); + line->text = malloc(sizeof (wchar_t ) * (fui->line_len + 1)); + wcscpy(line->text, fui->line); + line->capacity = line->len = fui->line_len; + u_d_array_append(&(fui->lines_arr), fui->line, fui->line_len); + fui->line[0] = 0; + fui->line_len = 0; + break; default: - fui->text[fui->text_len++] = key; - fui->text[fui->text_len] = 0; + fui->line[fui->line_len++] = key; + fui->line[fui->line_len] = 0; } } @@ -112,14 +125,15 @@ w_te_ui_t *w_te_init_win(app_t *app) { app->top_text = malloc(sizeof(wchar_t) * (top_text_len + 1)); wcsncpy(app->top_text, top_text, top_text_len); app->top_text[top_text_len] = 0; + u_d_arr_ptr_init(&(fui->lines_arr), INBUFSIZE); return fui; } -void w_te_reset(w_te_ui_t *fl_ui) { - fl_ui->text[0] = 0; - fl_ui->cur_shift_pos.x = 0; - fl_ui->cur_shift_pos.y = 0; - fl_ui->text_len = 0; +void w_te_reset(w_te_ui_t *fui) { + fui->line[0] = 0; + fui->cur_shift_pos.x = 0; + fui->cur_shift_pos.y = 0; + fui->line_len = 0; } void w_te_reset_app(void *app) { @@ -146,32 +160,39 @@ void w_te_draw(w_te_ui_t *fui) { mvwprintw(win, p_y + i, p_x, "%*s", fui->w.sz.x, ""); } - int len_rest = fui->text_len; + int len_rest = fui->line_len; - wchar_t *cur_ptr = fui->text; + wchar_t *cur_ptr = fui->line; wchar_t *nl_ptr = wcschr(cur_ptr, '\n'); - - if (nl_ptr == NULL) { - mvwaddnwstr(win, p_y, p_x, cur_ptr, fui->text_len); - p_x += fui->text_len; - } else { - while (true) { - mvwaddnwstr(win, p_y++, p_x, cur_ptr, nl_ptr - cur_ptr); - cur_ptr = nl_ptr + 1; - nl_ptr = wcschr(cur_ptr, '\n'); - if (nl_ptr == NULL) { - int tlen = wcslen(cur_ptr); - mvwaddnwstr(win, p_y, p_x, cur_ptr, tlen); - p_x += tlen; - break; - } - } + // if (nl_ptr == NULL) { + // mvwaddnwstr(win, p_y, p_x, cur_ptr, fui->line_len); + // p_x += fui->line_len; + // } else { + // while (true) { + // mvwaddnwstr(win, p_y++, p_x, cur_ptr, nl_ptr - cur_ptr); + // cur_ptr = nl_ptr + 1; + // nl_ptr = wcschr(cur_ptr, '\n'); + // if (nl_ptr == NULL) { + // int tlen = wcslen(cur_ptr); + // mvwaddnwstr(win, p_y, p_x, cur_ptr, tlen); + // p_x += tlen; + // break; + // } + // } + // } + w_te_ui_line_t *line_arr_el = NULL; + for (int i = 0; i < fui->lines_arr.length; i++) { + line_arr_el = (w_te_ui_line_t *) fui->lines_arr.arr[i]; + mvwaddnwstr(win, p_y++, p_x, line_arr_el->text, line_arr_el->len); } + mvwaddnwstr(win, p_y, p_x, fui->line, fui->line_len); + fui->cur_abs_pos.y = p_y; fui->cur_abs_pos.x = p_x; - wmove(win, fui->cur_abs_pos.y + fui->cur_shift_pos.y, fui->cur_abs_pos.x + fui->cur_shift_pos.x); + wmove(win, fui->cur_abs_pos.y + fui->cur_shift_pos.y, + fui->cur_abs_pos.x + fui->cur_shift_pos.x); p_x = 1; diff --git a/src/windows/text_edit.h b/src/windows/text_edit.h index 75db0ad..3215004 100644 --- a/src/windows/text_edit.h +++ b/src/windows/text_edit.h @@ -15,9 +15,9 @@ typedef struct { w_t w; WINDOW *win; - wchar_t text[INBUFSIZE * 10]; - int text_len; - int text_cur_pos; + wchar_t line[INBUFSIZE * 10]; + int line_len; + int line_cur_pos; struct { int x; int y; @@ -26,9 +26,16 @@ typedef struct { int x; int y; } cur_abs_pos; - p_file_t *file_ptr; // TODO: уточнить + p_file_t *file_ptr; + d_array_ptr_t lines_arr; } w_te_ui_t; +typedef struct { + int len; + wchar_t *text; /* TODO: make dynamic */ + int capacity; +} w_te_ui_line_t; + void w_te_draw(w_te_ui_t *fl_ui); void w_te_destroy(w_te_ui_t **fui); void w_te_reset(w_te_ui_t *fl_ui); From 269bd0aa7269c760e193a8a79e16e623f35be91a Mon Sep 17 00:00:00 2001 From: Alexander Zhylin Date: Mon, 20 Jul 2026 18:41:51 +0300 Subject: [PATCH 06/14] text edit: changes line processing. --- src/utils/d_array.c | 4 +-- src/windows/text_edit.c | 61 ++++++++++++++++------------------------- src/windows/text_edit.h | 15 +++++----- 3 files changed, 32 insertions(+), 48 deletions(-) diff --git a/src/utils/d_array.c b/src/utils/d_array.c index ca9968a..c4fea46 100644 --- a/src/utils/d_array.c +++ b/src/utils/d_array.c @@ -13,10 +13,8 @@ void u_d_arr_ptr_init(d_array_ptr_t *arr, int32_t init_capacity) { memset(arr->arr, 0, sizeof(void *) * init_capacity); } -/* TODO: check out the correctness */ void u_d_array_append(d_array_ptr_t *arr, void *el_ptr, size_t el_len) { - void *el = malloc(el_len); - u_d_arr_ptr_add(arr, el, arr->length); + u_d_arr_ptr_add(arr, el_ptr, arr->length); } void u_d_arr_ptr_add(d_array_ptr_t *arr, void *ptr, int32_t idx) { diff --git a/src/windows/text_edit.c b/src/windows/text_edit.c index 3d3d9cc..8ef1645 100644 --- a/src/windows/text_edit.c +++ b/src/windows/text_edit.c @@ -27,12 +27,12 @@ static void w_te_cb(w_cb_args_t *args) { app_t *app = args->app; int32_t key = *((int32_t *)args->data); w_te_ui_t *fui = app->query_args->main_ui->ui; - w_te_ui_line_t *line = NULL; + w_te_ui_line_t *new_line = NULL; switch (key) { case KEY_BACKSPACE: case KEY_DL: - fui->line[fui->line_len--] = 0; + fui->current_line->text[fui->current_line->len--] = 0; break; case KEY_UP: fui->cur_shift_pos.y--; @@ -43,17 +43,18 @@ static void w_te_cb(w_cb_args_t *args) { fui->cur_shift_pos.y++; break; case '\n': - line = malloc(sizeof (w_te_ui_line_t)); - line->text = malloc(sizeof (wchar_t ) * (fui->line_len + 1)); - wcscpy(line->text, fui->line); - line->capacity = line->len = fui->line_len; - u_d_array_append(&(fui->lines_arr), fui->line, fui->line_len); - fui->line[0] = 0; - fui->line_len = 0; + new_line = malloc(sizeof(w_te_ui_line_t)); + new_line->text = malloc(sizeof(wchar_t) * INBUFSIZE); + new_line->capacity = new_line->len = INBUFSIZE; + new_line->text[0] = 0; + new_line->len = 0; + + u_d_array_append(&(fui->lines_arr), new_line, sizeof(w_te_ui_line_t)); + fui->current_line = new_line; break; default: - fui->line[fui->line_len++] = key; - fui->line[fui->line_len] = 0; + fui->current_line->text[fui->current_line->len++] = key; + fui->current_line->text[fui->current_line->len] = 0; } } @@ -126,6 +127,11 @@ w_te_ui_t *w_te_init_win(app_t *app) { wcsncpy(app->top_text, top_text, top_text_len); app->top_text[top_text_len] = 0; u_d_arr_ptr_init(&(fui->lines_arr), INBUFSIZE); + fui->current_line = malloc(sizeof(w_te_ui_line_t)); + fui->current_line->text = malloc(INBUFSIZE * sizeof(wchar_t)); + fui->current_line->len = 0; + fui->current_line->capacity = INBUFSIZE; + u_d_array_append(&(fui->lines_arr), fui->current_line, sizeof(w_te_ui_line_t)); return fui; } @@ -133,7 +139,6 @@ void w_te_reset(w_te_ui_t *fui) { fui->line[0] = 0; fui->cur_shift_pos.x = 0; fui->cur_shift_pos.y = 0; - fui->line_len = 0; } void w_te_reset_app(void *app) { @@ -160,40 +165,20 @@ void w_te_draw(w_te_ui_t *fui) { mvwprintw(win, p_y + i, p_x, "%*s", fui->w.sz.x, ""); } - int len_rest = fui->line_len; - wchar_t *cur_ptr = fui->line; wchar_t *nl_ptr = wcschr(cur_ptr, '\n'); - // if (nl_ptr == NULL) { - // mvwaddnwstr(win, p_y, p_x, cur_ptr, fui->line_len); - // p_x += fui->line_len; - // } else { - // while (true) { - // mvwaddnwstr(win, p_y++, p_x, cur_ptr, nl_ptr - cur_ptr); - // cur_ptr = nl_ptr + 1; - // nl_ptr = wcschr(cur_ptr, '\n'); - // if (nl_ptr == NULL) { - // int tlen = wcslen(cur_ptr); - // mvwaddnwstr(win, p_y, p_x, cur_ptr, tlen); - // p_x += tlen; - // break; - // } - // } - // } w_te_ui_line_t *line_arr_el = NULL; - for (int i = 0; i < fui->lines_arr.length; i++) { - line_arr_el = (w_te_ui_line_t *) fui->lines_arr.arr[i]; - mvwaddnwstr(win, p_y++, p_x, line_arr_el->text, line_arr_el->len); - } - mvwaddnwstr(win, p_y, p_x, fui->line, fui->line_len); + if (fui->lines_arr.length > 0) { + for (int i = 0; i < fui->lines_arr.length; i++) { + line_arr_el = (w_te_ui_line_t *)fui->lines_arr.arr[i]; + mvwaddnwstr(win, p_y++, p_x, line_arr_el->text, line_arr_el->len); + } + } fui->cur_abs_pos.y = p_y; fui->cur_abs_pos.x = p_x; - wmove(win, fui->cur_abs_pos.y + fui->cur_shift_pos.y, - fui->cur_abs_pos.x + fui->cur_shift_pos.x); - p_x = 1; wattroff(win, A_BOLD); diff --git a/src/windows/text_edit.h b/src/windows/text_edit.h index 3215004..a47729e 100644 --- a/src/windows/text_edit.h +++ b/src/windows/text_edit.h @@ -12,11 +12,17 @@ #include #include +typedef struct { + int len; + wchar_t *text; /* TODO: make dynamic */ + int capacity; +} w_te_ui_line_t; + + typedef struct { w_t w; WINDOW *win; wchar_t line[INBUFSIZE * 10]; - int line_len; int line_cur_pos; struct { int x; @@ -27,15 +33,10 @@ typedef struct { int y; } cur_abs_pos; p_file_t *file_ptr; + w_te_ui_line_t *current_line; d_array_ptr_t lines_arr; } w_te_ui_t; -typedef struct { - int len; - wchar_t *text; /* TODO: make dynamic */ - int capacity; -} w_te_ui_line_t; - void w_te_draw(w_te_ui_t *fl_ui); void w_te_destroy(w_te_ui_t **fui); void w_te_reset(w_te_ui_t *fl_ui); From daded0017161fd907f08bfc016e62643b07c1afb Mon Sep 17 00:00:00 2001 From: Alexander Zhylin Date: Tue, 21 Jul 2026 18:13:02 +0300 Subject: [PATCH 07/14] text edit: text navigation. --- src/utils/d_array.c | 29 +++++++++++-- src/utils/d_array.h | 2 +- src/utils/utf8.c | 21 ++++++++- src/utils/utf8.h | 1 + src/widget/input.c | 16 +------ src/windows/text_edit.c | 96 +++++++++++++++++++++++++++++------------ src/windows/text_edit.h | 19 +++----- 7 files changed, 123 insertions(+), 61 deletions(-) diff --git a/src/utils/d_array.c b/src/utils/d_array.c index c4fea46..961482d 100644 --- a/src/utils/d_array.c +++ b/src/utils/d_array.c @@ -21,13 +21,36 @@ void u_d_arr_ptr_add(d_array_ptr_t *arr, void *ptr, int32_t idx) { if (idx > arr->capacity - 1) { int32_t new_capacity = idx * 2; arr->arr = realloc(arr->arr, new_capacity); - memset(arr->arr+arr->capacity, 0, arr->capacity - new_capacity); + memset(arr->arr + arr->capacity, 0, arr->capacity - new_capacity); arr->capacity = new_capacity; } - if (arr->fist_el == NULL) arr->fist_el = ptr; + if (arr->fist_el == NULL) + arr->fist_el = ptr; arr->last_el = ptr; arr->arr[idx] = ptr; - arr->length = idx+1; + arr->length = idx + 1; +} + +void u_d_arr_ptr_remove_cb(d_array_ptr_t *arr, void *ptr, int32_t idx, + u_d_arr_free_callback *callback) { + void *_ptr = NULL; + int _idx = idx; + + if (idx > 0) { + _ptr = arr->arr[idx]; + } else if (ptr != NULL) { + for (int i = 0; i < arr->length; i++) { + if (arr->arr[i] == ptr) { + _ptr = arr->arr[i]; + _idx = i; + } + } + } + + callback(_ptr); + arr->arr[_idx] = NULL; + arr->length--; + memmove(arr->arr[_idx], arr->arr[_idx+1], arr->length - _idx); } void u_d_arr_ptr_free(d_array_ptr_t *arr) { diff --git a/src/utils/d_array.h b/src/utils/d_array.h index 93c699c..73369fd 100644 --- a/src/utils/d_array.h +++ b/src/utils/d_array.h @@ -13,7 +13,7 @@ typedef struct d_array_ptr_t { void *last_el; } d_array_ptr_t; -typedef void *u_d_arr_free_callback(void *arg); +typedef void u_d_arr_free_callback(void *arg); void u_d_arr_ptr_init(d_array_ptr_t *arr, int32_t init_capacity); void u_d_arr_ptr_add(d_array_ptr_t *arr, void *ptr, int32_t idx); diff --git a/src/utils/utf8.c b/src/utils/utf8.c index d4aa37f..e2adf28 100644 --- a/src/utils/utf8.c +++ b/src/utils/utf8.c @@ -55,9 +55,9 @@ int32_t u_utf8_curs_printw(WINDOW *win, int32_t *y, int32_t *x, if (multiline) { _y++; - for (int i = 1; max_len*i < nsize; i++) { + for (int i = 1; max_len * i < nsize; i++) { _x = *x; - mvwaddnwstr(win, _y++, _x, wline + max_len*i, max_len); + mvwaddnwstr(win, _y++, _x, wline + max_len * i, max_len); } } @@ -67,3 +67,20 @@ int32_t u_utf8_curs_printw(WINDOW *win, int32_t *y, int32_t *x, free(wline); return nsize; } + +wchar_t u_utf8_get_full_letter(int key, WINDOW *win) { + char long_key[3]; + int short_val_len = 1; + wchar_t wkey; + long_key[0] = key; + if ((key & 0xC0) == 0xC0) { + long_key[1] = wgetch(win); + long_key[2] = '\0'; + short_val_len++; + } else { + long_key[1] = '\0'; + } + mbstowcs(&wkey, (const char *)&long_key, 2); + + return wkey; +} \ No newline at end of file diff --git a/src/utils/utf8.h b/src/utils/utf8.h index d81ae68..4116612 100644 --- a/src/utils/utf8.h +++ b/src/utils/utf8.h @@ -10,5 +10,6 @@ size_t u_utf8_code_points_count(const char *s); int32_t u_utf8_convert_to_wide(const char *utf8_str, wchar_t **restrict wide_str, size_t *restrict o_len); int32_t u_utf8_curs_printw(WINDOW *win, int32_t *y, int32_t *x, const char* utf8_str, int max_len, bool multiline); +wchar_t u_utf8_get_full_letter(int key, WINDOW *win); #endif \ No newline at end of file diff --git a/src/widget/input.c b/src/widget/input.c index 586fa49..38c9f84 100644 --- a/src/widget/input.c +++ b/src/widget/input.c @@ -16,10 +16,7 @@ bool w_input_default_key_action(w_cb_args_t *args) { w_g_el_t *g_el = args->active_el; w_input_t *input = g_el->element; int32_t start_pos = 0; - wchar_t w_key[2]; app_t *app = args->app; - char long_key[3]; - int short_val_len = 1; switch (key) { case KEY_BACKSPACE: @@ -47,23 +44,14 @@ bool w_input_default_key_action(w_cb_args_t *args) { default: if (input->value_len == input->max_len) break; - long_key[0] = key; - input->value_len++; - if ((key & 0xC0) == 0xC0) { - long_key[1] = wgetch(app->win); - long_key[2] = '\0'; - short_val_len++; - } else { - long_key[1] = '\0'; - } - mbstowcs(w_key, (const char *)&long_key, 2); + key = u_utf8_get_full_letter(key, app->win); if (input->cur_pos > 0) { start_pos = input->value_len - input->cur_pos - 1; memmove(input->w_value + start_pos + 1, input->w_value + start_pos, sizeof(wchar_t) * (input->value_len - start_pos)); input->w_value[start_pos] = key; } else { - input->w_value[input->value_len - 1] = w_key[0]; + input->w_value[input->value_len - 1] = key; input->w_value[input->value_len] = '\0'; } break; diff --git a/src/windows/text_edit.c b/src/windows/text_edit.c index 8ef1645..c2b8164 100644 --- a/src/windows/text_edit.c +++ b/src/windows/text_edit.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -16,12 +17,14 @@ #include "text_edit.h" #include "widget_core.h" -/* TODO: create dynamic array of endline positions */ +/* TODO: расширять capacity линии при достижении лимита */ +/* TODO: нижняя панель-индикатор */ -/* - Массив d_array, состоящие из элементов, описывающий строки. - В строках записывать: длину, номер строки. -*/ +static void line_destroy_cb(void *line_arg) { + w_te_ui_line_t *line = line_arg; + free(line->text); + free(line); +} static void w_te_cb(w_cb_args_t *args) { app_t *app = args->app; @@ -32,15 +35,46 @@ static void w_te_cb(w_cb_args_t *args) { switch (key) { case KEY_BACKSPACE: case KEY_DL: - fui->current_line->text[fui->current_line->len--] = 0; + if (fui->cur_line->len > 0) { + if (fui->cur_line_pos == fui->cur_line->len) { + fui->cur_line->text[--fui->cur_line_pos] = 0; + } else { + int n = fui->cur_line->len - fui->cur_line_pos + 1; + memmove(fui->cur_line->text + fui->cur_line_pos - 1, + fui->cur_line->text + fui->cur_line_pos, n * sizeof(wchar_t)); + fui->cur_line_pos--; + } + fui->cur_line->len--; + } else { + if (fui->cur_line_idx > 0) { + u_d_arr_ptr_remove_cb(&(fui->lines_arr), fui->cur_line, + fui->cur_line_idx, &line_destroy_cb); + fui->cur_line = fui->lines_arr.arr[--fui->cur_line_idx]; + fui->cur_line_pos = fui->cur_line->len; + } + } break; case KEY_UP: - fui->cur_shift_pos.y--; - wchar_t *nl_ptr = NULL; - wchar_t *line_start = fui->line; + if (fui->cur_line_idx > 0) { + fui->cur_line = fui->lines_arr.arr[--fui->cur_line_idx]; + fui->cur_line_pos = fui->cur_line->len; + } break; case KEY_DOWN: - fui->cur_shift_pos.y++; + if (fui->lines_arr.arr[fui->cur_line_idx + 1] != NULL) { + fui->cur_line = fui->lines_arr.arr[++fui->cur_line_idx]; + fui->cur_line_pos = fui->cur_line->len; + } + break; + case KEY_LEFT: + if (fui->cur_line_pos > 0) { + fui->cur_line_pos--; + } + break; + case KEY_RIGHT: + if (fui->cur_line_pos < fui->cur_line->len) { + fui->cur_line_pos++; + } break; case '\n': new_line = malloc(sizeof(w_te_ui_line_t)); @@ -48,13 +82,23 @@ static void w_te_cb(w_cb_args_t *args) { new_line->capacity = new_line->len = INBUFSIZE; new_line->text[0] = 0; new_line->len = 0; - u_d_array_append(&(fui->lines_arr), new_line, sizeof(w_te_ui_line_t)); - fui->current_line = new_line; + fui->cur_line = new_line; + fui->cur_line_idx++; + fui->cur_line_pos = 0; break; default: - fui->current_line->text[fui->current_line->len++] = key; - fui->current_line->text[fui->current_line->len] = 0; + key = u_utf8_get_full_letter(key, app->win); + if (fui->cur_line_pos == fui->cur_line->len) { + fui->cur_line->text[fui->cur_line_pos++] = key; + fui->cur_line->text[fui->cur_line_pos] = 0; + } else { + int n = fui->cur_line->len - fui->cur_line_pos + 1; + memmove(fui->cur_line->text + fui->cur_line_pos + 1, + fui->cur_line->text + fui->cur_line_pos, n * sizeof(wchar_t)); + fui->cur_line->text[fui->cur_line_pos++] = key; + } + fui->cur_line->len++; } } @@ -127,19 +171,16 @@ w_te_ui_t *w_te_init_win(app_t *app) { wcsncpy(app->top_text, top_text, top_text_len); app->top_text[top_text_len] = 0; u_d_arr_ptr_init(&(fui->lines_arr), INBUFSIZE); - fui->current_line = malloc(sizeof(w_te_ui_line_t)); - fui->current_line->text = malloc(INBUFSIZE * sizeof(wchar_t)); - fui->current_line->len = 0; - fui->current_line->capacity = INBUFSIZE; - u_d_array_append(&(fui->lines_arr), fui->current_line, sizeof(w_te_ui_line_t)); + fui->cur_line = malloc(sizeof(w_te_ui_line_t)); + fui->cur_line->text = malloc(INBUFSIZE * sizeof(wchar_t)); + fui->cur_line->len = 0; + fui->cur_line->capacity = INBUFSIZE; + u_d_array_append(&(fui->lines_arr), fui->cur_line, sizeof(w_te_ui_line_t)); + fui->cur_line_idx = 0; return fui; } -void w_te_reset(w_te_ui_t *fui) { - fui->line[0] = 0; - fui->cur_shift_pos.x = 0; - fui->cur_shift_pos.y = 0; -} +void w_te_reset(w_te_ui_t *fui) { fui->cur_line_pos = 0; } void w_te_reset_app(void *app) { app_t *_app = app; @@ -165,8 +206,6 @@ void w_te_draw(w_te_ui_t *fui) { mvwprintw(win, p_y + i, p_x, "%*s", fui->w.sz.x, ""); } - wchar_t *cur_ptr = fui->line; - wchar_t *nl_ptr = wcschr(cur_ptr, '\n'); w_te_ui_line_t *line_arr_el = NULL; if (fui->lines_arr.length > 0) { @@ -176,8 +215,9 @@ void w_te_draw(w_te_ui_t *fui) { } } - fui->cur_abs_pos.y = p_y; - fui->cur_abs_pos.x = p_x; + p_y--; + + wmove(win, fui->cur_line_idx, fui->cur_line_pos); p_x = 1; diff --git a/src/windows/text_edit.h b/src/windows/text_edit.h index a47729e..218c5a2 100644 --- a/src/windows/text_edit.h +++ b/src/windows/text_edit.h @@ -21,19 +21,11 @@ typedef struct { typedef struct { w_t w; - WINDOW *win; - wchar_t line[INBUFSIZE * 10]; - int line_cur_pos; - struct { - int x; - int y; - } cur_shift_pos; - struct { - int x; - int y; - } cur_abs_pos; - p_file_t *file_ptr; - w_te_ui_line_t *current_line; + WINDOW *win; + p_file_t *file_ptr; + w_te_ui_line_t *cur_line; + int cur_line_idx; + int cur_line_pos; d_array_ptr_t lines_arr; } w_te_ui_t; @@ -42,5 +34,6 @@ void w_te_destroy(w_te_ui_t **fui); void w_te_reset(w_te_ui_t *fl_ui); w_te_ui_t *w_te_init(WINDOW **win, w_t *w_parent); w_te_ui_t *w_te_init_win(app_t *app); +void u_d_arr_ptr_remove_cb(d_array_ptr_t *arr, void *ptr, int32_t idx, u_d_arr_free_callback *callback); #endif \ No newline at end of file From 23eaae7848348fc8c132ce68a40b9ba0d7ad875e Mon Sep 17 00:00:00 2001 From: Alexander Zhylin Date: Wed, 22 Jul 2026 18:51:59 +0300 Subject: [PATCH 08/14] text edit: bottom indicator panel. line split/concatenate. arrow button navigation improvements. --- src/utils/d_array.c | 25 +++++---- src/windows/text_edit.c | 111 ++++++++++++++++++++++++++++++++-------- src/windows/text_edit.h | 5 +- 3 files changed, 109 insertions(+), 32 deletions(-) diff --git a/src/utils/d_array.c b/src/utils/d_array.c index 961482d..92c4254 100644 --- a/src/utils/d_array.c +++ b/src/utils/d_array.c @@ -26,6 +26,10 @@ void u_d_arr_ptr_add(d_array_ptr_t *arr, void *ptr, int32_t idx) { } if (arr->fist_el == NULL) arr->fist_el = ptr; + + if (arr->arr[idx] != NULL) { + memmove(arr->arr + idx + 1, arr->arr + idx, sizeof (void *) * (arr->length - idx)); + } arr->last_el = ptr; arr->arr[idx] = ptr; arr->length = idx + 1; @@ -50,7 +54,10 @@ void u_d_arr_ptr_remove_cb(d_array_ptr_t *arr, void *ptr, int32_t idx, callback(_ptr); arr->arr[_idx] = NULL; arr->length--; - memmove(arr->arr[_idx], arr->arr[_idx+1], arr->length - _idx); + memmove(arr->arr + _idx, arr->arr + _idx + 1, + (arr->length - _idx) * sizeof(void *)); + arr->arr[arr->length] = NULL; + return; } void u_d_arr_ptr_free(d_array_ptr_t *arr) { @@ -60,14 +67,14 @@ void u_d_arr_ptr_free(d_array_ptr_t *arr) { arr->arr = NULL; } -void u_d_arr_free_cb(d_array_ptr_t *arr, u_d_arr_free_callback *callback) { - for (int i = 0; i < arr->length; i++) { - if (arr->arr[i] != NULL) { - callback(arr->arr[i]); +void u_d_arr_free_cb(d_array_ptr_t *d_arr, u_d_arr_free_callback *callback) { + for (int i = 0; i < d_arr->length; i++) { + if (d_arr->arr[i] != NULL) { + callback(d_arr->arr[i]); } } - arr->capacity = 0; - arr->length = 0; - free(arr->arr); - arr->arr = NULL; + d_arr->capacity = 0; + d_arr->length = 0; + free(d_arr->arr); + d_arr->arr = NULL; } \ No newline at end of file diff --git a/src/windows/text_edit.c b/src/windows/text_edit.c index c2b8164..b76a627 100644 --- a/src/windows/text_edit.c +++ b/src/windows/text_edit.c @@ -14,11 +14,13 @@ #include #include +#include "d_array.h" #include "text_edit.h" #include "widget_core.h" /* TODO: расширять capacity линии при достижении лимита */ -/* TODO: нижняя панель-индикатор */ +/* TODO: check correctness of cursor navigation when concatenate and split the lines */ +#define INACTIVE_LINES 5 static void line_destroy_cb(void *line_arg) { w_te_ui_line_t *line = line_arg; @@ -35,45 +37,74 @@ static void w_te_cb(w_cb_args_t *args) { switch (key) { case KEY_BACKSPACE: case KEY_DL: - if (fui->cur_line->len > 0) { - if (fui->cur_line_pos == fui->cur_line->len) { - fui->cur_line->text[--fui->cur_line_pos] = 0; - } else { - int n = fui->cur_line->len - fui->cur_line_pos + 1; - memmove(fui->cur_line->text + fui->cur_line_pos - 1, - fui->cur_line->text + fui->cur_line_pos, n * sizeof(wchar_t)); - fui->cur_line_pos--; - } + if (fui->cur_line_pos == fui->cur_line->len && fui->cur_line->len > 0) { + fui->cur_line->text[--fui->cur_line_pos] = 0; fui->cur_line->len--; - } else { - if (fui->cur_line_idx > 0) { - u_d_arr_ptr_remove_cb(&(fui->lines_arr), fui->cur_line, - fui->cur_line_idx, &line_destroy_cb); - fui->cur_line = fui->lines_arr.arr[--fui->cur_line_idx]; + } else if (fui->cur_line_idx > 0) { + new_line = fui->lines_arr.arr[fui->cur_line_idx - 1]; + if (fui->cur_line_pos == 0 && fui->cur_line->len > 0) { + wcscpy(new_line->text + new_line->len, fui->cur_line->text); fui->cur_line_pos = fui->cur_line->len; + new_line->len += fui->cur_line->len; + } else { + fui->cur_line_pos = new_line->len; } + + u_d_arr_ptr_remove_cb(&(fui->lines_arr), fui->cur_line, fui->cur_line_idx, + &line_destroy_cb); + fui->cur_line = fui->lines_arr.arr[--fui->cur_line_idx]; + fui->lines_count--; + } else { + int n = fui->cur_line->len - fui->cur_line_pos + 1; + memmove(fui->cur_line->text + fui->cur_line_pos - 1, + fui->cur_line->text + fui->cur_line_pos, n * sizeof(wchar_t)); + fui->cur_line->len--; + fui->cur_line_pos--; } + fui->sym_count--; break; case KEY_UP: if (fui->cur_line_idx > 0) { fui->cur_line = fui->lines_arr.arr[--fui->cur_line_idx]; fui->cur_line_pos = fui->cur_line->len; + if ((fui->cur_line_idx > 0) && + (fui->cur_line_idx - fui->lines_top_indent == 0)) { + fui->lines_top_indent--; + } } break; case KEY_DOWN: - if (fui->lines_arr.arr[fui->cur_line_idx + 1] != NULL) { + if ((fui->lines_arr.arr[fui->cur_line_idx + 1] != NULL)) { fui->cur_line = fui->lines_arr.arr[++fui->cur_line_idx]; fui->cur_line_pos = fui->cur_line->len; + if (fui->cur_line_idx >= + fui->lines_top_indent + fui->w.sz.y - INACTIVE_LINES) { + fui->lines_top_indent++; + } } break; case KEY_LEFT: if (fui->cur_line_pos > 0) { fui->cur_line_pos--; + } else if (fui->cur_line_idx > 0) { /* ACT LIKE KEY TOP */ + fui->cur_line = fui->lines_arr.arr[--fui->cur_line_idx]; + fui->cur_line_pos = fui->cur_line->len; + if ((fui->cur_line_idx > 0) && + (fui->cur_line_idx - fui->lines_top_indent == 0)) { + fui->lines_top_indent--; + } } break; case KEY_RIGHT: if (fui->cur_line_pos < fui->cur_line->len) { fui->cur_line_pos++; + } else if ((fui->lines_arr.arr[fui->cur_line_idx + 1] != NULL)) { /* ACT LIKE KEY BOTTOM */ + fui->cur_line = fui->lines_arr.arr[++fui->cur_line_idx]; + fui->cur_line_pos = fui->cur_line->len; + if (fui->cur_line_idx >= + fui->lines_top_indent + fui->w.sz.y - INACTIVE_LINES) { + fui->lines_top_indent++; + } } break; case '\n': @@ -82,10 +113,23 @@ static void w_te_cb(w_cb_args_t *args) { new_line->capacity = new_line->len = INBUFSIZE; new_line->text[0] = 0; new_line->len = 0; - u_d_array_append(&(fui->lines_arr), new_line, sizeof(w_te_ui_line_t)); + if (fui->cur_line_pos != 0) { + u_d_arr_ptr_add(&(fui->lines_arr), new_line, fui->cur_line_idx + 1); + wcscpy(new_line->text, fui->cur_line->text + fui->cur_line_pos); + new_line->len = fui->cur_line->len - fui->cur_line_pos; + fui->cur_line->text[fui->cur_line_pos] = 0; + fui->cur_line->len -= new_line->len; + } else { + u_d_array_append(&(fui->lines_arr), new_line, sizeof(w_te_ui_line_t)); + } + fui->cur_line_pos = 0; fui->cur_line = new_line; fui->cur_line_idx++; - fui->cur_line_pos = 0; + fui->sym_count++; + fui->lines_count++; + if (fui->cur_line_idx >= fui->w.sz.y - INACTIVE_LINES) { + fui->lines_top_indent++; + } break; default: key = u_utf8_get_full_letter(key, app->win); @@ -98,6 +142,7 @@ static void w_te_cb(w_cb_args_t *args) { fui->cur_line->text + fui->cur_line_pos, n * sizeof(wchar_t)); fui->cur_line->text[fui->cur_line_pos++] = key; } + fui->sym_count++; fui->cur_line->len++; } } @@ -177,10 +222,19 @@ w_te_ui_t *w_te_init_win(app_t *app) { fui->cur_line->capacity = INBUFSIZE; u_d_array_append(&(fui->lines_arr), fui->cur_line, sizeof(w_te_ui_line_t)); fui->cur_line_idx = 0; + fui->sym_count = 0; + fui->lines_count = 1; + fui->lines_top_indent = 0; return fui; } -void w_te_reset(w_te_ui_t *fui) { fui->cur_line_pos = 0; } +void w_te_reset(w_te_ui_t *fui) { + fui->cur_line_pos = 0; + fui->sym_count = 0; + fui->lines_count = 1; + fui->lines_top_indent = 0; + u_d_arr_free_cb(&(fui->lines_arr), line_destroy_cb); +} void w_te_reset_app(void *app) { app_t *_app = app; @@ -202,14 +256,27 @@ void w_te_draw(w_te_ui_t *fui) { wattrset(win, COLOR_PAIR(modal_color_pair) | A_BOLD | A_REVERSE); int i = 0; - for (i = 0; i < fui->w.sz.y; i++) { + for (i = 0; i < fui->w.sz.y - INACTIVE_LINES; i++) { mvwprintw(win, p_y + i, p_x, "%*s", fui->w.sz.x, ""); } + wattrset(win, COLOR_PAIR(modal_color_pair) | A_BOLD); + + int len = 0; + mvwprintw(win, p_y + i, p_x, "LC: %d SC: %d L: %d P: %d%n", fui->lines_count, + fui->sym_count, fui->cur_line_idx + 1, fui->cur_line_pos + 1, &len); + + mvwprintw(win, p_y + i, p_x + len, "%*s", fui->w.sz.x - len, ""); + + wattrset(win, COLOR_PAIR(modal_color_pair) | A_BOLD | A_REVERSE); + w_te_ui_line_t *line_arr_el = NULL; if (fui->lines_arr.length > 0) { - for (int i = 0; i < fui->lines_arr.length; i++) { + for (i = fui->lines_top_indent; + i < fui->lines_arr.length && + i < fui->lines_top_indent + fui->w.sz.y - INACTIVE_LINES; + i++) { line_arr_el = (w_te_ui_line_t *)fui->lines_arr.arr[i]; mvwaddnwstr(win, p_y++, p_x, line_arr_el->text, line_arr_el->len); } @@ -217,7 +284,7 @@ void w_te_draw(w_te_ui_t *fui) { p_y--; - wmove(win, fui->cur_line_idx, fui->cur_line_pos); + wmove(win, fui->cur_line_idx - fui->lines_top_indent, fui->cur_line_pos); p_x = 1; diff --git a/src/windows/text_edit.h b/src/windows/text_edit.h index 218c5a2..eaa0468 100644 --- a/src/windows/text_edit.h +++ b/src/windows/text_edit.h @@ -26,7 +26,10 @@ typedef struct { w_te_ui_line_t *cur_line; int cur_line_idx; int cur_line_pos; - d_array_ptr_t lines_arr; + d_array_ptr_t lines_arr; + int lines_count; + int lines_top_indent; + int sym_count; } w_te_ui_t; void w_te_draw(w_te_ui_t *fl_ui); From 7cc0d865fab4b81df2d4f913e40eeb755537c3aa Mon Sep 17 00:00:00 2001 From: Alexander Zhylin Date: Thu, 23 Jul 2026 18:28:07 +0300 Subject: [PATCH 09/14] text edit: fixes cursor position on line concatenation --- src/windows/text_edit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/windows/text_edit.c b/src/windows/text_edit.c index b76a627..bc28713 100644 --- a/src/windows/text_edit.c +++ b/src/windows/text_edit.c @@ -19,7 +19,7 @@ #include "widget_core.h" /* TODO: расширять capacity линии при достижении лимита */ -/* TODO: check correctness of cursor navigation when concatenate and split the lines */ + #define INACTIVE_LINES 5 static void line_destroy_cb(void *line_arg) { @@ -44,7 +44,7 @@ static void w_te_cb(w_cb_args_t *args) { new_line = fui->lines_arr.arr[fui->cur_line_idx - 1]; if (fui->cur_line_pos == 0 && fui->cur_line->len > 0) { wcscpy(new_line->text + new_line->len, fui->cur_line->text); - fui->cur_line_pos = fui->cur_line->len; + fui->cur_line_pos = new_line->len; new_line->len += fui->cur_line->len; } else { fui->cur_line_pos = new_line->len; From 01303ffccc5ec26886ca0152a9f96ec50fc43b49 Mon Sep 17 00:00:00 2001 From: Alexander Zhylin Date: Thu, 23 Jul 2026 18:43:18 +0300 Subject: [PATCH 10/14] text edit: preparations for integration in work flow --- src/windows/text_edit.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/windows/text_edit.c b/src/windows/text_edit.c index bc28713..e31e55b 100644 --- a/src/windows/text_edit.c +++ b/src/windows/text_edit.c @@ -98,7 +98,8 @@ static void w_te_cb(w_cb_args_t *args) { case KEY_RIGHT: if (fui->cur_line_pos < fui->cur_line->len) { fui->cur_line_pos++; - } else if ((fui->lines_arr.arr[fui->cur_line_idx + 1] != NULL)) { /* ACT LIKE KEY BOTTOM */ + } else if ((fui->lines_arr.arr[fui->cur_line_idx + 1] != + NULL)) { /* ACT LIKE KEY BOTTOM */ fui->cur_line = fui->lines_arr.arr[++fui->cur_line_idx]; fui->cur_line_pos = fui->cur_line->len; if (fui->cur_line_idx >= @@ -131,6 +132,12 @@ static void w_te_cb(w_cb_args_t *args) { fui->lines_top_indent++; } break; + case KEY_F(2): + /* Save */ + break; + case KEY_F(8): + /* Cancel */ + break; default: key = u_utf8_get_full_letter(key, app->win); if (fui->cur_line_pos == fui->cur_line->len) { @@ -158,6 +165,8 @@ static void w_te_cb_refresh(void *data) { static struct action_key action_keys[] = { {.key = "Esc", .title = "Back", .code = '\33'}, + {.key = "F2", .title = "Save", .code = KEY_F(2)}, + {.key = "F8", .title = "Cancel", .code = KEY_F(8)}, {.key = "F9", .title = "Quit", .code = KEY_F(9)}, }; @@ -197,7 +206,7 @@ w_te_ui_t *w_te_init_win(app_t *app) { app->main_ui.type = mw_f_desc; app->main_ui.cb_ui_refresh = w_te_cb_refresh; app->main_ui.b_keys = action_keys; - app->main_ui.b_keys_len = 2; + app->main_ui.b_keys_len = 4; app->main_ui.cb_b_press = (w_cb_press_t)process_user_input; app->main_ui.reset = w_te_reset_app; app->main_ui.draw = (draw_f_t *)w_te_draw; From 21bcf119e323a590d99d43ac604d2c58e6a59fbb Mon Sep 17 00:00:00 2001 From: Alexander Zhylin Date: Fri, 24 Jul 2026 16:49:29 +0300 Subject: [PATCH 11/14] text edit: integration [not finished] --- src/query.c | 1 + src/windows/text_edit.c | 40 +++++++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/query.c b/src/query.c index 8a2d4ba..7d16aab 100644 --- a/src/query.c +++ b/src/query.c @@ -140,6 +140,7 @@ void wait_register(query_args_t *q_args) { int upload_confirm_cb(app_t *app, char *query, int q_len) { if (!strncmp("finished\n", query, sizeof("finished\n") - 1)) { + /* TODO: DESCRIPTION HERE */ w_notification("File upload", dc_normal, "File %s is uploaded to the server!", app->query_args->file->name); diff --git a/src/windows/text_edit.c b/src/windows/text_edit.c index e31e55b..c48e655 100644 --- a/src/windows/text_edit.c +++ b/src/windows/text_edit.c @@ -132,12 +132,6 @@ static void w_te_cb(w_cb_args_t *args) { fui->lines_top_indent++; } break; - case KEY_F(2): - /* Save */ - break; - case KEY_F(8): - /* Cancel */ - break; default: key = u_utf8_get_full_letter(key, app->win); if (fui->cur_line_pos == fui->cur_line->len) { @@ -174,20 +168,31 @@ static int32_t process_user_input(app_t *app, w_cb_args_t *d_args) { int32_t c; w_te_ui_t *fui = (w_te_ui_t *)app->query_args->main_ui->ui; c = wgetch(app->win); + int text_pos = 0; + w_te_ui_line_t *arr_line = NULL; switch (c) { case KEY_F(9): app_destroy(app, 0); return OK; - case 'D': - case 'd': - // case '\33': /* ESC key */ - // if (!app->modal.is_initiated) { - // server_send_string(app->query_args, "file list %d %d\n", - // fui->max_lines - 1, 1); - // main_window_set(app, mw_fl_server); - // d_args->element = app->main_ui.ui; - // break; - // } + case KEY_F(2): + /* TODO: move to description edit */ + app->query_args->file->description = + malloc(sizeof(wchar_t) * (fui->sym_count + 9)); + for (int i = 0; i < fui->lines_count; i++) { + arr_line = fui->lines_arr.arr[i]; + text_pos += wcstombs(app->query_args->file->description + text_pos, + arr_line->text, arr_line->len); + app->query_args->file->description[text_pos++] = '\n'; + } + // app->query_args->file->description[--text_pos] = '\03'; /* ETX symbol */ + app->query_args->file->description[text_pos] = '\03'; /* ETX symbol */ + strncpy(app->query_args->file->description + text_pos, ":END:\n", + sizeof(":END:\n")); + /* Save */ + break; + case KEY_F(8): + /* Cancel */ + break; default: d_args->data = (void *)&c; app->active_callback(d_args); @@ -303,7 +308,8 @@ void w_te_draw(w_te_ui_t *fui) { } void w_te_destroy(w_te_ui_t **fui) { - w_te_ui_t *f = *fui; + w_te_ui_t *_fui = *fui; + u_d_arr_free_cb(&(_fui->lines_arr), line_destroy_cb); free(*fui); *fui = NULL; } \ No newline at end of file From da9990e969b7e4c0334abdac87de29eeeaef2d46 Mon Sep 17 00:00:00 2001 From: Alexander Zhylin Date: Fri, 24 Jul 2026 19:05:58 +0300 Subject: [PATCH 12/14] text edit: continuing integration [needs fixes] --- src/main.h | 1 + src/query.c | 7 +++---- src/widget/dialogue.c | 1 + src/windows/main_window.c | 3 +++ src/windows/text_edit.c | 6 ++++++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main.h b/src/main.h index c458f1d..0c2f53b 100644 --- a/src/main.h +++ b/src/main.h @@ -52,6 +52,7 @@ enum state { S_ERR, S_NEXT_ACTION, S_WAIT_REGISTER_CONFIRMATION, + S_WAIT_USER_DESCRIPTION, /* Legacy */ WAIT_SERVER_INIT, WAIT_SERVER, diff --git a/src/query.c b/src/query.c index 7d16aab..fda3ed0 100644 --- a/src/query.c +++ b/src/query.c @@ -140,13 +140,12 @@ void wait_register(query_args_t *q_args) { int upload_confirm_cb(app_t *app, char *query, int q_len) { if (!strncmp("finished\n", query, sizeof("finished\n") - 1)) { - /* TODO: DESCRIPTION HERE */ w_notification("File upload", dc_normal, "File %s is uploaded to the server!", app->query_args->file->name); - clear_file_in_query(app->query_args); - app->query_args->state = S_FILE_LIST; - app->modal.needs_destroy = true; + main_window_set(app, mw_f_desc); + /* clear_file_in_query(app->query_args); */ + app->query_args->state = S_WAIT_USER_DESCRIPTION; return 0; } return 1; /* TODO: Error case */ diff --git a/src/widget/dialogue.c b/src/widget/dialogue.c index f9de915..990c2fb 100644 --- a/src/widget/dialogue.c +++ b/src/widget/dialogue.c @@ -333,6 +333,7 @@ void w_dialogue_destroy(w_dialogue_t *d, void *_app) { d->win = NULL; d->is_initiated = false; d->needs_destroy = false; + d->needs_update = false; app->active_callback = (w_cb_t)app->main_ui.cb_b_press; app->query_args->active_dialogue = NULL; u_d_arr_ptr_free(&(d->id_map)); diff --git a/src/windows/main_window.c b/src/windows/main_window.c index 52245c7..7031ec3 100644 --- a/src/windows/main_window.c +++ b/src/windows/main_window.c @@ -10,6 +10,9 @@ void main_window_set(app_t *app, enum main_window_type type) { if (app->main_ui.ui != NULL) { main_window_destroy(app); } + if (app->modal.is_initiated) { + w_dialogue_destroy(&(app->modal), app); + } app->main_ui.type = type; switch (type) { case mw_fl_server: diff --git a/src/windows/text_edit.c b/src/windows/text_edit.c index c48e655..0fadb54 100644 --- a/src/windows/text_edit.c +++ b/src/windows/text_edit.c @@ -13,6 +13,9 @@ #include #include #include +#include "../server.h" +#include "../file_processor.h" +#include "../windows/main_window.h" #include "d_array.h" #include "text_edit.h" @@ -188,6 +191,9 @@ static int32_t process_user_input(app_t *app, w_cb_args_t *d_args) { app->query_args->file->description[text_pos] = '\03'; /* ETX symbol */ strncpy(app->query_args->file->description + text_pos, ":END:\n", sizeof(":END:\n")); + server_send_string(app->query_args, app->query_args->file->description); + clear_file_in_query(app->query_args); + main_window_set(app, mw_fl_server); /* Save */ break; case KEY_F(8): From 4535f85d21da6801d6946d1e82e1fed3f3435cda Mon Sep 17 00:00:00 2001 From: Alexander Zhylin Date: Mon, 27 Jul 2026 17:05:13 +0300 Subject: [PATCH 13/14] w_fl_draw: changes line size --- src/windows/file_list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windows/file_list.c b/src/windows/file_list.c index 31c0e14..3c4b7e4 100644 --- a/src/windows/file_list.c +++ b/src/windows/file_list.c @@ -350,7 +350,7 @@ void w_fl_draw(w_ui_file_list_t *fui) { mvwprintw(i_win, p_y, p_x, "Name: "); p_x = 8; /* 7 (size of "Name: ") + 1 */ - u_utf8_curs_printw(i_win, &p_y, &p_x, active_el->name, sz_x - p_x, true); + u_utf8_curs_printw(i_win, &p_y, &p_x, active_el->name, sz_x - p_x - 2, true); p_x = 1; size_to_text(active_el->size, size_text); From a35e0ad748e433f4994332db00ab753458a87690 Mon Sep 17 00:00:00 2001 From: Alexander Zhylin Date: Mon, 27 Jul 2026 19:42:57 +0300 Subject: [PATCH 14/14] text_edit_window gets into shape --- src/app.c | 5 +++++ src/app.h | 3 ++- src/draw_modal.c | 2 +- src/file_processor.c | 2 +- src/query.c | 33 +++++++++++++++++++++++++-------- src/server.c | 6 +++--- src/windows/file_list.c | 10 ++++++---- src/windows/text_edit.c | 24 +++++++++++++++++++----- 8 files changed, 62 insertions(+), 23 deletions(-) diff --git a/src/app.c b/src/app.c index 5f37273..d33e55c 100644 --- a/src/app.c +++ b/src/app.c @@ -41,6 +41,11 @@ app_t *app_init(app_t *app) { keypad(app->win, TRUE); + app->callback_after_notification = NULL; + + app->modal.is_initiated = false; + app->modal.needs_destroy = false; + /* refresh the windows */ wnoutrefresh(app->win); doupdate(); diff --git a/src/app.h b/src/app.h index 0b57f74..005c784 100644 --- a/src/app.h +++ b/src/app.h @@ -15,7 +15,7 @@ typedef enum { modal_color_pair = 3, } app_color; -typedef struct { +typedef struct app_t { WINDOW *win; w_dialogue_t modal; params_t *params; @@ -23,6 +23,7 @@ typedef struct { query_args_t *query_args; file_args_t *file_args; void (*active_callback)(w_cb_args_t *args); + void (*callback_after_notification)(struct app_t *); void *active_widget; wchar_t *top_text; main_window_t main_ui; diff --git a/src/draw_modal.c b/src/draw_modal.c index 5ef0d46..1dfeef5 100644 --- a/src/draw_modal.c +++ b/src/draw_modal.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: MIT */ /* Copyright (c) 2026 Oleksandr Zhylin */ +#include "main.h" #include #include -#include "main.h" static void (*active_callback_backup)(w_cb_args_t *) = NULL; diff --git a/src/file_processor.c b/src/file_processor.c index 6a12314..c272a30 100644 --- a/src/file_processor.c +++ b/src/file_processor.c @@ -332,7 +332,7 @@ static void fl_add(fl_item_t **cur, fl_item_t **start, char *line) { char *descr_begin = NULL; int h_len; char *name_begin = strchr(line, '[') + 1; - char *name_end = strrchr(line, ']'); + char *name_end = strchr(line, ']'); int name_len = name_end - name_begin; fl_item_t *fitem = malloc(sizeof(fl_item_t)); sscanf(name_end, "] %zu %s%n", &(fitem->size), fowner, &h_len); diff --git a/src/query.c b/src/query.c index fda3ed0..7dadbdc 100644 --- a/src/query.c +++ b/src/query.c @@ -30,6 +30,7 @@ #include "dialogue.h" #include "file_processor.h" #include "main.h" +#include "main_window.h" #include "server.h" #include "types.h" @@ -77,12 +78,18 @@ void query_loop(app_t *app) { } } if (query_args->state == S_NEXT_ACTION) { - query_args->from_server = TRUE; - if (ERR == process_query(app)) { - EXIT_APP("*** error while processing query ***", app, 1) + if (app->callback_after_notification != NULL) { + app->callback_after_notification(app); + app->callback_after_notification = NULL; + continue; + } else { + query_args->from_server = TRUE; + if (ERR == process_query(app)) { + EXIT_APP("*** error while processing query ***", app, 1) + } + query_args->state = S_WAIT_SERVER; + continue; } - query_args->state = S_WAIT_SERVER; - continue; } else { sr = select(maxfd + 1, &readfds, NULL, NULL, NULL); if (sr == -1) { @@ -143,9 +150,19 @@ int upload_confirm_cb(app_t *app, char *query, int q_len) { w_notification("File upload", dc_normal, "File %s is uploaded to the server!", app->query_args->file->name); - main_window_set(app, mw_f_desc); + int desc_answer = + w_bool_ask("Write file description", "Yes", "No", true, + "Would you like to write description for the file %s?", + app->query_args->file->name); + if (desc_answer) { + main_window_set(app, mw_f_desc); + app->query_args->state = S_WAIT_USER_DESCRIPTION; + } else { + server_send_string(app->query_args, "[Empty description]\n:END:\n"); + app->query_args->state = WAIT_CLIENT; + main_window_set(app, mw_fl_server); + } /* clear_file_in_query(app->query_args); */ - app->query_args->state = S_WAIT_USER_DESCRIPTION; return 0; } return 1; /* TODO: Error case */ @@ -277,7 +294,7 @@ static int process_command(app_t *app, wait_server_cb *callback) { while ((qlen = query_extract_from_buf(q_args->buf, &(q_args->buf_used), &query))) { if (callback == NULL) { - process_server_command(query, qlen, app); + res = process_server_command(query, qlen, app); } else { res = callback(app, query, qlen); } diff --git a/src/server.c b/src/server.c index 9b89ea3..6503dcc 100644 --- a/src/server.c +++ b/src/server.c @@ -146,10 +146,10 @@ int process_server_command(char *line, int l_len, app_t *app) { return 0; } - q_args->state = S_PREP_SERVER_MESSAGE; - server_print_message_cb(app, line, l_len); + if (q_args->state == S_NEXT_ACTION) return 1; - return -1; + q_args->state = S_PREP_SERVER_MESSAGE; + return server_print_message_cb(app, line, l_len); } void ask_uname_and_password(params_t *params) { diff --git a/src/windows/file_list.c b/src/windows/file_list.c index 3c4b7e4..89230cc 100644 --- a/src/windows/file_list.c +++ b/src/windows/file_list.c @@ -175,7 +175,7 @@ void *w_fl_init(app_t *app) { app->main_ui.b_keys_len = 4; app->main_ui.cb_b_press = (w_cb_press_t)process_user_input; app->main_ui.reset = w_fl_reset_app; - app->main_ui.draw = (draw_f_t *) w_fl_draw; + app->main_ui.draw = (draw_f_t *)w_fl_draw; app->active_callback = w_fl_cb; fui->w.callback = w_fl_cb; w_init(&(fui->w), NULL, &(app->win), ""); @@ -227,8 +227,8 @@ void w_fl_reset(w_ui_file_list_t *fl_ui) { } void w_fl_reset_app(void *app) { - app_t *_app = (app_t *) app; - w_ui_file_list_t *fl_ui = (w_ui_file_list_t *) _app->main_ui.ui; + app_t *_app = (app_t *)app; + w_ui_file_list_t *fl_ui = (w_ui_file_list_t *)_app->main_ui.ui; w_fl_reset(fl_ui); } @@ -314,6 +314,7 @@ void w_fl_draw(w_ui_file_list_t *fui) { curs_set(true); wmove(win, p_y, p_x + p_len); } else { + curs_set(false); int32_t l_pad = 0; sprintf(p_info, "P: %d/%d F: %d L: %d%n", fui->current_page, fui->pages, fui->current_count, fui->full_count, &p_len); @@ -350,7 +351,8 @@ void w_fl_draw(w_ui_file_list_t *fui) { mvwprintw(i_win, p_y, p_x, "Name: "); p_x = 8; /* 7 (size of "Name: ") + 1 */ - u_utf8_curs_printw(i_win, &p_y, &p_x, active_el->name, sz_x - p_x - 2, true); + u_utf8_curs_printw(i_win, &p_y, &p_x, active_el->name, sz_x - p_x - 2, + true); p_x = 1; size_to_text(active_el->size, size_text); diff --git a/src/windows/text_edit.c b/src/windows/text_edit.c index 0fadb54..dd15642 100644 --- a/src/windows/text_edit.c +++ b/src/windows/text_edit.c @@ -1,6 +1,9 @@ /* SPDX-License-Identifier: MIT */ /* Copyright (c) 2026 Oleksandr Zhylin */ +#include "../file_processor.h" +#include "../server.h" +#include "../windows/main_window.h" #include #include #include @@ -13,12 +16,10 @@ #include #include #include -#include "../server.h" -#include "../file_processor.h" -#include "../windows/main_window.h" #include "d_array.h" #include "text_edit.h" +#include "file_list.h" #include "widget_core.h" /* TODO: расширять capacity линии при достижении лимита */ @@ -40,6 +41,8 @@ static void w_te_cb(w_cb_args_t *args) { switch (key) { case KEY_BACKSPACE: case KEY_DL: + if (fui->cur_line->len == 0) + break; if (fui->cur_line_pos == fui->cur_line->len && fui->cur_line->len > 0) { fui->cur_line->text[--fui->cur_line_pos] = 0; fui->cur_line->len--; @@ -167,6 +170,16 @@ static struct action_key action_keys[] = { {.key = "F9", .title = "Quit", .code = KEY_F(9)}, }; +void callback_after_notification(app_t *app) { + clear_file_in_query(app->query_args); + int a_len; + main_window_set(app, mw_fl_server); + w_ui_file_list_t *fui = app->main_ui.ui; + server_send_string(app->query_args, "file list %d %d\n%n", fui->max_lines, + fui->current_page, &a_len); + app->query_args->state = S_FILE_LIST; +} + static int32_t process_user_input(app_t *app, w_cb_args_t *d_args) { int32_t c; w_te_ui_t *fui = (w_te_ui_t *)app->query_args->main_ui->ui; @@ -192,8 +205,8 @@ static int32_t process_user_input(app_t *app, w_cb_args_t *d_args) { strncpy(app->query_args->file->description + text_pos, ":END:\n", sizeof(":END:\n")); server_send_string(app->query_args, app->query_args->file->description); - clear_file_in_query(app->query_args); - main_window_set(app, mw_fl_server); + app->query_args->state = S_WAIT_SERVER; + app->callback_after_notification = callback_after_notification; /* Save */ break; case KEY_F(8): @@ -245,6 +258,7 @@ w_te_ui_t *w_te_init_win(app_t *app) { fui->sym_count = 0; fui->lines_count = 1; fui->lines_top_indent = 0; + fui->cur_line_pos = 0; return fui; }