page up/page down in file list menu [buggy].

TODO.md

@@ -1,8 +1,9 @@
 # TODO:
 
 ## Current:
+- [ ] Upload menu disappears after alert (when opening link to non-existing directory for example).
 - [ ] Sorting in file list
-- [ ] PageUp/PageDown key functionality in lists
+- [x] PageUp/PageDown key functionality in lists
 - [ ] File upload multiline description (window)
 - [x] Permission checkboxes for file upload/edit
 - [ ] More intuitive navigation between nested groups (by pressing left and right buttons)

src/modals/modals.h

@@ -1,6 +1,5 @@
 #ifndef MODALS_H
 #define MODALS_H
-#include "alert.h"
 #include "ask_server_addr.h"
 #include "download_pr.h"
 #include "login_credentials.h"

src/widget/alert.c

@@ -1,6 +1,6 @@
 #include "alert.h"
-#include <stdarg.h>
 #include <ncursesw/ncurses.h>
+#include <stdarg.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <widget.h>
@@ -22,6 +22,8 @@ void notification(const char *title, enum dc_color_scheme color,
   if (app == NULL)
     return;
 
+  void *callback = app->active_callback;
+
   group_el_init_t actions[] = {
       {.type = w_button, .label = "OK", .is_default = true}, {.type = w_end}};
 
@@ -51,6 +53,7 @@ void notification(const char *title, enum dc_color_scheme color,
   destroy_group(d->g_action);
   delwin(d->win);
   free(d);
+  app->active_callback = callback;
   app_refresh(app);
   if (app->modal.win != NULL) {
     app->modal.needs_update = true;

src/widget/file_list.c

@@ -77,13 +77,32 @@ void file_list_cb(callback_args_t *args) {
       fui->activate_last = true;
     }
     break;
+  case KEY_NPAGE:
+    if (fui->current_page < fui->pages) {
+      app->query_args->state = S_FILE_LIST;
+      server_send_string(app->query_args, "%s %u %u\n", q_prefix,
+                         fui->max_lines, fui->current_page + 1);
+      reset_file_list(fui);
+    }
+    break;
+  case KEY_PPAGE:
+    if (fui->current_page > 1) {
+      app->query_args->state = S_FILE_LIST;
+      server_send_string(app->query_args, "%s %u %u\n", q_prefix,
+                         fui->max_lines, fui->current_page - 1);
+      reset_file_list(fui);
+      fui->activate_last = true;
+    }
+    break;
+    break;
   case '\33':
     fui->active_search = false;
     fui->search_key->data[0] = '\0';
     fui->search_key->slen = 0;
     sprintf(q_prefix, "file list");
     app->query_args->state = S_FILE_LIST;
-    server_send_string(app->query_args, "%s %u %u\n", q_prefix, fui->max_lines, 1);
+    server_send_string(app->query_args, "%s %u %u\n", q_prefix, fui->max_lines,
+                       1);
     reset_file_list(fui);
   case '\n':
     ui_file_select(app->file_args, app->query_args, fui->current_idx + 1);

src/widget/fs_file_list.c

@@ -2,7 +2,6 @@
 /* Copyright (c) 2026 Oleksandr Zhylin */
 
 #include <dirent.h>
-#include <errno.h>
 #include <ncursesw/ncurses.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -15,6 +14,8 @@
 #include <unistd.h>
 #include <utils.h>
 
+#include "alert.h"
+
 #include "fs_file_list.h"
 #include "widget_core.h"
 
@@ -63,22 +64,24 @@ static void fl_clear(fs_fl_item_t **start, fs_fl_item_t **arg_current) {
   *arg_current = NULL;
 }
 
-fs_fl_item_t *get_files_from_fs(char *path_prefix) {
+static int get_files_from_fs(ui_fs_file_list_t *fui, char *path) {
   DIR *dir;
   struct dirent *dent;
   char name[257];
   char l_path[INBUFSIZE];
   struct fl_args f_args;
-  ssize_t r;
+  ssize_t r = 0;
+  fui->files_num = 0;
 
   fs_fl_item_t *d_start = NULL, *d_current = NULL; /* directories */
   fs_fl_item_t *f_start = NULL, *f_current = NULL; /* files */
 
-  dir = opendir(path_prefix);
+  dir = opendir(path);
-  if (!dir) {
+  if (!dir) return 1;
-    return NULL;
+  free(fui->d_path);
-    errno = 1;
+  fui->d_path = malloc(strlen(path)+1);
-  }
+  strcpy(fui->d_path, path);
+  fl_clear(&(fui->start), &(fui->current));
   while ((dent = readdir(dir)) != NULL) {
     f_args.path = NULL;
     if ((f_args.d_type = dent->d_type) == DT_DIR) {
@@ -87,6 +90,7 @@ fs_fl_item_t *get_files_from_fs(char *path_prefix) {
         sprintf(name, "/%s", dent->d_name);
         f_args.name = name;
         fl_add(&t_st, &t_cur, &f_args);
+        fui->files_num++;
         /* Always put .. at the beginning */
         t_st->next = d_start;
         d_start = t_st;
@@ -100,13 +104,15 @@ fs_fl_item_t *get_files_from_fs(char *path_prefix) {
       sprintf(name, "/%s", dent->d_name);
       f_args.name = name;
       fl_add(&d_start, &d_current, &f_args);
+      fui->files_num++;
     } else if (f_args.d_type == DT_LNK) {
-      sprintf(name, "%s/%s", path_prefix, dent->d_name);
+      sprintf(name, "%s/%s", fui->d_path, dent->d_name);
       r = readlink(name, l_path, INBUFSIZE);
       sprintf(name, "->/%s", dent->d_name);
       f_args.name = name;
       f_args.path = l_path;
       fl_add(&d_start, &d_current, &f_args);
+      fui->files_num++;
     } else {
       /* Hide files with dot-beginnings */
       if (!strncmp(dent->d_name, ".", 1))
@@ -114,34 +120,45 @@ fs_fl_item_t *get_files_from_fs(char *path_prefix) {
       f_args.name = dent->d_name;
       sprintf(name, "%s", dent->d_name);
       fl_add(&f_start, &f_current, &f_args);
+      fui->files_num++;
     }
   }
   if (d_current != NULL)
     d_current->next = f_start;
   if (f_start != NULL)
     f_start->prev = d_current;
-  return d_start;
+
+  fui->start = d_start;
+  fui->page_start = d_start;
+  fui->current = d_start;
+  fui->cur_page = 1;
+  return 0;
 }
 
-void select_item(ui_fs_file_list_t *fui, cb_resp_data *resp_data) {
+void open_selected_item(ui_fs_file_list_t *fui, cb_resp_data *resp_data) {
   char *bash_case = NULL;
   char *selection = NULL;
   size_t dp_current;
+  char n_path[INBUFSIZE];
   if (fui->current->d_type == DT_DIR) {
     if (!strcmp("/..", fui->current->name)) {
-      bash_case = strrchr(fui->d_path, '/');
+      strcpy(n_path, fui->d_path);
+      bash_case = strrchr(n_path, '/');
       if (bash_case != NULL) {
         *bash_case = '\0';
-        fl_clear(&(fui->start), &(fui->current));
+        if (get_files_from_fs(fui, n_path)) {
-        fui->start = get_files_from_fs(fui->d_path);
+          alert("Can't open the folder!");
+          return;
+        }
       }
     } else {
       dp_current = strlen(fui->d_path);
       selection = fui->current->name + 1;
-      fui->d_path = realloc(fui->d_path, dp_current + strlen(selection) + 2);
+      sprintf(n_path, "%s/%s", fui->d_path, selection);
-      sprintf(fui->d_path, "%s/%s", fui->d_path, selection);
+      if (get_files_from_fs(fui, n_path)) {
-      fl_clear(&(fui->start), &(fui->current));
+        alert("Can't open the folder!");
-      fui->start = get_files_from_fs(fui->d_path);
+        return;
+      }
     }
     fui->current = fui->start;
     fui->current_idx = 0;
@@ -152,10 +169,11 @@ void select_item(ui_fs_file_list_t *fui, cb_resp_data *resp_data) {
     resp_data->val.type = val_num;
     resp_data->val.val.num = 1;
   } else if (fui->current->d_type == DT_LNK) {
-    fui->d_path = realloc(fui->d_path, strlen(fui->current->path) + 1);
+    strcpy(n_path, fui->current->path);
-    strcpy(fui->d_path, fui->current->path);
+    if (get_files_from_fs(fui, n_path)) {
-    fl_clear(&(fui->start), &(fui->current));
+      alert("Can't open the link!");
-    fui->start = get_files_from_fs(fui->d_path);
+      return;
+    }
     fui->current = fui->start;
     fui->current_idx = 0;
     resp_data->code = cbrc_none;
@@ -163,26 +181,72 @@ void select_item(ui_fs_file_list_t *fui, cb_resp_data *resp_data) {
   }
 }
 
+/* next page */
+void page_next(ui_fs_file_list_t *fui) {
+  int count = fui->rows_num;
+  fs_fl_item_t *n_page_item = fui->page_start;
+  if (fui->cur_page < fui->pages_num) {
+    for (; count; count--) {
+      n_page_item = n_page_item->next;
+    }
+    fui->cur_page++;
+    fui->page_start = n_page_item;
+    fui->current_idx = 0;
+    fui->current = n_page_item;
+  }
+  draw_fs_file_list(fui);
+}
+
+/* previous page */
+void page_previous(ui_fs_file_list_t *fui) {
+  int count = fui->rows_num;
+  fs_fl_item_t *n_page_item = fui->page_start;
+  if (fui->cur_page > 1) {
+    for (; count; count--) {
+      n_page_item = n_page_item->prev;
+    }
+    fui->cur_page--;
+    fui->page_start = n_page_item;
+    fui->current_idx = 0;
+    fui->current = n_page_item;
+  }
+  draw_fs_file_list(fui);
+}
+
 void fs_file_list_cb(callback_args_t *args) {
   ui_fs_file_list_t *fui = args->element;
   int32_t key = *((int32_t *)args->data);
   switch (key) {
   case KEY_DOWN:
     if (fui->current->next != NULL) {
-      fui->current = fui->current->next;
+      if (fui->current_idx < fui->rows_num - 1) {
-      fui->current_idx++;
+        fui->current = fui->current->next;
-      draw_fs_file_list(fui);
+        fui->current_idx++;
+        draw_fs_file_list(fui);
+      } else {
+        page_next(fui);
+      }
     }
     break;
   case KEY_UP:
     if (fui->current->prev != NULL) {
-      fui->current = fui->current->prev;
+      if (fui->current_idx > 0) {
-      fui->current_idx--;
+        fui->current = fui->current->prev;
-      draw_fs_file_list(fui);
+        fui->current_idx--;
+        draw_fs_file_list(fui);
+      } else {
+        page_previous(fui);
+      }
     }
     break;
+  case KEY_NPAGE:
+    page_next(fui);
+    break;
+  case KEY_PPAGE:
+    page_previous(fui);
+    break;
   case '\n':
-    select_item(fui, &(args->resp_data));
+    open_selected_item(fui, &(args->resp_data));
     break;
   }
 }
@@ -193,30 +257,36 @@ ui_fs_file_list_t *init_fs_file_list(WINDOW **win, widget_t *w_parent) {
   init_widget(&(fl_ui->w), w_parent, win, "");
   fl_ui->current_idx = 0;
   fl_ui->info_win = NULL;
-  fl_ui->d_path = get_current_dir_name();
+  fl_ui->d_path = NULL;
-  fl_ui->start = get_files_from_fs(fl_ui->d_path);
+  char *path = get_current_dir_name();
+  get_files_from_fs(fl_ui, path);
   fl_ui->current = fl_ui->start;
   fl_ui->w.callback = fs_file_list_cb;
   fl_ui->w.sz.x = getmaxx(win_par) / 10 * 8;
   fl_ui->w.sz.y = getmaxy(win_par) / 10 * 8;
+  fl_ui->rows_num = 0; /* detects on the first draw */
+  fl_ui->cur_page = 1;
   return fl_ui;
 }
 
 void reset_fs_file_list(ui_fs_file_list_t *fl_ui) { fl_ui->current_idx = 0; }
 
-void draw_fs_file_list(ui_fs_file_list_t *fl_ui) {
+void draw_fs_file_list(ui_fs_file_list_t *fui) {
   int32_t sz_y, sz_x;
   int32_t p_y, p_x;
-  WINDOW *win = *(fl_ui->w.parent_win);
+  WINDOW *win = *(fui->w.parent_win);
   getmaxyx(win, sz_y, sz_x);
   int32_t sz_y_f = sz_y - 2; // actual size (without box)
   int32_t sz_x_f = sz_x - 2; // actual size (without box)
+  fui->rows_num = sz_y_f;
+  fui->pages_num = fui->files_num / fui->rows_num +
+                   (fui->files_num % fui->rows_num > 0 ? 1 : 0);
   p_y = 1;
   p_x = 1;
-  fs_fl_item_t *el = fl_ui->start;
+  fs_fl_item_t *el = fui->page_start;
 
-  if (fl_ui->current_idx + 1 >= sz_y_f) {
+  if (fui->current_idx + 1 >= sz_y_f) {
-    p_y -= fl_ui->current_idx - sz_y_f + 2;
+    p_y -= fui->current_idx - sz_y_f + 2;
   }
 
   wattrset(win, A_REVERSE); /* Match with modal background */
@@ -225,13 +295,13 @@ void draw_fs_file_list(ui_fs_file_list_t *fl_ui) {
       p_y++;
       continue;
     }
-    if (el == fl_ui->current) {
+    if (el == fui->current) {
       wattrset(win, COLOR_PAIR(3) | A_BOLD | A_REVERSE);
     }
     p_x = 1;
     p_x += curs_printw(win, p_y, p_x, el->name);
     mvwprintw(win, p_y, p_x, "%*s", sz_x_f - p_x, "");
-    if (el == fl_ui->current) {
+    if (el == fui->current) {
       wattroff(win, COLOR_PAIR(3) | A_BOLD);
     }
     p_y++;

src/widget/fs_file_list.h

@@ -20,15 +20,20 @@ typedef struct {
     widget_t w;
     fs_fl_item_t *current;
     fs_fl_item_t *start;
+    fs_fl_item_t *page_start;
     int32_t current_idx;
+    int32_t rows_num;
+    int32_t cur_page;
+    int32_t pages_num;
+    size_t files_num;
     WINDOW *const* info_win;
     char *d_path;
 } ui_fs_file_list_t;
 
-void draw_fs_file_list(ui_fs_file_list_t *fl_ui);
+void               draw_fs_file_list(ui_fs_file_list_t *fl_ui);
-void redraw_fs_file_list(ui_fs_file_list_t *fl_ui);
+void               redraw_fs_file_list(ui_fs_file_list_t *fl_ui);
-void destroy_fs_file_list(ui_fs_file_list_t *fl_ui);
+void               destroy_fs_file_list(ui_fs_file_list_t *fl_ui);
+void               fs_file_list_cb(callback_args_t *args);
+void               reset_fs_file_list(ui_fs_file_list_t *fl_ui);
 ui_fs_file_list_t *init_fs_file_list(WINDOW **win, widget_t *w_parent);
-void fs_file_list_cb(callback_args_t *args);
-void reset_fs_file_list(ui_fs_file_list_t *fl_ui);
 #endif

src/widget/widget.h

@@ -17,4 +17,5 @@
 #include "input.h"
 #include "progress_bar.h"
 #include "checkbox.h"
+#include "alert.h"
 #endif