Changeset 97c3c59 in mainline for uspace/app/nav/panel.c

Timestamp:

2021-10-25T00:32:45Z (2 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5bbb4453

Parents:

01e9991

git-author:

Jiri Svoboda <jiri@…> (2021-10-19 19:48:40)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-10-25 00:32:45)

Message:

When moving up a dir, seek to the directory just exited

File:

• uspace/app/nav/panel.c (modified) (3 diffs)

uspace/app/nav/panel.c

@@ -519 +519 @@
         char *ndir = NULL;
         panel_entry_attr_t attr;
+        panel_entry_t *next;
+        panel_entry_t *prev;
+        char *olddn;
+        size_t pg_size;
+        size_t i;
         errno_t rc;
 
@@ -582 +587 @@
         panel->page = panel_first(panel);
         panel->page_idx = 0;
+
+        /* Moving up? */
+        if (str_cmp(dirname, "..") == 0) {
+                /* Get the last component of old path */
+                olddn = str_rchr(panel->dir, '/');
+                if (olddn != NULL && *olddn != '\0') {
+                        /* Find corresponding entry */
+                        ++olddn;
+                        next = panel_next(panel->cursor);
+                        while (next != NULL && str_cmp(next->name, olddn) <= 0 &&
+                            next->isdir) {
+                                panel->cursor = next;
+                                ++panel->cursor_idx;
+                                next = panel_next(panel->cursor);
+                        }
+
+                        /* Move page so that cursor is in the center */
+                        panel->page = panel->cursor;
+                        panel->page_idx = panel->cursor_idx;
+
+                        pg_size = panel_page_size(panel);
+
+                        for (i = 0; i < pg_size / 2; i++) {
+                                prev = panel_prev(panel->page);
+                                if (prev == NULL)
+                                        break;
+
+                                panel->page = prev;
+                                --panel->page_idx;
+                        }
+                }
+        }
+
         free(panel->dir);
         panel->dir = ndir;
+
         return EOK;
 error:
@@ -974 +1013 @@
 {
         gfx_context_t *gc = ui_window_get_gc(panel->window);
+        char *dirname;
         errno_t rc;
 
         assert(entry->isdir);
 
+        /*
+         * Need to copy out name before we free the entry below
+         * via panel_clear_entries().
+         */
+        dirname = str_dup(entry->name);
+        if (dirname == NULL)
+                return ENOMEM;
+
         panel_clear_entries(panel);
 
-        rc = panel_read_dir(panel, entry->name);
-        if (rc != EOK)
-                return rc;
+        rc = panel_read_dir(panel, dirname);
+        if (rc != EOK) {
+                free(dirname);
+                return rc;
+        }
+
+        free(dirname);
 
         rc = panel_paint(panel);