Changeset aefdccd in mainline for uspace/app/nav

Timestamp:

2025-10-20T06:14:54Z (5 months ago)

Author:

GitHub <noreply@…>

Parents:

adbd7e1 (diff), 3e41cc4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2025-10-20 06:14:54)

git-committer:

GitHub <noreply@…> (2025-10-20 06:14:54)

Message:

Merge branch 'HelenOS:master' into ticket/packet-capture

Location:

uspace/app/nav

Files:

• dlg/ioerrdlg.c (added)
• dlg/ioerrdlg.h (added)
• dlg/newfiledlg.c (added)
• dlg/newfiledlg.h (added)
• dlg/progress.c (added)
• dlg/progress.h (added)
• menu.c (modified) (3 diffs)
• menu.h (modified) (1 diff)
• meson.build (modified) (2 diffs)
• nav.c (modified) (11 diffs)
• nav.h (modified) (3 diffs)
• newfile.c (added)
• newfile.h (added)
• panel.c (modified) (1 diff)
• panel.h (modified) (2 diffs)
• types/dlg/ioerrdlg.h (added)
• types/dlg/newfiledlg.h (added)
• types/dlg/progress.h (added)
• types/menu.h (modified) (1 diff)
• types/nav.h (modified) (3 diffs)
• types/newfile.h (added)

uspace/app/nav/menu.c

@@ -54 +54 @@
         nav_menu_t *menu;
         ui_menu_t *mfile;
+        ui_menu_entry_t *mnew;
         ui_menu_entry_t *mopen;
         ui_menu_entry_t *medit;
@@ -78 +79 @@
                 goto error;
 
+        rc = ui_menu_entry_create(mfile, "~N~ew File", "Ctrl-M", &mnew);
+        if (rc != EOK)
+                goto error;
+
+        ui_menu_entry_set_cb(mnew, nav_menu_file_new_file, (void *) menu);
+
         rc = ui_menu_entry_create(mfile, "~O~pen", "Enter", &mopen);
         if (rc != EOK)
@@ -148 +155 @@
 }
 
+/** File / New File menu entry selected.
+ *
+ * @param mentry Menu entry
+ * @param arg Argument (navigator_t *)
+ */
+void nav_menu_file_new_file(ui_menu_entry_t *mentry, void *arg)
+{
+        nav_menu_t *menu = (nav_menu_t *)arg;
+
+        if (menu->cb != NULL && menu->cb->file_new_file != NULL)
+                menu->cb->file_new_file(menu->cb_arg);
+}
+
 /** File / Open menu entry selected.
  *

uspace/app/nav/menu.h

@@ -46 +46 @@
 extern void nav_menu_destroy(nav_menu_t *);
 extern ui_control_t *nav_menu_ctl(nav_menu_t *);
+extern void nav_menu_file_new_file(ui_menu_entry_t *, void *);
 extern void nav_menu_file_open(ui_menu_entry_t *, void *);
 extern void nav_menu_file_edit(ui_menu_entry_t *, void *);

uspace/app/nav/meson.build

@@ -1 +1 @@
 #
-# Copyright (c) 2021 Jiri Svoboda
+# Copyright (c) 2025 Jiri Svoboda
 # All rights reserved.
 #
@@ -27 +27 @@
 #
 
-deps = [ 'ui' ]
+deps = [ 'fmgt', 'ui' ]
 src = files(
+        'dlg/ioerrdlg.c',
+        'dlg/newfiledlg.c',
+        'dlg/progress.c',
         'main.c',
         'menu.c',
         'nav.c',
+        'newfile.c',
         'panel.c',
 )
 
 test_src = files(
+        'dlg/ioerrdlg.c',
+        'dlg/newfiledlg.c',
+        'dlg/progress.c',
         'menu.c',
         'nav.c',
+        'newfile.c',
         'panel.c',
         'test/main.c',

uspace/app/nav/nav.c

@@ -35 +35 @@
  */
 
+#include <fibril.h>
+#include <fmgt.h>
 #include <gfx/coord.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <str.h>
+#include <str_error.h>
 #include <task.h>
 #include <ui/fixed.h>
@@ -45 +48 @@
 #include <ui/ui.h>
 #include <ui/window.h>
+#include "dlg/ioerrdlg.h"
 #include "menu.h"
+#include "newfile.h"
 #include "nav.h"
 #include "panel.h"
@@ -59 +64 @@
 };
 
+static void navigator_file_new_file(void *);
 static void navigator_file_open(void *);
 static void navigator_file_edit(void *);
@@ -64 +70 @@
 
 static nav_menu_cb_t navigator_menu_cb = {
+        .file_new_file = navigator_file_new_file,
         .file_open = navigator_file_open,
         .file_edit = navigator_file_edit,
@@ -75 +82 @@
         .activate_req = navigator_panel_activate_req,
         .file_open = navigator_panel_file_open
+};
+
+static void navigator_progress_babort(progress_dlg_t *, void *);
+static void navigator_progress_close(progress_dlg_t *, void *);
+
+progress_dlg_cb_t navigator_progress_cb = {
+        .babort = navigator_progress_babort,
+        .close = navigator_progress_close
+};
+
+static void navigator_io_err_abort(io_err_dlg_t *, void *);
+static void navigator_io_err_retry(io_err_dlg_t *, void *);
+static void navigator_io_err_close(io_err_dlg_t *, void *);
+
+static io_err_dlg_cb_t navigator_io_err_dlg_cb = {
+        .babort = navigator_io_err_abort,
+        .bretry = navigator_io_err_retry,
+        .close = navigator_io_err_close
 };
 
@@ -104 +129 @@
             (event->mods & KM_CTRL) != 0) {
                 switch (event->key) {
+                case KC_M:
+                        navigator_new_file_dlg(navigator);
+                        break;
                 case KC_E:
                         navigator_file_edit((void *)navigator);
@@ -228 +256 @@
                 goto error;
         }
+
+        fibril_mutex_initialize(&navigator->io_err_act_lock);
+        fibril_condvar_initialize(&navigator->io_err_act_cv);
+        navigator->io_err_act_sel = false;
 
         *rnavigator = navigator;
@@ -318 +350 @@
 }
 
+/** Refresh navigator panels.
+ *
+ * This needs to be called when the disk/directory contents might have
+ * changed.
+ *
+ * @param navigator Navigator
+ */
+void navigator_refresh_panels(navigator_t *navigator)
+{
+        errno_t rc;
+        unsigned i;
+
+        /* First refresh inactive panel. */
+
+        for (i = 0; i < 2; i++) {
+                if (!panel_is_active(navigator->panel[i])) {
+                        rc = panel_refresh(navigator->panel[i]);
+                        if (rc != EOK)
+                                return;
+                }
+        }
+
+        /*
+         * Refresh active panel last so that working directory is left
+         * to that of the active panel.
+         */
+
+        for (i = 0; i < 2; i++) {
+                if (panel_is_active(navigator->panel[i])) {
+                        rc = panel_refresh(navigator->panel[i]);
+                        if (rc != EOK)
+                                return;
+                }
+        }
+}
+
+/** File / New File menu entry selected */
+static void navigator_file_new_file(void *arg)
+{
+        navigator_t *navigator = (navigator_t *)arg;
+
+        navigator_new_file_dlg(navigator);
+}
+
 /** File / Open menu entry selected */
 static void navigator_file_open(void *arg)
@@ -361 +437 @@
                 return rc;
 
+        navigator_refresh_panels(navigator);
         (void) ui_paint(navigator->ui);
         return EOK;
@@ -402 +479 @@
                 return rc;
 
+        navigator_refresh_panels(navigator);
+
         (void) ui_paint(navigator->ui);
         return EOK;
@@ -482 +561 @@
 }
 
+/** Wrapper fibril function for worker function.
+ *
+ * This is the main fibril function for the worker fibril. It executes
+ * the worker function, then clears worker FID to indicate the worker
+ * is finished.
+ *
+ * @param arg Argument (navigator_worker_job_t *)
+ * @return EOK
+ */
+static errno_t navigator_worker_func(void *arg)
+{
+        navigator_worker_job_t *job = (navigator_worker_job_t *)arg;
+
+        job->wfunc(job->arg);
+        job->navigator->worker_fid = 0;
+        free(job);
+        return EOK;
+}
+
+/** Start long-time work in a worker fibril.
+ *
+ * Actions which can take time (file operations) cannot block the main UI
+ * fibril. This function will start an action in the worker fibril, i.e.,
+ * in the background. At the same time the caller should create a modal
+ * progress dialog that will be shown until the work is completed.
+ *
+ * (Only a single worker can execute at any given time).
+ *
+ * @param nav Navigator
+ * @param wfunc Worker main function
+ * @param arg Argument to worker function
+ *
+ * @return EOK on success or an error code
+ */
+errno_t navigator_worker_start(navigator_t *nav, void (*wfunc)(void *),
+    void *arg)
+{
+        navigator_worker_job_t *job;
+
+        if (nav->worker_fid != 0)
+                return EBUSY;
+
+        job = calloc(1, sizeof(navigator_worker_job_t));
+        if (job == NULL)
+                return ENOMEM;
+
+        job->navigator = nav;
+        job->wfunc = wfunc;
+        job->arg = arg;
+
+        nav->worker_fid = fibril_create(navigator_worker_func, (void *)job);
+        if (nav->worker_fid == 0) {
+                free(job);
+                return ENOMEM;
+        }
+
+        fibril_add_ready(nav->worker_fid);
+        return EOK;
+}
+
+/** Abort button pressed in progress dialog.
+ *
+ * @param dlg Progress dialog
+ * @param arg Argument (navigator_t *)
+ */
+static void navigator_progress_babort(progress_dlg_t *dlg, void *arg)
+{
+        navigator_t *nav = (navigator_t *)arg;
+
+        (void)dlg;
+        nav->abort_op = true;
+}
+
+/** Progress dialog closed,
+ *
+ * @param dlg Progress dialog
+ * @param arg Argument (navigator_t *)
+ */
+static void navigator_progress_close(progress_dlg_t *dlg, void *arg)
+{
+        navigator_t *nav = (navigator_t *)arg;
+
+        (void)dlg;
+        nav->abort_op = true;
+}
+
+/** Called by fmgt to query for I/O error recovery action.
+ *
+ * @param arg Argument (navigator_t *)
+ * @param err I/O error report
+ * @return Recovery action to take.
+ */
+fmgt_error_action_t navigator_io_error_query(void *arg, fmgt_io_error_t *err)
+{
+        navigator_t *nav = (navigator_t *)arg;
+        io_err_dlg_t *dlg;
+        io_err_dlg_params_t params;
+        fmgt_error_action_t err_act;
+        char *text1;
+        errno_t rc;
+        int rv;
+
+        io_err_dlg_params_init(&params);
+        rv = asprintf(&text1, err->optype == fmgt_io_write ?
+            "Error writing file %s." : "Error reading file %s.",
+            err->fname);
+        if (rv < 0)
+                return fmgt_er_abort;
+
+        params.text1 = text1;
+        params.text2 = str_error(err->rc);
+
+        ui_lock(nav->ui);
+        rc = io_err_dlg_create(nav->ui, &params, &dlg);
+        if (rc != EOK) {
+                ui_unlock(nav->ui);
+                free(text1);
+                return fmgt_er_abort;
+        }
+
+        io_err_dlg_set_cb(dlg, &navigator_io_err_dlg_cb, (void *)nav);
+
+        ui_unlock(nav->ui);
+        free(text1);
+
+        fibril_mutex_lock(&nav->io_err_act_lock);
+
+        while (!nav->io_err_act_sel) {
+                fibril_condvar_wait(&nav->io_err_act_cv,
+                    &nav->io_err_act_lock);
+        }
+
+        err_act = nav->io_err_act;
+        nav->io_err_act_sel = false;
+        fibril_mutex_unlock(&nav->io_err_act_lock);
+
+        return err_act;
+}
+
+/** I/O error dialog abort button was pressed.
+ *
+ * @param dlg I/O error dialog
+ * @param arg Argument (navigator_t *)
+ */
+static void navigator_io_err_abort(io_err_dlg_t *dlg, void *arg)
+{
+        navigator_t *nav = (navigator_t *)arg;
+
+        io_err_dlg_destroy(dlg);
+
+        fibril_mutex_lock(&nav->io_err_act_lock);
+        nav->io_err_act = fmgt_er_abort;
+        nav->io_err_act_sel = true;
+        fibril_condvar_signal(&nav->io_err_act_cv);
+        fibril_mutex_unlock(&nav->io_err_act_lock);
+}
+
+/** I/O error dialog retry button was pressed.
+ *
+ * @param dlg I/O error dialog
+ * @param arg Argument (navigator_t *)
+ */
+static void navigator_io_err_retry(io_err_dlg_t *dlg, void *arg)
+{
+        navigator_t *nav = (navigator_t *)arg;
+
+        io_err_dlg_destroy(dlg);
+
+        fibril_mutex_lock(&nav->io_err_act_lock);
+        nav->io_err_act = fmgt_er_retry;
+        nav->io_err_act_sel = true;
+        fibril_condvar_signal(&nav->io_err_act_cv);
+        fibril_mutex_unlock(&nav->io_err_act_lock);
+}
+
+/** I/O error dialog closure requested.
+ *
+ * @param dlg I/O error dialog
+ * @param arg Argument (navigator_t *)
+ */
+static void navigator_io_err_close(io_err_dlg_t *dlg, void *arg)
+{
+        navigator_t *nav = (navigator_t *)arg;
+
+        io_err_dlg_destroy(dlg);
+
+        fibril_mutex_lock(&nav->io_err_act_lock);
+        nav->io_err_act = fmgt_er_abort;
+        nav->io_err_act_sel = true;
+        fibril_condvar_signal(&nav->io_err_act_cv);
+        fibril_mutex_unlock(&nav->io_err_act_lock);
+}
+
 /** @}
  */

uspace/app/nav/nav.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -38 +38 @@
 
 #include <errno.h>
+#include <fmgt.h>
+#include "types/dlg/progress.h"
 #include "types/nav.h"
 #include "types/panel.h"
+
+extern progress_dlg_cb_t navigator_progress_cb;
 
 extern errno_t navigator_create(const char *, navigator_t **);
@@ -46 +50 @@
 extern panel_t *navigator_get_active_panel(navigator_t *);
 extern void navigator_switch_panel(navigator_t *);
+extern void navigator_refresh_panels(navigator_t *);
+extern errno_t navigator_worker_start(navigator_t *, void (*)(void *),
+    void *);
+extern fmgt_error_action_t navigator_io_error_query(void *, fmgt_io_error_t *);
 
 #endif

uspace/app/nav/panel.c

@@ -365 +365 @@
 }
 
+/** Refresh panel contents.
+ *
+ * @param panel Panel
+ * @return EOK on success or an error code
+ */
+errno_t panel_refresh(panel_t *panel)
+{
+        errno_t rc;
+
+        rc = ui_file_list_refresh(panel->flist);
+        if (rc != EOK)
+                return rc;
+
+        return panel_paint(panel);
+}
+
 /** Request panel activation.
  *

uspace/app/nav/panel.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -58 +58 @@
 extern void panel_deactivate(panel_t *);
 extern errno_t panel_read_dir(panel_t *, const char *);
+extern errno_t panel_refresh(panel_t *);
 extern void panel_activate_req(panel_t *);
 

uspace/app/nav/types/menu.h

@@ -43 +43 @@
 /** Navigator menu callbacks */
 typedef struct nav_menu_cb {
+        /** File / New File */
+        void (*file_new_file)(void *);
         /** File / Open */
         void (*file_open)(void *);

uspace/app/nav/types/nav.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #define TYPES_NAV_H
 
+#include <fibril.h>
+#include <fmgt.h>
+#include <stdbool.h>
 #include <ui/fixed.h>
 #include <ui/ui.h>
@@ -57 +60 @@
         /** Panels */
         struct panel *panel[navigator_panels];
+        /** Progress dialog */
+        struct progress_dlg *progress_dlg;
+        /** Worker fibril ID */
+        fid_t worker_fid;
+        /** Abort current file management operation */
+        bool abort_op;
+
+        /** @c true if user selected I/O error recovery action */
+        bool io_err_act_sel;
+        /** Selected I/O error recovery action */
+        fmgt_error_action_t io_err_act;
+        /** Signalled when user selects I/O error recovery action */
+        fibril_condvar_t io_err_act_cv;
+        /** Synchronizes access to I/O error recovery action */
+        fibril_mutex_t io_err_act_lock;
 } navigator_t;
+
+/** Navigator worker job */
+typedef struct {
+        /** Navigator */
+        navigator_t *navigator;
+        /** Worker function */
+        void (*wfunc)(void *);
+        /** Worker argument */
+        void *arg;
+} navigator_worker_job_t;
 
 #endif