Changes file structure; experiments with better string; Search init in file list

This commit is contained in:
2026-02-11 16:47:43 +02:00
parent dbe46fbdfd
commit dfc3071702
26 changed files with 3577 additions and 59 deletions
+51 -27
View File
@@ -2,6 +2,7 @@
#include "../file_processor.h"
#include "../fs.h"
#include "app.h"
#include <bstrlib.h>
#include <ncurses.h>
#include <stdbool.h>
#include <stddef.h>
@@ -19,6 +20,17 @@ void file_list_cb(callback_args_t *args) {
int32_t key = *((int32_t *)args->data);
char query[256];
int32_t q_len = 0;
if (fui->active_search) {
if (key == KEY_BACKSPACE || key == KEY_DL) {
if (blength(fui->search_key)) {
btrunc(fui->search_key, blength(fui->search_key) - 1);
}
} else {
bconchar(fui->search_key, key);
}
draw_file_list(fui);
return;
}
switch (key) {
case KEY_DOWN:
if (fui->current_idx < fui->current_count - 1) {
@@ -54,18 +66,20 @@ void file_list_cb(callback_args_t *args) {
}
ui_file_list_t *init_file_list(WINDOW **win, WINDOW *const *info_win) {
ui_file_list_t *fl_ui = malloc(sizeof(ui_file_list_t));
init_widget(&(fl_ui->w), NULL, win, "");
WINDOW *parent_win = *(fl_ui->w.parent_win);
fl_ui->current_idx = 0;
fl_ui->current_page = 1;
fl_ui->pages = 1;
fl_ui->current_count = 0;
fl_ui->full_count = 0;
fl_ui->activate_last = false;
fl_ui->info_win = info_win;
fl_ui->max_lines = getmaxy(parent_win) - 3; /* 2+1 (bottom info line) */
return fl_ui;
ui_file_list_t *fui = malloc(sizeof(ui_file_list_t));
init_widget(&(fui->w), NULL, win, "");
WINDOW *parent_win = *(fui->w.parent_win);
fui->current_idx = 0;
fui->current_page = 1;
fui->pages = 1;
fui->current_count = 0;
fui->full_count = 0;
fui->activate_last = false;
fui->info_win = info_win;
fui->max_lines = getmaxy(parent_win) - 3; /* 2+1 (bottom info line) */
fui->active_search = false;
fui->search_key = bfromcstrrangealloc(12, 64, "");
return fui;
}
void reset_file_list(ui_file_list_t *fl_ui) {
@@ -77,26 +91,26 @@ void reset_file_list(ui_file_list_t *fl_ui) {
fl_ui->activate_last = false;
}
void draw_file_list(ui_file_list_t *fl_ui) {
void draw_file_list(ui_file_list_t *fui) {
int32_t sz_y, sz_x;
int32_t p_y, p_x;
WINDOW *parent_win = *(fl_ui->w.parent_win);
WINDOW *parent_win = *(fui->w.parent_win);
getmaxyx(parent_win, sz_y, sz_x);
int32_t sz_y_f = sz_y - 2; /* TODO: можно заменить на поле max_lines */
p_y = 1;
p_x = 1;
fl_item_t *el = *(fl_ui->start);
fl_item_t *active_el = *(fl_ui->start);
fl_item_t *el = *(fui->start);
fl_item_t *active_el = *(fui->start);
int32_t cur_el_idx = 0;
curs_set(false);
if (fl_ui->activate_last) {
fl_ui->current_idx = fl_ui->current_count - 1;
fl_ui->activate_last = false;
if (fui->activate_last) {
fui->current_idx = fui->current_count - 1;
fui->activate_last = false;
}
if (fl_ui->current_idx + 1 >= sz_y_f) {
p_y -= fl_ui->current_idx - sz_y_f + 2;
if (fui->current_idx + 1 >= sz_y_f) {
p_y -= fui->current_idx - sz_y_f + 2;
}
do {
@@ -105,14 +119,14 @@ void draw_file_list(ui_file_list_t *fl_ui) {
cur_el_idx++;
continue;
}
if (cur_el_idx == fl_ui->current_idx) {
if (cur_el_idx == fui->current_idx) {
wattrset(parent_win, A_BOLD | A_REVERSE);
active_el = el;
}
p_x = 1;
mvwprintw(parent_win, p_y, p_x, "%s%n", el->name, &p_x);
mvwprintw(parent_win, p_y, p_x + 1, "%*s", sz_x - p_x, "");
if (cur_el_idx == fl_ui->current_idx) {
if (cur_el_idx == fui->current_idx) {
wattroff(parent_win, A_BOLD | A_REVERSE);
}
p_y++;
@@ -128,21 +142,31 @@ void draw_file_list(ui_file_list_t *fl_ui) {
int32_t p_len;
p_x = 1;
sprintf(p_info, "page: %u/%u files: %u left: %u%n", fl_ui->current_page,
fl_ui->pages, fl_ui->current_count, fl_ui->full_count, &p_len);
if (fui->active_search) {
sprintf(p_info, "[search]: %s_%n", fui->search_key->data, &p_len);
} else {
sprintf(p_info, "page: %u/%u files: %u left: %u%n", fui->current_page,
fui->pages, fui->current_count, fui->full_count, &p_len);
}
uint32_t l_pad = (sz_x - p_len) / 2;
wattrset(parent_win, A_BOLD);
mvwprintw(parent_win, p_y, p_x, "%*s%s%*s", l_pad, "", p_info, l_pad, "");
if (fui->active_search) {
mvwprintw(parent_win, p_y, p_x, "%s%*s", p_info, sz_x - p_len, "");
} else {
mvwprintw(parent_win, p_y, p_x, "%*s%s%*s", l_pad, "", p_info, l_pad, "");
}
wattroff(parent_win, A_BOLD);
/* draw file info */
p_y = 1;
p_x = 1;
WINDOW *i_win = *fl_ui->info_win;
WINDOW *i_win = *fui->info_win;
wclear(i_win);
/* Write to the right side the information about the file */
char size_text[64];
size_to_text(active_el->size, size_text);