Merge pull request 'Description edit on save' (#1) from text_edit_window into main

Reviewed-on: #1

CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.23)
 
+set(CACHE DEV_WIDGET BOOL OFF "Enable development widget mode")
+
 project(ZBBSClientTUI
     VERSION 1.0.0
 )

README.md

@@ -10,7 +10,9 @@ It will create all necessary file structure in order to run the program correctl
 2. Build the binary running `$ make` or `$ make bbs-client`
 3. Run it by `$ make run`
 
-## Develop
+## Development
+### Widget development
+In order to switch to widget/screen development, configure cmake with `-DDEV_WIDGET=ON`
 
 ### Name conventions:
 

TODO.md

@@ -1,11 +1,11 @@
 # TODO:
 
 ## Current:
-- [ ] Rewrite cancel download. Use packages and check every time for a confirmation to continue download
 - [ ] File upload multiline description (window)
 - [ ] Sorting in the file list
 - [ ] Resume download
 - [ ] 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

src/CMakeLists.txt

@@ -22,6 +22,12 @@ endif()
 
 file(GLOB M_SOURCES "*.c")
 
+if(DEV_WIDGET) 
+  list(FILTER M_SOURCES EXCLUDE REGEX "main\\.c$")
+else()
+  list(FILTER M_SOURCES EXCLUDE REGEX "main_dev_widget\\.c$")
+endif()
+
 target_sources(zbbs-client-tui
     PRIVATE
         ${M_SOURCES}

src/app.c

@@ -11,44 +11,46 @@
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <wchar.h>
 
 void ac_file(WINDOW *win, int is_action_w);
 
-app_t *app_init(void) {
+app_t *app_init(app_t *app) {
+  app->top_text = NULL;
   /* get values from terminal size */
   int32_t y_max, x_max;
   getmaxyx(stdscr, y_max, x_max);
 
   /* allocate app struct memory */
-  app_t *_app = calloc(1, sizeof(app_t));
+  if (app == NULL) {
+    app = calloc(1, sizeof(app_t));
+  }
 
   /* associate values for screen size */
-  _app->coordinates.max_x = _app->coordinates.cur_x = x_max;
-  _app->coordinates.max_y = _app->coordinates.cur_y = y_max;
+  app->coordinates.max_x = app->coordinates.cur_x = x_max;
+  app->coordinates.max_y = app->coordinates.cur_y = y_max;
 
-  _app->win = newwin(_app->coordinates.cur_y, _app->coordinates.cur_x, 0, 0);
+  app->win = newwin(app->coordinates.cur_y, app->coordinates.cur_x, 0, 0);
 
   /* dialogue */
-  _app->modal.win = NULL;
-  _app->modal.is_initiated = 0;
-
-  /* print top and bottom bars */
-  _app->main_ui.b_keys_len = 0;
-  app_draw_bars(_app);
-
-  /* here goes box borders */
-  app_draw_borders(_app);
+  app->modal.win = NULL;
+  app->modal.is_initiated = 0;
 
   /* NULL to main_ui */
-  MAIN_UI_RESET(_app);
+  MAIN_UI_RESET(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 */
-  wnoutrefresh(_app->win);
+  wnoutrefresh(app->win);
   doupdate();
 
-  return _app;
+  return app;
 }
 
 void app_init_nc(void) {
@@ -106,15 +108,17 @@ void app_draw_bars(app_t *app) {
     mvwprintw(app->win, app->coordinates.cur_y - 2, i, " ");
   }
 
-  /* add content to the top bar */
-  if (app->params && app->params->is_connected) {
+  if (app->top_text != NULL) {
+    mvwaddnwstr(app->win, 1, 2, app->top_text, wcslen(app->top_text));
+  } else if (app->params && app->params->is_connected) {
     int32_t ip_address = app->params->addr;
     u_char ip_addr[4];
     mempcpy(ip_addr, &ip_address, 4);
     sprintf(top_text, "Connected to %u.%u.%u.%u, user: %s", ip_addr[0],
             ip_addr[1], ip_addr[2], ip_addr[3], app->params->uname);
+    mvwprintw(app->win, 1, 2, "%s", top_text);
   }
-  mvwprintw(app->win, 1, 2, "%s", top_text);
+
   wattroff(app->win, A_REVERSE);
 
   /* add content to the bottom bar */

src/app.h

@@ -15,7 +15,7 @@ typedef enum {
   modal_color_pair = 3,
 } app_color;
 
-typedef struct {
+typedef struct app_t {
   WINDOW *win;
   w_dialogue_t modal;
   params_t *params;
@@ -23,11 +23,13 @@ typedef struct {
   query_args_t *query_args;
   file_args_t *file_args;
   void (*active_callback)(w_cb_args_t *args);
+  void (*callback_after_notification)(struct app_t *);
   void *active_widget;
+  wchar_t *top_text;
   main_window_t main_ui;
 } app_t;
 
-app_t *app_init(void);
+app_t *app_init(app_t *app);
 void   app_init_nc(void);
 void   app_destroy(app_t *app, int32_t exit_code);
 void   app_draw_borders(app_t *app);

src/connection.c

@@ -31,7 +31,7 @@ bool connect_to_server(app_t *app) {
     return false;
   }
   app->query_args->state = S_WAIT_SERVER;
-  app->params->is_connected = TRUE;
+  app->params->is_connected = true;
   app->query_args->sd = app->params->sd;
   app_draw_bars(app);
   return true;

src/draw_modal.c

@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: MIT */
 /* Copyright (c) 2026 Oleksandr Zhylin */
 
+#include "main.h"
 #include <modals.h>
 #include <widget.h>
-#include "main.h"
 
 static void (*active_callback_backup)(w_cb_args_t *) = NULL;
 

src/file_processor.c

@@ -332,7 +332,7 @@ static void fl_add(fl_item_t **cur, fl_item_t **start, char *line) {
   char *descr_begin = NULL;
   int h_len;
   char *name_begin = strchr(line, '[') + 1;
-  char *name_end = strrchr(line, ']');
+  char *name_end = strchr(line, ']');
   int name_len = name_end - name_begin;
   fl_item_t *fitem = malloc(sizeof(fl_item_t));
   sscanf(name_end, "] %zu %s%n", &(fitem->size), fowner, &h_len);

src/main.c

@@ -6,7 +6,6 @@
 #include <ncursesw/ncurses.h>
 #include <netinet/in.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/un.h>
@@ -15,11 +14,11 @@
 #include <widget.h>
 #include <windows.h>
 
-#include "main.h"
 #include "../app.h"
 #include "alert.h"
 #include "connection.h"
-#include "file_list.h"
+// #include "file_list.h"
+#include "main.h"
 #include "query.h"
 
 int32_t m_id = 0;
@@ -27,42 +26,38 @@ int32_t m_id = 0;
 int32_t process_user_input(app_t *app, w_cb_args_t *d_args);
 
 int main(int argc, char **argv) {
-  app_t *app;
+  app_t app;
   params_t params;
-  query_args_t *q_args = malloc(sizeof(query_args_t));
-
-  app = calloc(1, sizeof(app_t));
+  query_args_t q_args;
 
   app_init_nc();
 
-  app = app_init();
+  app.params = &params;
+  app_init(&app);
   init_params(&params);
-  app->params = &params;
   analyze_args(argc, argv, &params);
 
   /* init alert */
-  w_alert_init(app);
+  w_alert_init(&app);
 
-  init_query_args(q_args, app->params);
-  q_args->buf = malloc(INBUFSIZE);
-  app->query_args = q_args;
-
-  main_window_set(app, mw_fl_server);
+  init_query_args(&q_args, app.params);
+  app.query_args = &q_args;
 
+  main_window_set(&app, mw_fl_server);
   /* init client to connect to the server */
-  app->params->sd = init_client();
+  app.params->sd = init_client();
 
   if (params.addr == 0) {
-    app->query_args->state = S_ASK_SEVER_IP;
+    app.query_args->state = S_ASK_SEVER_IP;
   } else {
-    connect_to_server(app);
+    connect_to_server(&app);
   }
 
-  app->query_args->main_ui = &(app->main_ui);
+  app.query_args->main_ui = &(app.main_ui);
 
-  query_loop(app);
+  query_loop(&app);
   clear_params(&params);
-  app_destroy(app, 0);
+  app_destroy(&app, 0);
 
   return OK;
 }

src/main.h

@@ -52,6 +52,7 @@ enum state {
   S_ERR,
   S_NEXT_ACTION,
   S_WAIT_REGISTER_CONFIRMATION,
+  S_WAIT_USER_DESCRIPTION,
   /* Legacy */
   WAIT_SERVER_INIT,
   WAIT_SERVER,
@@ -119,7 +120,7 @@ typedef struct query_args {
   int32_t buf_used;
   p_file_t *file;
   enum state state;
-  char *buf;
+  char buf[INBUFSIZE];
   bool from_server;
   params_t *params;
   struct {

src/main_dev_widget.c

@@ -0,0 +1,116 @@
+/* SPDX-License-Identifier: MIT */
+/* Copyright (c) 2026 Oleksandr Zhylin */
+
+#include <arpa/inet.h>
+#include <modals.h>
+#include <ncursesw/ncurses.h>
+#include <netinet/in.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <sys/select.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <termios.h>
+#include <unistd.h>
+#include <widget.h>
+#include <windows.h>
+
+#include "../app.h"
+#include "alert.h"
+#include "connection.h"
+#include "main.h"
+#include "query.h"
+
+int32_t m_id = 0;
+
+void mini_loop(app_t *app) {
+  w_cb_args_t d_args = {
+      .app = app, .element = NULL, .data = NULL, .resp_data.code = cbrc_none};
+
+  fd_set readfds;
+
+  while (true) {
+    app_draw_modal(app);
+    main_window_draw(app);
+    app_refresh(app);
+
+    FD_ZERO(&readfds);
+    FD_SET(STDIN_FILENO, &readfds);
+    int maxfd = STDIN_FILENO;
+
+    int sr = select(maxfd + 1, &readfds, NULL, NULL, NULL);
+
+    if (sr == -1) {
+      /* perror("select"); */
+      exit(3);
+    }
+
+    if (app->main_ui.cb_b_press != NULL && app->modal.is_initiated == false) {
+      if (ERR == app->main_ui.cb_b_press(app, &d_args)) {
+        w_alert("error while processing user input");
+      }
+    }
+  }
+}
+
+int main(void) {
+  app_t app;
+  file_args_t fargs;
+  query_args_t q_args;
+  params_t params;
+  p_file_t file;
+
+  init_query_args(&q_args, app.params);
+
+  app.params = &params;
+  app.query_args = &q_args;
+  app.file_args = &fargs;
+
+  app_init_nc();
+  init_params(&params);
+  w_alert_init(&app);
+  app_init(&app);
+  
+  q_args.file = &file;
+  app.query_args->main_ui = &(app.main_ui);
+  file.name = "Test file #1";
+  params.is_connected = false;
+  app.modal.is_initiated = false;
+  
+  main_window_set(&app, mw_f_desc);
+  mini_loop(&app);
+  exit(0);
+}
+
+int32_t process_user_input(app_t *app, w_cb_args_t *d_args) {
+  int32_t c;
+  w_ui_file_list_t *fui = (w_ui_file_list_t *)app->query_args->main_ui->ui;
+  c = wgetch(app->win);
+  switch (c) {
+  case KEY_F(9):
+    app_destroy(app, 0);
+    return OK;
+  case 'U':
+  case 'u':
+    if (!app->modal.is_initiated && !fui->active_search &&
+        app->main_ui.type != mw_fl_local) {
+      /* app->query_args->state = S_UPLOAD_FILE_SELECT; */
+      main_window_set(app, mw_fl_local);
+      main_window_draw(app);
+      d_args->element = app->main_ui.ui;
+      break;
+    }
+  case 's':
+  case 'S':
+    if (!app->modal.is_initiated && !fui->active_search) {
+      fui->active_search = true;
+      w_fl_draw(fui);
+      return OK;
+    }
+  default:
+    d_args->data = (void *)&c;
+    app->active_callback(d_args);
+    break;
+  }
+  return OK;
+}

src/query.c

@@ -30,6 +30,7 @@
 #include "dialogue.h"
 #include "file_processor.h"
 #include "main.h"
+#include "main_window.h"
 #include "server.h"
 #include "types.h"
 
@@ -77,12 +78,18 @@ void query_loop(app_t *app) {
       }
     }
     if (query_args->state == S_NEXT_ACTION) {
-      query_args->from_server = TRUE;
-      if (ERR == process_query(app)) {
-        EXIT_APP("*** error while processing query ***", app, 1)
+      if (app->callback_after_notification != NULL) {
+        app->callback_after_notification(app);
+        app->callback_after_notification = NULL;
+        continue;
+      } else {
+        query_args->from_server = TRUE;
+        if (ERR == process_query(app)) {
+          EXIT_APP("*** error while processing query ***", app, 1)
+        }
+        query_args->state = S_WAIT_SERVER;
+        continue;
       }
-      query_args->state = S_WAIT_SERVER;
-      continue;
     } else {
       sr = select(maxfd + 1, &readfds, NULL, NULL, NULL);
       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,
                    "File %s is uploaded to the server!",
                    app->query_args->file->name);
-    clear_file_in_query(app->query_args);
-    app->query_args->state = S_FILE_LIST;
-    app->modal.needs_destroy = true;
+    int desc_answer =
+        w_bool_ask("Write file description", "Yes", "No", 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 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),
                                         &query))) {
     if (callback == NULL) {
-      process_server_command(query, qlen, app);
+      res = process_server_command(query, qlen, app);
     } else {
       res = callback(app, query, qlen);
     }
@@ -291,7 +308,6 @@ static int process_command(app_t *app, wait_server_cb *callback) {
 }
 
 void init_query_args(query_args_t *q_args, params_t *params) {
-  q_args->buf = NULL;
   q_args->sd = -1;
   q_args->state = S_N_D;
   q_args->buf_used = 0;

src/server.c

@@ -146,10 +146,10 @@ int process_server_command(char *line, int l_len, app_t *app) {
     return 0;
   }
 
-  q_args->state = S_PREP_SERVER_MESSAGE;
-  server_print_message_cb(app, line, l_len);
+  if (q_args->state == S_NEXT_ACTION) return 1;
 
-  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) {

src/utils/d_array.c

@@ -13,17 +13,51 @@ void u_d_arr_ptr_init(d_array_ptr_t *arr, int32_t init_capacity) {
   memset(arr->arr, 0, sizeof(void *) * init_capacity);
 }
 
+void u_d_array_append(d_array_ptr_t *arr, void *el_ptr, size_t el_len) {
+  u_d_arr_ptr_add(arr, el_ptr, arr->length);
+}
+
 void u_d_arr_ptr_add(d_array_ptr_t *arr, void *ptr, int32_t idx) {
   if (idx > arr->capacity - 1) {
     int32_t new_capacity = idx * 2;
     arr->arr = realloc(arr->arr, new_capacity);
-    memset(arr->arr+arr->capacity, 0, arr->capacity - new_capacity);
+    memset(arr->arr + arr->capacity, 0, 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->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) {
@@ -32,3 +66,15 @@ void u_d_arr_ptr_free(d_array_ptr_t *arr) {
   free(arr->arr);
   arr->arr = NULL;
 }
+
+void u_d_arr_free_cb(d_array_ptr_t *d_arr, u_d_arr_free_callback *callback) {
+  for (int i = 0; i < d_arr->length; i++) {
+    if (d_arr->arr[i] != NULL) {
+      callback(d_arr->arr[i]);
+    }
+  }
+  d_arr->capacity = 0;
+  d_arr->length = 0;
+  free(d_arr->arr);
+  d_arr->arr = NULL;
+}

src/utils/d_array.h

@@ -1,7 +1,10 @@
 #ifndef D_ARRAY_H
 #define D_ARRAY_H
 /* Dynamic array of numbers */
+
+#include <stddef.h>
 #include <stdint.h>
+
 typedef struct d_array_ptr_t {
   int32_t capacity;
   int32_t length;
@@ -10,8 +13,12 @@ typedef struct d_array_ptr_t {
   void *last_el;
 } d_array_ptr_t;
 
+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_add(d_array_ptr_t *arr, void *ptr, int32_t idx);
 void u_d_arr_ptr_free(d_array_ptr_t *arr);
+void u_d_array_append(d_array_ptr_t *arr, void *el_ptr, size_t el_len);
+void u_d_arr_free_cb(d_array_ptr_t *arr, u_d_arr_free_callback *callback);
 
 #endif

src/utils/dlist.c

@@ -0,0 +1,63 @@
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+typedef struct dlist_el_t {
+  struct dlist_el_t *next;
+  struct dlist_el_t *previous;
+  void *el_ptr;
+} dlist_el_t;
+
+typedef struct dlist_t {
+  dlist_el_t *start;
+  dlist_el_t *current;
+  size_t len;
+} dlist_t;
+
+void dlist_add(dlist_t *dlist, void *el_ptr, int el_siz, bool prepend);
+
+dlist_t *dlist_init(void *el_ptr, int el_siz) {
+  dlist_t *dlist = malloc(sizeof(dlist_t));
+  dlist->len = 0;
+  dlist->current = NULL;
+  dlist->start = NULL;
+
+  if (el_ptr != NULL) {
+    dlist_add(dlist, el_ptr, el_siz, false);
+  }
+
+  return dlist;
+}
+
+void dlist_add(dlist_t *dlist, void *el_ptr, int el_siz, bool prepend) {
+  dlist_el_t *d_el = malloc(sizeof(dlist_el_t));
+  d_el->el_ptr = malloc(el_siz);
+  memcpy(d_el->el_ptr, el_ptr, el_siz);
+
+  if (dlist->start == NULL) {
+    d_el->previous = NULL;
+    d_el->next = NULL;
+    dlist->start = d_el;
+    dlist->current = d_el;
+  } else if (prepend) {
+    d_el->previous = NULL;
+    d_el->next = dlist->start;
+    dlist->start = d_el;
+  } else {
+    d_el->next = NULL;
+    dlist->current->next = d_el;
+    dlist->current = d_el;
+  }
+  dlist->len++;
+}
+
+void *dlist_get_current(dlist_t *dlist) {
+    return dlist->current->el_ptr;
+}
+
+void *dlist_it_prev(dlist_t *dlist) {
+    dlist->current = dlist->current->previous;
+    return dlist->current;
+}

src/utils/utf8.c

@@ -55,9 +55,9 @@ int32_t u_utf8_curs_printw(WINDOW *win, int32_t *y, int32_t *x,
 
   if (multiline) {
     _y++;
-    for (int i = 1; max_len*i < nsize; i++) {
+    for (int i = 1; max_len * i < nsize; i++) {
       _x = *x;
-      mvwaddnwstr(win, _y++, _x, wline + max_len*i, max_len);
+      mvwaddnwstr(win, _y++, _x, wline + max_len * i, max_len);
     }
   }
 
@@ -67,3 +67,20 @@ int32_t u_utf8_curs_printw(WINDOW *win, int32_t *y, int32_t *x,
   free(wline);
   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;
+}

src/utils/utf8.h

@@ -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,
                              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);
+wchar_t      u_utf8_get_full_letter(int key, WINDOW *win);
 
 #endif

src/widget/dialogue.c

@@ -333,6 +333,7 @@ void w_dialogue_destroy(w_dialogue_t *d, void *_app) {
   d->win = NULL;
   d->is_initiated = false;
   d->needs_destroy = false;
+  d->needs_update = false;
   app->active_callback = (w_cb_t)app->main_ui.cb_b_press;
   app->query_args->active_dialogue = NULL;
   u_d_arr_ptr_free(&(d->id_map));

src/widget/input.c

@@ -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_input_t *input = g_el->element;
   int32_t start_pos = 0;
-  wchar_t w_key[2];
   app_t *app = args->app;
-  char long_key[3];
-  int short_val_len = 1;
 
   switch (key) {
   case KEY_BACKSPACE:
@@ -47,23 +44,14 @@ bool w_input_default_key_action(w_cb_args_t *args) {
   default:
     if (input->value_len == input->max_len)
       break;
-    long_key[0] = key;
-    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);
+    key = u_utf8_get_full_letter(key, app->win);
     if (input->cur_pos > 0) {
       start_pos = input->value_len - input->cur_pos - 1;
       memmove(input->w_value + start_pos + 1, input->w_value + start_pos,
               sizeof(wchar_t) * (input->value_len - start_pos));
       input->w_value[start_pos] = key;
     } 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';
     }
     break;

src/windows/file_list.c

@@ -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, 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);

src/windows/main_window.c

@@ -4,11 +4,15 @@
 #include "main_window.h"
 #include "file_list.h"
 #include "fs_file_list.h"
+#include "text_edit.h"
 
 void main_window_set(app_t *app, enum main_window_type type) {
   if (app->main_ui.ui != NULL) {
     main_window_destroy(app);
   }
+  if (app->modal.is_initiated) {
+    w_dialogue_destroy(&(app->modal), app);
+  }
   app->main_ui.type = type;
   switch (type) {
   case mw_fl_server:
@@ -19,10 +23,12 @@ void main_window_set(app_t *app, enum main_window_type type) {
     w_lfl_init_win(app);
     break;
   case mw_f_desc:
+    w_te_init_win(app);
     break;
   default:
     break;
   }
+  app_draw_bars(app);
 }
 
 void main_window_draw(app_t *app) {
@@ -34,6 +40,7 @@ void main_window_draw(app_t *app) {
     w_lfl_draw((w_lfl_ui_t *)app->main_ui.ui);
     break;
   case mw_f_desc:
+    w_te_draw((w_te_ui_t *)app->main_ui.ui);
     break;
   }
   app_draw_bbar(app);
@@ -48,6 +55,7 @@ void main_window_destroy(app_t *app) {
     w_lfl_destroy((w_lfl_ui_t **)&(app->main_ui.ui));
     break;
   case mw_f_desc:
+    w_te_destroy((w_te_ui_t **)&(app->main_ui.ui));
     break;
   }
   MAIN_UI_RESET(app);

src/windows/text_edit.c

@@ -0,0 +1,335 @@
+/* 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>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <utils.h>
+#include <wchar.h>
+
+#include "d_array.h"
+#include "text_edit.h"
+#include "file_list.h"
+#include "widget_core.h"
+
+/* TODO: расширять capacity линии при достижении лимита */
+
+#define INACTIVE_LINES 5
+
+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) {
+  app_t *app = args->app;
+  int32_t key = *((int32_t *)args->data);
+  w_te_ui_t *fui = app->query_args->main_ui->ui;
+  w_te_ui_line_t *new_line = NULL;
+
+  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--;
+    } 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;
+  case KEY_UP:
+    if (fui->cur_line_idx > 0) {
+      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_DOWN:
+    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;
+  case '\n':
+    new_line = malloc(sizeof(w_te_ui_line_t));
+    new_line->text = malloc(sizeof(wchar_t) * INBUFSIZE);
+    new_line->capacity = new_line->len = INBUFSIZE;
+    new_line->text[0] = 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));
+    }
+    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;
+  default:
+    key = u_utf8_get_full_letter(key, app->win);
+    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++;
+  }
+}
+
+static void w_te_cb_refresh(void *data) {
+  app_t *app = (app_t *)data;
+  if (app->main_ui.type != mw_f_desc) {
+    return;
+  }
+  w_te_ui_t *fui = app->main_ui.ui;
+  wnoutrefresh(fui->win);
+}
+
+static struct action_key action_keys[] = {
+    {.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)},
+};
+
+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;
+  c = wgetch(app->win);
+  int text_pos = 0;
+  w_te_ui_line_t *arr_line = NULL;
+  switch (c) {
+  case KEY_F(9):
+    app_destroy(app, 0);
+    return OK;
+  case KEY_F(2):
+    /* TODO: move to description edit */
+    app->query_args->file->description =
+        malloc(sizeof(wchar_t) * (fui->sym_count + 9));
+    for (int i = 0; i < fui->lines_count; i++) {
+      arr_line = fui->lines_arr.arr[i];
+      text_pos += wcstombs(app->query_args->file->description + text_pos,
+                           arr_line->text, arr_line->len);
+      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):
+    /* Cancel */
+    break;
+  default:
+    d_args->data = (void *)&c;
+    app->active_callback(d_args);
+    break;
+  }
+  return OK;
+}
+
+void w_te_reset_app(void *app);
+
+w_te_ui_t *w_te_init_win(app_t *app) {
+  wchar_t top_text[INBUFSIZE];
+  int top_text_len = 0;
+  w_te_ui_t *fui = malloc(sizeof(w_te_ui_t));
+  app->main_ui.ui = fui;
+  app->main_ui.type = mw_f_desc;
+  app->main_ui.cb_ui_refresh = w_te_cb_refresh;
+  app->main_ui.b_keys = action_keys;
+  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_te_reset_app;
+  app->main_ui.draw = (draw_f_t *)w_te_draw;
+  app->active_callback = w_te_cb;
+  fui->w.callback = w_te_cb;
+  w_init(&(fui->w), NULL, &(app->win), "");
+  fui->file_ptr = app->query_args->file;
+  fui->w.sz.x = getmaxx(app->win);
+  fui->w.sz.y = getmaxy(app->win);
+  fui->w.parent_win = &(app->win);
+  /* * INIT UI * */
+  fui->win = newwin(fui->w.sz.y - 4, fui->w.sz.x - 2, 2, 1);
+  top_text_len =
+      swprintf(top_text, INBUFSIZE, L"Description: %s", fui->file_ptr->name);
+  app->top_text = malloc(sizeof(wchar_t) * (top_text_len + 1));
+  wcsncpy(app->top_text, top_text, top_text_len);
+  app->top_text[top_text_len] = 0;
+  u_d_arr_ptr_init(&(fui->lines_arr), INBUFSIZE);
+  fui->cur_line = malloc(sizeof(w_te_ui_line_t));
+  fui->cur_line->text = malloc(INBUFSIZE * sizeof(wchar_t));
+  fui->cur_line->len = 0;
+  fui->cur_line->capacity = INBUFSIZE;
+  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;
+}
+
+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) {
+  app_t *_app = app;
+  w_te_ui_t *fl_ui = (w_te_ui_t *)_app->main_ui.ui;
+  w_te_reset(fl_ui);
+}
+
+void w_te_draw(w_te_ui_t *fui) {
+  int32_t sz_y, sz_x;
+  int32_t p_y, p_x;
+  WINDOW *win = fui->win;
+  getmaxyx(win, sz_y, sz_x);
+  int32_t sz_y_f = sz_y - 1; // actual size (without box)
+  int32_t sz_x_f = sz_x - 1; // actual size (without box)
+
+  p_y = 0;
+  p_x = 0;
+
+  wattrset(win, COLOR_PAIR(modal_color_pair) | A_BOLD | A_REVERSE);
+
+  int i = 0;
+  for (i = 0; i < fui->w.sz.y - INACTIVE_LINES; i++) {
+    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;
+
+  if (fui->lines_arr.length > 0) {
+    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];
+      mvwaddnwstr(win, p_y++, p_x, line_arr_el->text, line_arr_el->len);
+    }
+  }
+
+  p_y--;
+
+  wmove(win, fui->cur_line_idx - fui->lines_top_indent, fui->cur_line_pos);
+
+  p_x = 1;
+
+  wattroff(win, A_BOLD);
+
+  curs_set(true);
+}
+
+void w_te_destroy(w_te_ui_t **fui) {
+  w_te_ui_t *_fui = *fui;
+  u_d_arr_free_cb(&(_fui->lines_arr), line_destroy_cb);
+  free(*fui);
+  *fui = NULL;
+}

src/windows/text_edit.h

@@ -0,0 +1,42 @@
+/* SPDX-License-Identifier: MIT */
+/* Copyright (c) 2026 Oleksandr Zhylin */
+
+#ifndef W_TEXT_EDIT_H /* LOCAL FILE LIST */
+#define W_TEXT_EDIT_H
+
+#include "../app.h"
+#include <ncursesw/ncurses.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <sys/types.h>
+#include <wchar.h>
+#include <widget_core.h>
+
+typedef struct {
+  int len;
+  wchar_t *text; /* TODO: make dynamic */
+  int capacity;
+} w_te_ui_line_t;
+
+
+typedef struct {
+  w_t w;
+  WINDOW         *win;
+  p_file_t       *file_ptr;
+  w_te_ui_line_t *cur_line;
+  int             cur_line_idx;
+  int             cur_line_pos;
+  d_array_ptr_t   lines_arr;
+  int             lines_count;
+  int             lines_top_indent;
+  int             sym_count;
+} w_te_ui_t;
+
+void w_te_draw(w_te_ui_t *fl_ui);
+void w_te_destroy(w_te_ui_t **fui);
+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_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