zheiling/BBS-Client-TUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Description edit on save #1

Merged
zheiling merged 14 commits from text_edit_window into main 2026-07-27 19:45:06 +03:00
Conversation 0 Commits 14 Files Changed 25
+109 -32
3 changed files with 109 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 23eaae7848 - Show all commits
src/utils/d_array.c
+16 -9
View File
@@ -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) if (arr->fist_el == NULL)
arr->fist_el = ptr; 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->last_el = ptr;
arr->arr[idx] = ptr; arr->arr[idx] = ptr;
arr->length = idx + 1; 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); callback(_ptr);
arr->arr[_idx] = NULL; arr->arr[_idx] = NULL;
arr->length--; 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) { 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; arr->arr = NULL;
} }
void u_d_arr_free_cb(d_array_ptr_t *arr, u_d_arr_free_callback *callback) { void u_d_arr_free_cb(d_array_ptr_t *d_arr, u_d_arr_free_callback *callback) {
for (int i = 0; i < arr->length; i++) { for (int i = 0; i < d_arr->length; i++) {
if (arr->arr[i] != NULL) { if (d_arr->arr[i] != NULL) {
callback(arr->arr[i]); callback(d_arr->arr[i]);
} }
} }
arr->capacity = 0; d_arr->capacity = 0;
arr->length = 0; d_arr->length = 0;
free(arr->arr); free(d_arr->arr);
arr->arr = NULL; d_arr->arr = NULL;
} }
src/windows/text_edit.c
+89 -22
View File
@@ -14,11 +14,13 @@
#include <utils.h> #include <utils.h>
#include <wchar.h> #include <wchar.h>
#include "d_array.h"
#include "text_edit.h" #include "text_edit.h"
#include "widget_core.h" #include "widget_core.h"
/* TODO: расширять capacity линии при достижении лимита */ /* 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) { static void line_destroy_cb(void *line_arg) {
w_te_ui_line_t *line = 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) { switch (key) {
case KEY_BACKSPACE: case KEY_BACKSPACE:
case KEY_DL: case KEY_DL:
if (fui->cur_line->len > 0) { if (fui->cur_line_pos == fui->cur_line->len && fui->cur_line->len > 0) {
if (fui->cur_line_pos == fui->cur_line->len) { fui->cur_line->text[--fui->cur_line_pos] = 0;
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--; fui->cur_line->len--;
} else { } else if (fui->cur_line_idx > 0) {
if (fui->cur_line_idx > 0) { new_line = fui->lines_arr.arr[fui->cur_line_idx - 1];
u_d_arr_ptr_remove_cb(&(fui->lines_arr), fui->cur_line, if (fui->cur_line_pos == 0 && fui->cur_line->len > 0) {
fui->cur_line_idx, &line_destroy_cb); wcscpy(new_line->text + new_line->len, fui->cur_line->text);
fui->cur_line = fui->lines_arr.arr[--fui->cur_line_idx];
fui->cur_line_pos = fui->cur_line->len; 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; break;
case KEY_UP: case KEY_UP:
if (fui->cur_line_idx > 0) { if (fui->cur_line_idx > 0) {
fui->cur_line = fui->lines_arr.arr[--fui->cur_line_idx]; fui->cur_line = fui->lines_arr.arr[--fui->cur_line_idx];
fui->cur_line_pos = fui->cur_line->len; 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; break;
case KEY_DOWN: 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 = fui->lines_arr.arr[++fui->cur_line_idx];
fui->cur_line_pos = fui->cur_line->len; 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; break;
case KEY_LEFT: case KEY_LEFT:
if (fui->cur_line_pos > 0) { if (fui->cur_line_pos > 0) {
fui->cur_line_pos--; 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; break;
case KEY_RIGHT: case KEY_RIGHT:
if (fui->cur_line_pos < fui->cur_line->len) { if (fui->cur_line_pos < fui->cur_line->len) {
fui->cur_line_pos++; 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; break;
case '\n': 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->capacity = new_line->len = INBUFSIZE;
new_line->text[0] = 0; new_line->text[0] = 0;
new_line->len = 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 = new_line;
fui->cur_line_idx++; 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; break;
default: default:
key = u_utf8_get_full_letter(key, app->win); 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, n * sizeof(wchar_t));
fui->cur_line->text[fui->cur_line_pos++] = key; fui->cur_line->text[fui->cur_line_pos++] = key;
} }
fui->sym_count++;
fui->cur_line->len++; fui->cur_line->len++;
} }
} }
@@ -177,10 +222,19 @@ w_te_ui_t *w_te_init_win(app_t *app) {
fui->cur_line->capacity = INBUFSIZE; fui->cur_line->capacity = INBUFSIZE;
u_d_array_append(&(fui->lines_arr), fui->cur_line, sizeof(w_te_ui_line_t)); u_d_array_append(&(fui->lines_arr), fui->cur_line, sizeof(w_te_ui_line_t));
fui->cur_line_idx = 0; fui->cur_line_idx = 0;
fui->sym_count = 0;
fui->lines_count = 1;
fui->lines_top_indent = 0;
return fui; 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) { void w_te_reset_app(void *app) {
app_t *_app = 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); wattrset(win, COLOR_PAIR(modal_color_pair) | A_BOLD | A_REVERSE);
int i = 0; 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, ""); 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; w_te_ui_line_t *line_arr_el = NULL;
if (fui->lines_arr.length > 0) { 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]; 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, line_arr_el->text, line_arr_el->len);
} }
@@ -217,7 +284,7 @@ void w_te_draw(w_te_ui_t *fui) {
p_y--; 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; p_x = 1;
src/windows/text_edit.h
+4 -1
View File
@@ -26,7 +26,10 @@ typedef struct {
w_te_ui_line_t *cur_line; w_te_ui_line_t *cur_line;
int cur_line_idx; int cur_line_idx;
int cur_line_pos; 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; } w_te_ui_t;
void w_te_draw(w_te_ui_t *fl_ui); void w_te_draw(w_te_ui_t *fl_ui);