text_edit_window gets into shape

This commit is contained in:
2026-07-27 19:42:57 +03:00
parent 4535f85d21
commit a35e0ad748
8 changed files with 62 additions and 23 deletions
+6 -4
View File
@@ -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);
+19 -5
View File
@@ -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 <dirent.h>
#include <fcntl.h>
#include <ncursesw/ncurses.h>
@@ -13,12 +16,10 @@
#include <unistd.h>
#include <utils.h>
#include <wchar.h>
#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;
}