Changeset c3db721 in mainline for uspace/app/nav

Timestamp:

2025-10-10T20:35:05Z (3 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

c1383cd

Parents:

0cf3d5f

Message:

Allow aborting file management operation.

Location:

uspace/app/nav

Files:

• nav.c (modified) (2 diffs)
• nav.h (modified) (1 diff)
• newfile.c (modified) (4 diffs)
• types/nav.h (modified) (2 diffs)

uspace/app/nav/nav.c

@@ -79 +79 @@
         .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
 };
 
@@ -596 +604 @@
 }
 
+/** 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;
+}
+
 /** @}
  */

uspace/app/nav/nav.h

@@ -38 +38 @@
 
 #include <errno.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 **);

uspace/app/nav/newfile.c

@@ -64 +64 @@
 };
 
+static bool new_file_abort_query(void *);
 static void new_file_progress(void *, fmgt_progress_t *);
 
 static fmgt_cb_t new_file_fmgt_cb = {
-        .progress = new_file_progress
+        .abort_query = new_file_abort_query,
+        .progress = new_file_progress,
 };
 
@@ -124 +126 @@
         return;
 error:
+        fmgt_destroy(fmgt);
         ui_lock(nav->ui);
         progress_dlg_destroy(nav->progress_dlg);
+        navigator_refresh_panels(nav);
         ui_msg_dialog_params_init(&params);
         params.caption = "Error";
@@ -192 +196 @@
         }
 
+        progress_dlg_set_cb(nav->progress_dlg, &navigator_progress_cb,
+            (void *)nav);
+
         rc = navigator_worker_start(nav, new_file_wfunc, (void *)job);
         if (rc != EOK) {
@@ -231 +238 @@
 }
 
+/** New file abort query.
+ *
+ * @param arg Argument (navigator_t *)
+ * @return @c true iff abort is requested
+ */
+static bool new_file_abort_query(void *arg)
+{
+        navigator_t *nav = (navigator_t *)arg;
+
+        return nav->abort_op;
+}
+
 /** New file progress update.
  *

uspace/app/nav/types/nav.h

@@ -38 +38 @@
 
 #include <fibril.h>
+#include <stdbool.h>
 #include <ui/fixed.h>
 #include <ui/ui.h>
@@ -62 +63 @@
         /** Worker fibril ID */
         fid_t worker_fid;
+        /** Abort current file management operation */
+        bool abort_op;
 } navigator_t;