Changeset b336bfd8 in mainline

Timestamp:

2025-02-06T20:42:14Z (6 days ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

a7a16a2f

Parents:

accdf882

Message:

Start text editor if open action is used on .txt file.

Location:

uspace/app/nav

Files:

• nav.c (modified) (4 diffs)
• panel.c (modified) (3 diffs)
• types/panel.h (modified) (2 diffs)

uspace/app/nav/nav.c

@@ -70 +70 @@
 
 static void navigator_panel_activate_req(void *, panel_t *);
+static void navigator_panel_file_open(void *, panel_t *, const char *);
 
 static panel_cb_t navigator_panel_cb = {
-        .activate_req = navigator_panel_activate_req
+        .activate_req = navigator_panel_activate_req,
+        .file_open = navigator_panel_file_open
 };
 
@@ -328 +330 @@
 /** Open file in text editor.
  *
- * @param panel Panel
+ * @param navigator Navigator
  * @param fname File name
  *
@@ -367 +369 @@
 }
 
+/** Execute file entry.
+ *
+ * @param navigator Navigator
+ * @param fname File name
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t navigator_exec_file(navigator_t *navigator, const char *fname)
+{
+        task_id_t id;
+        task_wait_t wait;
+        task_exit_t texit;
+        int retval;
+        errno_t rc;
+
+        /* Free up and clean console for the child task. */
+        rc = ui_suspend(navigator->ui);
+        if (rc != EOK)
+                return rc;
+
+        rc = task_spawnl(&id, &wait, fname, fname, NULL);
+        if (rc != EOK)
+                goto error;
+
+        rc = task_wait(&wait, &texit, &retval);
+        if ((rc != EOK) || (texit != TASK_EXIT_NORMAL))
+                goto error;
+
+        /* Resume UI operation */
+        rc = ui_resume(navigator->ui);
+        if (rc != EOK)
+                return rc;
+
+        (void) ui_paint(navigator->ui);
+        return EOK;
+error:
+        (void) ui_resume(navigator->ui);
+        (void) ui_paint(navigator->ui);
+        return rc;
+}
+
+/** Open panel file entry.
+ *
+ * Perform Open action on a file entry (based on extension).
+ *
+ * @param navigator Navigator
+ * @param fname File name
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t navigator_open_file(navigator_t *navigator, const char *fname)
+{
+        const char *ext;
+
+        ext = str_rchr(fname, '.');
+        if (ext != NULL) {
+                if (str_casecmp(ext, ".txt") == 0)
+                        return navigator_edit_file(navigator, fname);
+        }
+
+        return navigator_exec_file(navigator, fname);
+}
+
 /** File / Edit menu entry selected */
 static void navigator_file_edit(void *arg)
@@ -403 +468 @@
 }
 
+/** Panel callback requesting file open.
+ *
+ * @param arg Argument (navigator_t *)
+ * @param panel Panel
+ * @param fname File name
+ */
+void navigator_panel_file_open(void *arg, panel_t *panel, const char *fname)
+{
+        navigator_t *navigator = (navigator_t *)arg;
+
+        (void)panel;
+        navigator_open_file(navigator, fname);
+}
+
 /** @}
  */

uspace/app/nav/panel.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -377 +377 @@
 }
 
-/** Open panel file entry.
- *
- * Perform Open action on a file entry (i.e. try running it).
- *
- * @param panel Panel
- * @param fname File name
- *
- * @return EOK on success or an error code
- */
-static errno_t panel_open_file(panel_t *panel, const char *fname)
-{
-        task_id_t id;
-        task_wait_t wait;
-        task_exit_t texit;
-        int retval;
-        errno_t rc;
-        ui_t *ui;
-
-        ui = ui_window_get_ui(panel->window);
-
-        /* Free up and clean console for the child task. */
-        rc = ui_suspend(ui);
-        if (rc != EOK)
-                return rc;
-
-        rc = task_spawnl(&id, &wait, fname, fname, NULL);
-        if (rc != EOK)
-                goto error;
-
-        rc = task_wait(&wait, &texit, &retval);
-        if ((rc != EOK) || (texit != TASK_EXIT_NORMAL))
-                goto error;
-
-        /* Resume UI operation */
-        rc = ui_resume(ui);
-        if (rc != EOK)
-                return rc;
-
-        (void) ui_paint(ui_window_get_ui(panel->window));
-        return EOK;
-error:
-        (void) ui_resume(ui);
-        (void) ui_paint(ui_window_get_ui(panel->window));
-        return rc;
-}
-
 /** File list in panel requests activation.
  *
@@ -446 +400 @@
         panel_t *panel = (panel_t *)arg;
 
-        (void) panel_open_file(panel, fname);
+        if (panel->cb != NULL && panel->cb->file_open != NULL)
+                panel->cb->file_open(panel->cb_arg, panel, fname);
 }
 

uspace/app/nav/types/panel.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -80 +80 @@
         /** Request panel activation */
         void (*activate_req)(void *, panel_t *);
+        /** Open file */
+        void (*file_open)(void *, panel_t *, const char *);
 } panel_cb_t;