Changes in uspace/app/nav/nav.c [b336bfd8:54ddb59] in mainline

File:

• uspace/app/nav/nav.c (modified) (7 diffs)

uspace/app/nav/nav.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <stdlib.h>
 #include <str.h>
-#include <task.h>
 #include <ui/fixed.h>
 #include <ui/filelist.h>
@@ -49 +48 @@
 #include "panel.h"
 
-#define EDITOR_CMD "/app/edit"
-
 static void wnd_close(ui_window_t *, void *);
 static void wnd_kbd(ui_window_t *, void *, kbd_event_t *);
@@ -60 +57 @@
 
 static void navigator_file_open(void *);
-static void navigator_file_edit(void *);
 static void navigator_file_exit(void *);
 
 static nav_menu_cb_t navigator_menu_cb = {
         .file_open = navigator_file_open,
-        .file_edit = navigator_file_edit,
         .file_exit = navigator_file_exit
 };
 
 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,
-        .file_open = navigator_panel_file_open
+        .activate_req = navigator_panel_activate_req
 };
 
@@ -104 +97 @@
             (event->mods & KM_CTRL) != 0) {
                 switch (event->key) {
-                case KC_E:
-                        navigator_file_edit((void *)navigator);
-                        break;
                 case KC_Q:
                         ui_quit(navigator->ui);
@@ -328 +318 @@
 }
 
-/** Open file in text editor.
- *
- * @param navigator Navigator
- * @param fname File name
- *
- * @return EOK on success or an error code
- */
-static errno_t navigator_edit_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, EDITOR_CMD, EDITOR_CMD, 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;
-}
-
-/** 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)
-{
-        navigator_t *navigator = (navigator_t *)arg;
-        ui_file_list_entry_t *entry;
-        ui_file_list_entry_attr_t attr;
-        panel_t *panel;
-
-        panel = navigator_get_active_panel(navigator);
-        entry = ui_file_list_get_cursor(panel->flist);
-        ui_file_list_entry_get_attr(entry, &attr);
-
-        (void)navigator_edit_file(navigator, attr.name);
-}
-
 /** File / Exit menu entry selected */
 static void navigator_file_exit(void *arg)
@@ -468 +339 @@
 }
 
-/** 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);
-}
-
 /** @}
  */