Compare commits

..
19 changed files with 311 additions and 131 deletions
+1 -24
View File
@@ -1,40 +1,17 @@
# TODO: # TODO:
## Current: ## Current:
- [ ] File upload multiline description (window) - [ ] Sorting in the file list (local files)
- [ ] Sorting in the file list
- [ ] Resume download - [ ] Resume download
- [ ] Separate common structures in the common.h - [ ] 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
- [x] Input: fix non-Latin letters
- [x] Get rid of unsigned integers
- [x] Check registration / enter server name again
- [x] PageUp/PageDown key functionality in lists
- [x] Permission checkboxes for file upload/edit
- [x] Upload menu disappears after alert (when opening link to non-existing directory for example).
## Global tasks: ## Global tasks:
- [ ] Testing - [ ] Testing
- [ ] Documentation - [ ] Documentation
## Bugs:
- [x] Sometimes segfaults while navigating through modal menu
## Features: ## Features:
- [x] Search files
- [x] Correct spacing in the search bar
- [x] Finish registration
- [x] Privilege settings for files
- [ ] Files removal - [ ] Files removal
- [ ] Encryption - [ ] Encryption
- [x] UTF-8 support
- [ ] Check MD5 sum after download/upload - [ ] Check MD5 sum after download/upload
- [ ] Hotkeys for buttons - [ ] Hotkeys for buttons
- [ ] Manipulation by UI-cursor - [ ] Manipulation by UI-cursor
## Fixes:
- [x] Check and fix registration and login
- [x] CMAKE
+5
View File
@@ -41,6 +41,11 @@ app_t *app_init(app_t *app) {
keypad(app->win, TRUE); keypad(app->win, TRUE);
app->callback_after_notification = NULL;
app->modal.is_initiated = false;
app->modal.needs_destroy = false;
/* refresh the windows */ /* refresh the windows */
wnoutrefresh(app->win); wnoutrefresh(app->win);
doupdate(); doupdate();
+2 -1
View File
@@ -15,7 +15,7 @@ typedef enum {
modal_color_pair = 3, modal_color_pair = 3,
} app_color; } app_color;
typedef struct { typedef struct app_t {
WINDOW *win; WINDOW *win;
w_dialogue_t modal; w_dialogue_t modal;
params_t *params; params_t *params;
@@ -23,6 +23,7 @@ typedef struct {
query_args_t *query_args; query_args_t *query_args;
file_args_t *file_args; file_args_t *file_args;
void (*active_callback)(w_cb_args_t *args); void (*active_callback)(w_cb_args_t *args);
void (*callback_after_notification)(struct app_t *);
void *active_widget; void *active_widget;
wchar_t *top_text; wchar_t *top_text;
main_window_t main_ui; main_window_t main_ui;
+1 -1
View File
@@ -1,9 +1,9 @@
/* SPDX-License-Identifier: MIT */ /* SPDX-License-Identifier: MIT */
/* Copyright (c) 2026 Oleksandr Zhylin */ /* Copyright (c) 2026 Oleksandr Zhylin */
#include "main.h"
#include <modals.h> #include <modals.h>
#include <widget.h> #include <widget.h>
#include "main.h"
static void (*active_callback_backup)(w_cb_args_t *) = NULL; static void (*active_callback_backup)(w_cb_args_t *) = NULL;
+1 -1
View File
@@ -332,7 +332,7 @@ static void fl_add(fl_item_t **cur, fl_item_t **start, char *line) {
char *descr_begin = NULL; char *descr_begin = NULL;
int h_len; int h_len;
char *name_begin = strchr(line, '[') + 1; char *name_begin = strchr(line, '[') + 1;
char *name_end = strrchr(line, ']'); char *name_end = strchr(line, ']');
int name_len = name_end - name_begin; int name_len = name_end - name_begin;
fl_item_t *fitem = malloc(sizeof(fl_item_t)); fl_item_t *fitem = malloc(sizeof(fl_item_t));
sscanf(name_end, "] %zu %s%n", &(fitem->size), fowner, &h_len); sscanf(name_end, "] %zu %s%n", &(fitem->size), fowner, &h_len);
+1
View File
@@ -52,6 +52,7 @@ enum state {
S_ERR, S_ERR,
S_NEXT_ACTION, S_NEXT_ACTION,
S_WAIT_REGISTER_CONFIRMATION, S_WAIT_REGISTER_CONFIRMATION,
S_WAIT_USER_DESCRIPTION,
/* Legacy */ /* Legacy */
WAIT_SERVER_INIT, WAIT_SERVER_INIT,
WAIT_SERVER, WAIT_SERVER,
-4
View File
@@ -40,10 +40,6 @@ void upload_props_dialogue_modal_cb(w_cb_args_t *args) {
app->query_args->file->size, privileges); app->query_args->file->size, privileges);
/* app->query_args->file->description = /* app->query_args->file->description =
malloc(desc_input->value_len + 9); reserve space for \n:END:\n */ malloc(desc_input->value_len + 9); reserve space for \n:END:\n */
app->query_args->file->description =
malloc(sizeof("[Empty description]\n:END:\n"));
strcpy(app->query_args->file->description,
"[Empty description]\n:END:\n");
d->needs_destroy = true; d->needs_destroy = true;
app->query_args->state = S_UPLOAD_REQUESTED; app->query_args->state = S_UPLOAD_REQUESTED;
break; break;
+21 -4
View File
@@ -30,6 +30,7 @@
#include "dialogue.h" #include "dialogue.h"
#include "file_processor.h" #include "file_processor.h"
#include "main.h" #include "main.h"
#include "main_window.h"
#include "server.h" #include "server.h"
#include "types.h" #include "types.h"
@@ -77,12 +78,18 @@ void query_loop(app_t *app) {
} }
} }
if (query_args->state == S_NEXT_ACTION) { if (query_args->state == S_NEXT_ACTION) {
if (app->callback_after_notification != NULL) {
app->callback_after_notification(app);
app->callback_after_notification = NULL;
continue;
} else {
query_args->from_server = TRUE; query_args->from_server = TRUE;
if (ERR == process_query(app)) { if (ERR == process_query(app)) {
EXIT_APP("*** error while processing query ***", app, 1) EXIT_APP("*** error while processing query ***", app, 1)
} }
query_args->state = S_WAIT_SERVER; query_args->state = S_WAIT_SERVER;
continue; continue;
}
} else { } else {
sr = select(maxfd + 1, &readfds, NULL, NULL, NULL); sr = select(maxfd + 1, &readfds, NULL, NULL, NULL);
if (sr == -1) { 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, w_notification("File upload", dc_normal,
"File %s is uploaded to the server!", "File %s is uploaded to the server!",
app->query_args->file->name); app->query_args->file->name);
clear_file_in_query(app->query_args); int desc_answer =
app->query_args->state = S_FILE_LIST; w_bool_ask("Write file description", "Yes", "No", true,
app->modal.needs_destroy = 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); */
return 0; return 0;
} }
return 1; /* TODO: Error case */ 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), while ((qlen = query_extract_from_buf(q_args->buf, &(q_args->buf_used),
&query))) { &query))) {
if (callback == NULL) { if (callback == NULL) {
process_server_command(query, qlen, app); res = process_server_command(query, qlen, app);
} else { } else {
res = callback(app, query, qlen); res = callback(app, query, qlen);
} }
+3 -3
View File
@@ -146,10 +146,10 @@ int process_server_command(char *line, int l_len, app_t *app) {
return 0; return 0;
} }
q_args->state = S_PREP_SERVER_MESSAGE; if (q_args->state == S_NEXT_ACTION) return 1;
server_print_message_cb(app, line, l_len);
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) { void ask_uname_and_password(params_t *params) {
+39 -9
View File
@@ -24,12 +24,42 @@ void u_d_arr_ptr_add(d_array_ptr_t *arr, void *ptr, int32_t idx) {
memset(arr->arr + arr->capacity, 0, arr->capacity - new_capacity); memset(arr->arr + arr->capacity, 0, arr->capacity - new_capacity);
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;
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;
} }
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) * 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) {
arr->capacity = 0; arr->capacity = 0;
arr->length = 0; arr->length = 0;
@@ -37,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;
} }
+1 -1
View File
@@ -13,7 +13,7 @@ typedef struct d_array_ptr_t {
void *last_el; void *last_el;
} d_array_ptr_t; } 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_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_add(d_array_ptr_t *arr, void *ptr, int32_t idx);
+17
View File
@@ -67,3 +67,20 @@ int32_t u_utf8_curs_printw(WINDOW *win, int32_t *y, int32_t *x,
free(wline); free(wline);
return nsize; 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;
}
+1
View File
@@ -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, int32_t u_utf8_convert_to_wide(const char *utf8_str, wchar_t **restrict wide_str,
size_t *restrict o_len); 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); 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 #endif
+1
View File
@@ -333,6 +333,7 @@ void w_dialogue_destroy(w_dialogue_t *d, void *_app) {
d->win = NULL; d->win = NULL;
d->is_initiated = false; d->is_initiated = false;
d->needs_destroy = false; d->needs_destroy = false;
d->needs_update = false;
app->active_callback = (w_cb_t)app->main_ui.cb_b_press; app->active_callback = (w_cb_t)app->main_ui.cb_b_press;
app->query_args->active_dialogue = NULL; app->query_args->active_dialogue = NULL;
u_d_arr_ptr_free(&(d->id_map)); u_d_arr_ptr_free(&(d->id_map));
+2 -14
View File
@@ -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_g_el_t *g_el = args->active_el;
w_input_t *input = g_el->element; w_input_t *input = g_el->element;
int32_t start_pos = 0; int32_t start_pos = 0;
wchar_t w_key[2];
app_t *app = args->app; app_t *app = args->app;
char long_key[3];
int short_val_len = 1;
switch (key) { switch (key) {
case KEY_BACKSPACE: case KEY_BACKSPACE:
@@ -47,23 +44,14 @@ bool w_input_default_key_action(w_cb_args_t *args) {
default: default:
if (input->value_len == input->max_len) if (input->value_len == input->max_len)
break; break;
long_key[0] = key; key = u_utf8_get_full_letter(key, app->win);
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);
if (input->cur_pos > 0) { if (input->cur_pos > 0) {
start_pos = input->value_len - input->cur_pos - 1; start_pos = input->value_len - input->cur_pos - 1;
memmove(input->w_value + start_pos + 1, input->w_value + start_pos, memmove(input->w_value + start_pos + 1, input->w_value + start_pos,
sizeof(wchar_t) * (input->value_len - start_pos)); sizeof(wchar_t) * (input->value_len - start_pos));
input->w_value[start_pos] = key; input->w_value[start_pos] = key;
} else { } 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'; input->w_value[input->value_len] = '\0';
} }
break; break;
+3 -1
View File
@@ -314,6 +314,7 @@ void w_fl_draw(w_ui_file_list_t *fui) {
curs_set(true); curs_set(true);
wmove(win, p_y, p_x + p_len); wmove(win, p_y, p_x + p_len);
} else { } else {
curs_set(false);
int32_t l_pad = 0; int32_t l_pad = 0;
sprintf(p_info, "P: %d/%d F: %d L: %d%n", fui->current_page, fui->pages, sprintf(p_info, "P: %d/%d F: %d L: %d%n", fui->current_page, fui->pages,
fui->current_count, fui->full_count, &p_len); 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: "); mvwprintw(i_win, p_y, p_x, "Name: ");
p_x = 8; /* 7 (size of "Name: ") + 1 */ 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; p_x = 1;
size_to_text(active_el->size, size_text); size_to_text(active_el->size, size_text);
+3
View File
@@ -10,6 +10,9 @@ void main_window_set(app_t *app, enum main_window_type type) {
if (app->main_ui.ui != NULL) { if (app->main_ui.ui != NULL) {
main_window_destroy(app); main_window_destroy(app);
} }
if (app->modal.is_initiated) {
w_dialogue_destroy(&(app->modal), app);
}
app->main_ui.type = type; app->main_ui.type = type;
switch (type) { switch (type) {
case mw_fl_server: case mw_fl_server:
+185 -40
View File
@@ -1,6 +1,9 @@
/* SPDX-License-Identifier: MIT */ /* SPDX-License-Identifier: MIT */
/* Copyright (c) 2026 Oleksandr Zhylin */ /* Copyright (c) 2026 Oleksandr Zhylin */
#include "../file_processor.h"
#include "../server.h"
#include "../windows/main_window.h"
#include <dirent.h> #include <dirent.h>
#include <fcntl.h> #include <fcntl.h>
#include <ncursesw/ncurses.h> #include <ncursesw/ncurses.h>
@@ -8,20 +11,26 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <utils.h> #include <utils.h>
#include <wchar.h> #include <wchar.h>
#include "d_array.h"
#include "file_list.h"
#include "text_edit.h" #include "text_edit.h"
#include "widget_core.h" #include "widget_core.h"
/* TODO: create dynamic array of endline positions */ /* TODO: расширять capacity линии при достижении лимита */
/* #define INACTIVE_LINES 5
Массив 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) { static void w_te_cb(w_cb_args_t *args) {
app_t *app = args->app; app_t *app = args->app;
@@ -32,15 +41,78 @@ 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:
fui->current_line->text[fui->current_line->len--] = 0; 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--;
} 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 = new_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:
fui->cur_shift_pos.y--; if (fui->cur_line_idx > 0) {
wchar_t *nl_ptr = NULL; fui->cur_line = fui->lines_arr.arr[--fui->cur_line_idx];
wchar_t *line_start = fui->line; 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:
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;
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; break;
case '\n': case '\n':
new_line = malloc(sizeof(w_te_ui_line_t)); new_line = malloc(sizeof(w_te_ui_line_t));
@@ -48,13 +120,37 @@ 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;
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)); u_d_array_append(&(fui->lines_arr), new_line, sizeof(w_te_ui_line_t));
fui->current_line = new_line; }
fui->cur_line_pos = 0;
fui->cur_line = new_line;
fui->cur_line_idx++;
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:
fui->current_line->text[fui->current_line->len++] = key; key = u_utf8_get_full_letter(key, app->win);
fui->current_line->text[fui->current_line->len] = 0; 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->sym_count++;
fui->cur_line->len++;
} }
} }
@@ -69,27 +165,56 @@ static void w_te_cb_refresh(void *data) {
static struct action_key action_keys[] = { static struct action_key action_keys[] = {
{.key = "Esc", .title = "Back", .code = '\33'}, {.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)}, {.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) { static int32_t process_user_input(app_t *app, w_cb_args_t *d_args) {
int32_t c; int32_t c;
w_te_ui_t *fui = (w_te_ui_t *)app->query_args->main_ui->ui; w_te_ui_t *fui = (w_te_ui_t *)app->query_args->main_ui->ui;
c = wgetch(app->win); c = wgetch(app->win);
int text_pos = 0;
w_te_ui_line_t *arr_line = NULL;
switch (c) { switch (c) {
case KEY_F(9): case KEY_F(9):
app_destroy(app, 0); app_destroy(app, 0);
return OK; return OK;
case 'D': case KEY_F(2):
case 'd': /* TODO: move to description edit */
// case '\33': /* ESC key */ app->query_args->file->description =
// if (!app->modal.is_initiated) { malloc(sizeof(wchar_t) * (fui->sym_count + 9));
// server_send_string(app->query_args, "file list %d %d\n", for (int i = 0; i < fui->lines_count; i++) {
// fui->max_lines - 1, 1); arr_line = fui->lines_arr.arr[i];
// main_window_set(app, mw_fl_server); text_pos += wcstombs(app->query_args->file->description + text_pos,
// d_args->element = app->main_ui.ui; arr_line->text, arr_line->len);
// break; 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"));
server_send_string(app->query_args, app->query_args->file->description);
app->query_args->state = S_WAIT_SERVER;
app->callback_after_notification = callback_after_notification;
/* Save */
break;
case KEY_F(8):
server_send_string(app->query_args, "[Empty description]\n:END:\n");
app->query_args->state = S_WAIT_SERVER;
app->callback_after_notification = callback_after_notification;
/* Cancel */
break;
default: default:
d_args->data = (void *)&c; d_args->data = (void *)&c;
app->active_callback(d_args); app->active_callback(d_args);
@@ -108,7 +233,7 @@ w_te_ui_t *w_te_init_win(app_t *app) {
app->main_ui.type = mw_f_desc; app->main_ui.type = mw_f_desc;
app->main_ui.cb_ui_refresh = w_te_cb_refresh; app->main_ui.cb_ui_refresh = w_te_cb_refresh;
app->main_ui.b_keys = action_keys; 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.cb_b_press = (w_cb_press_t)process_user_input;
app->main_ui.reset = w_te_reset_app; app->main_ui.reset = w_te_reset_app;
app->main_ui.draw = (draw_f_t *)w_te_draw; app->main_ui.draw = (draw_f_t *)w_te_draw;
@@ -127,18 +252,25 @@ w_te_ui_t *w_te_init_win(app_t *app) {
wcsncpy(app->top_text, top_text, top_text_len); wcsncpy(app->top_text, top_text, top_text_len);
app->top_text[top_text_len] = 0; app->top_text[top_text_len] = 0;
u_d_arr_ptr_init(&(fui->lines_arr), INBUFSIZE); u_d_arr_ptr_init(&(fui->lines_arr), INBUFSIZE);
fui->current_line = malloc(sizeof(w_te_ui_line_t)); fui->cur_line = malloc(sizeof(w_te_ui_line_t));
fui->current_line->text = malloc(INBUFSIZE * sizeof(wchar_t)); fui->cur_line->text = malloc(INBUFSIZE * sizeof(wchar_t));
fui->current_line->len = 0; fui->cur_line->len = 0;
fui->current_line->capacity = INBUFSIZE; fui->cur_line->capacity = INBUFSIZE;
u_d_array_append(&(fui->lines_arr), fui->current_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->sym_count = 0;
fui->lines_count = 1;
fui->lines_top_indent = 0;
fui->cur_line_pos = 0;
return fui; return fui;
} }
void w_te_reset(w_te_ui_t *fui) { void w_te_reset(w_te_ui_t *fui) {
fui->line[0] = 0; fui->cur_line_pos = 0;
fui->cur_shift_pos.x = 0; fui->sym_count = 0;
fui->cur_shift_pos.y = 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) {
@@ -161,23 +293,35 @@ 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, "");
} }
wchar_t *cur_ptr = fui->line; wattrset(win, COLOR_PAIR(modal_color_pair) | A_BOLD);
wchar_t *nl_ptr = wcschr(cur_ptr, '\n');
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);
} }
} }
fui->cur_abs_pos.y = p_y; p_y--;
fui->cur_abs_pos.x = p_x;
wmove(win, fui->cur_line_idx - fui->lines_top_indent, fui->cur_line_pos);
p_x = 1; p_x = 1;
@@ -187,7 +331,8 @@ void w_te_draw(w_te_ui_t *fui) {
} }
void w_te_destroy(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); free(*fui);
*fui = NULL; *fui = NULL;
} }
+7 -11
View File
@@ -22,19 +22,14 @@ typedef struct {
typedef struct { typedef struct {
w_t w; w_t w;
WINDOW *win; 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; p_file_t *file_ptr;
w_te_ui_line_t *current_line; 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; } w_te_ui_t;
void w_te_draw(w_te_ui_t *fl_ui); void w_te_draw(w_te_ui_t *fl_ui);
@@ -42,5 +37,6 @@ void w_te_destroy(w_te_ui_t **fui);
void w_te_reset(w_te_ui_t *fl_ui); 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(WINDOW **win, w_t *w_parent);
w_te_ui_t *w_te_init_win(app_t *app); 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 #endif