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

UI: file list improvements

Browse Source
This commit is contained in:
zheiling
2026-01-23 18:13:53 +02:00
parent b81211c764
commit dd9540004b
6 changed files with 97 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/deps.mk
+30
View File
@@ -0,0 +1,30 @@
client.o: src/client.c src/file_processor.h src/main.h src/types.h \
src/ui/widget/file_list.h src/ui/widget/../widget.h \
src/ui/widget/../../main.h src/client.h
connection.o: src/connection.c src/main.h src/types.h src/ui/app.h \
src/ui/../common.h src/ui/widget.h src/ui/../main.h \
src/ui/widget/dialogue.h src/ui/widget/../widget.h \
src/ui/widget/../../common.h src/ui/widget/button.h \
src/ui/widget/../../main.h src/ui/widget/group.h
file_processor.o: src/file_processor.c src/client.h src/main.h \
src/types.h src/file_processor.h src/ui/widget/file_list.h \
src/ui/widget/../widget.h src/ui/widget/../../main.h src/query.h \
src/ui/app.h src/ui/../common.h src/ui/widget.h src/ui/widget/dialogue.h \
src/ui/widget/../../common.h src/ui/widget/button.h \
src/ui/widget/../../main.h src/ui/widget/group.h \
src/ui/widget/dialogue.h src/ui/widget/progress_bar.h
fs.o: src/fs.c
main.o: src/main.c src/connection.h src/main.h src/types.h src/ui/app.h \
src/ui/../common.h src/ui/widget.h src/ui/../main.h \
src/ui/widget/dialogue.h src/ui/widget/../widget.h \
src/ui/widget/../../common.h src/ui/widget/button.h \
src/ui/widget/../../main.h src/ui/widget/group.h src/query.h \
src/ui/widget.h src/ui/widget/file_list.h
query.o: src/query.c src/client.h src/main.h src/types.h src/connection.h \
src/ui/app.h src/ui/../common.h src/ui/widget.h src/ui/../main.h \
src/ui/widget/dialogue.h src/ui/widget/../widget.h \
src/ui/widget/../../common.h src/ui/widget/button.h \
src/ui/widget/../../main.h src/ui/widget/group.h src/file_processor.h \
src/ui/widget/file_list.h src/server.h
server.o: src/server.c src/main.h src/types.h src/ui/widget/file_list.h \
src/ui/widget/../widget.h src/ui/widget/../../main.h
src/file_processor.c
+31 -29
View File
@@ -36,44 +36,42 @@ void file_list(file_args_t *f_args, query_args_t *q_args) {
dialogue_t *d = (dialogue_t *)q_args->active_dialogue;
fui->start = &(f_args->l_start);
fui->current = &(f_args->l_current);
bool list_end_reached = false;
if (qbuf_used == 0)
qbuf[0] = 0;
if (!list_end_reached) {
while ((qlen = query_extract_from_buf(q_args->buf, &(q_args->buf_used),
&query))) {
if (!strcmp("list_end\n", query)) {
idx = 1;
list_end_reached = true;
break;
}
strcat(qbuf, query);
qbuf_used += strlen(qbuf);
if (strchr(qbuf, '\n') == NULL)
continue;
fl_add(&(f_args->l_current), &(f_args->l_start), qbuf);
fui->current_count++;
free(query);
query = NULL;
qbuf_used = 0;
qbuf[0] = 0;
}
}
while ((qlen = query_extract_from_buf(q_args->buf, &(q_args->buf_used),
&query))) {
if (!strcmp("list_end\n", query)) {
q_args->state = S_FILE_SELECT;
draw_file_list(fui);
if (4 == sscanf(query, "=== PAGE %u/%u COUNT: %u/%u ===", &fui->current_page,
&fui->pages, &fui->current_count, &fui->full_count)) {
if (d != NULL && d->is_initiated) {
d->needs_update = true;
}
idx = 1;
break;
}
strcat(qbuf, query);
qbuf_used += strlen(qbuf);
if (strchr(qbuf, '\n') == NULL)
continue;
fl_add(&(f_args->l_current), &(f_args->l_start), qbuf);
fui->current_count++;
free(query);
query = NULL;
qbuf_used = 0;
qbuf[0] = 0;
}
uint32_t current_page, pages, current_count, full_count;
while ((qlen = query_extract_from_buf(q_args->buf, &(q_args->buf_used),
&query))) {
if (4 == sscanf(query, "=== PAGE %u/%u COUNT: %u/%u ===", &current_page,
&pages, &current_count, &full_count)) {
fui->current_page = current_page;
fui->current_count = current_count;
fui->full_count = full_count;
fui->pages = pages;
draw_file_list(fui);
q_args->state = S_FILE_SELECT;
return;
}
}
@@ -195,6 +193,8 @@ void file_download(file_args_t *f_args, query_args_t *q_args) {
uint32_t progress = (f_selected->size - size_rest) * 100 / f_selected->size;
ui_progress_bar_t *pb = (ui_progress_bar_t *)q_args->progress_bar;
dialogue_t *d = (dialogue_t *)q_args->active_dialogue;
ui_file_list_t *fui = (ui_file_list_t *)q_args->file_list_ui;
uint32_t a_len = 0;
if (size_rest == 0)
size_rest = f_selected->size;
@@ -223,7 +223,9 @@ void file_download(file_args_t *f_args, query_args_t *q_args) {
q_args->notification = malloc(strlen(answer) + 1);
strcpy(q_args->notification, answer);
free(f_selected->name);
write(q_args->sd, "file list\n", sizeof("file list\n") - 1);
sprintf(answer, "file list %u %u\n%n", fui->max_lines, fui->current_page,
&a_len);
write(q_args->sd, answer, a_len);
q_args->state = S_FILE_LIST;
}
}
src/query.c
-1
View File
@@ -22,7 +22,6 @@
#include "main.h"
#include "server.h"
#include "ui/app.h"
#include "ui/widget/dialogue.h"
static void wait_side(query_args_t *q_args);
void user_request_description(query_args_t *q_args);
src/server.c
+14 -5
View File
@@ -1,4 +1,5 @@
#include "main.h"
#include "ui/widget/file_list.h"
#include <arpa/inet.h>
#include <fcntl.h>
#include <netinet/in.h>
@@ -14,7 +15,7 @@
void ask_uname_and_password(params_t *params);
void ask_register(params_t *params, char *email);
#define PRINT_SRV_MESSAGE(q_args, l_len, line) \
#define PRINT_SRV_MESSAGE(q_args, l_len, line) \
if (q_args->server_message.size > 0) { \
q_args->state = S_PRINT_SERVER_MESSAGE; \
q_args->next_server_command = malloc(l_len + 1); \
@@ -28,6 +29,9 @@ int process_server_command(char *line, int l_len, query_args_t *q_args) {
const char *login_options[] = {"Username", "Anonymous", "Register", NULL};
uint32_t answer;
uint64_t new_capacity;
ui_file_list_t *fui = (ui_file_list_t *)q_args->file_list_ui;
char query[INBUFSIZE];
int32_t q_len = 0;
char *cptr = strchr(line, ' ');
if (cptr != NULL && cptr > line)
@@ -69,7 +73,9 @@ int process_server_command(char *line, int l_len, query_args_t *q_args) {
/* REGISTER CONFIRMATION */
if (q_args->state == WAIT_REGISTER_CONFIRMATION) {
if (!strcmp(line, "ok")) {
write(q_args->sd, "file list", sizeof("file list"));
sprintf(query, "file list %u %u\n%n", fui->max_lines, fui->current_page,
&q_len);
write(q_args->sd, query, q_len);
q_args->state = S_FILE_LIST;
return 0;
} else {
@@ -86,7 +92,9 @@ int process_server_command(char *line, int l_len, query_args_t *q_args) {
/* WELCOME MES */
if (!strncmp(line, "Welcome, ", ws_pos)) {
write(q_args->sd, "file list\n", sizeof("file list\n")-1);
sprintf(query, "file list %u %u\n%n", fui->max_lines, fui->current_page,
&q_len);
write(q_args->sd, query, q_len);
q_args->state = S_FILE_LIST;
return 0;
}
@@ -110,8 +118,9 @@ int process_server_command(char *line, int l_len, query_args_t *q_args) {
strncat(q_args->server_message.text, line, l_len);
q_args->server_message.text[q_args->server_message.size + l_len] = 0;
}
char *end_char = strchr(q_args->server_message.text, '\04'); /* Search for the end of the notification */
if (end_char != NULL) {
char *end_char = strchr(q_args->server_message.text,
'\04'); /* Search for the end of the notification */
if (end_char != NULL) {
*end_char = '\0'; /* Don't show this symbol */
q_args->state = S_PRINT_SERVER_MESSAGE;
q_args->server_message.size--;
src/ui/widget/file_list.c
+20 -16
View File
@@ -1,7 +1,7 @@
#include "file_list.h"
#include "../../file_processor.h"
#include "../app.h"
#include "../../fs.h"
#include "../app.h"
#include "progress_bar.h"
#include <ncurses.h>
#include <stdbool.h>
@@ -30,7 +30,8 @@ void file_list_cb(callback_args_t *args) {
} else if (fui->current_page < fui->pages) {
fl_clear(fui->start, fui->current);
app->query_args->state = S_FILE_LIST;
sprintf(query, "p%u\n%n", fui->current_page + 1, &q_len);
sprintf(query, "file list %u %u\n%n", fui->max_lines,
fui->current_page + 1, &q_len);
write(app->query_args->sd, query, q_len);
reset_file_list(fui);
}
@@ -42,7 +43,8 @@ void file_list_cb(callback_args_t *args) {
} else if (fui->current_page > 1) {
fl_clear(fui->start, fui->current);
app->query_args->state = S_FILE_LIST;
sprintf(query, "p%u\n%n", fui->current_page - 1, &q_len);
sprintf(query, "file list %u %u\n%n", fui->max_lines,
fui->current_page - 1, &q_len);
write(app->query_args->sd, query, q_len);
reset_file_list(fui);
fui->activate_last = true;
@@ -57,13 +59,15 @@ 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 = 0;
fl_ui->pages = 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;
}
@@ -79,9 +83,9 @@ void reset_file_list(ui_file_list_t *fl_ui) {
void draw_file_list(ui_file_list_t *fl_ui) {
int32_t sz_y, sz_x;
int32_t p_y, p_x;
WINDOW *win = *(fl_ui->w.parent_win);
getmaxyx(win, sz_y, sz_x);
int32_t sz_y_f = sz_y - 2; // actual size (without box)
WINDOW *parent_win = *(fl_ui->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);
@@ -105,14 +109,14 @@ void draw_file_list(ui_file_list_t *fl_ui) {
continue;
}
if (cur_el_idx == fl_ui->current_idx) {
wattrset(win, A_BOLD | A_REVERSE);
wattrset(parent_win, A_BOLD | A_REVERSE);
active_el = el;
}
p_x = 1;
mvwprintw(win, p_y, p_x, "%s%n", el->name, &p_x);
mvwprintw(win, p_y, p_x + 1, "%*s", sz_x - p_x, "");
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) {
wattroff(win, A_BOLD | A_REVERSE);
wattroff(parent_win, A_BOLD | A_REVERSE);
}
p_y++;
cur_el_idx++;
@@ -121,7 +125,7 @@ void draw_file_list(ui_file_list_t *fl_ui) {
p_x = 1;
for (; p_y < sz_y_f; p_y++) {
mvwprintw(win, p_y, p_x, "%*s", sz_x - 1, "");
mvwprintw(parent_win, p_y, p_x, "%*s", sz_x - 1, "");
}
char p_info[24];
uint32_t p_len;
@@ -132,9 +136,9 @@ void draw_file_list(ui_file_list_t *fl_ui) {
uint32_t l_pad = (sz_x - p_len) / 2;
wattrset(win, A_BOLD);
mvwprintw(win, p_y, p_x, "%*s%s%*s", l_pad, "", p_info, l_pad, "");
wattroff(win, A_BOLD);
wattrset(parent_win, A_BOLD);
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;
src/ui/widget/file_list.h
+2 -1
View File
@@ -12,8 +12,9 @@ typedef struct {
uint32_t full_count;
uint32_t pages;
uint32_t current_page;
uint32_t activate_last : 1;
uint32_t max_lines;
WINDOW *const* info_win;
uint32_t activate_last : 1;
} ui_file_list_t;
void draw_file_list(ui_file_list_t *fl_ui);