Changeset fa792e8 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:

4fcc2de

Parents:

1eb0fafe

git-author:

Jiri Svoboda <jiri@…> (2021-10-15 16:58:28)

git-committer:

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

Message:

Highlight directories and sort them first

File:

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

uspace/app/nav/panel.c

@@ -44 +44 @@
 #include <ui/paint.h>
 #include <ui/resource.h>
+#include <vfs/vfs.h>
 #include <qsort.h>
 #include "panel.h"
@@ -93 +94 @@
 
         rc = gfx_color_new_ega(0x0f, &panel->act_border_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_ega(0x0f, &panel->dir_color);
         if (rc != EOK)
                 goto error;
@@ -107 +112 @@
         if (panel->curs_color != NULL)
                 gfx_color_delete(panel->curs_color);
+        if (panel->act_border_color != NULL)
+                gfx_color_delete(panel->act_border_color);
+        if (panel->dir_color != NULL)
+                gfx_color_delete(panel->dir_color);
         ui_control_delete(panel->control);
         free(panel);
@@ -121 +130 @@
         gfx_color_delete(panel->curs_color);
         gfx_color_delete(panel->act_border_color);
+        gfx_color_delete(panel->dir_color);
         panel_clear_entries(panel);
         ui_control_delete(panel->control);
@@ -157 +167 @@
         if (entry == panel->cursor && panel->active)
                 fmt.color = panel->curs_color;
+        else if (entry->isdir)
+                fmt.color = panel->dir_color;
         else
                 fmt.color = panel->color;
@@ -402 +414 @@
  * @param panel Panel
  * @param name File name
- * @param size File size;
+ * @param size File size
+ * @param isdir @c true iff the entry is a directory
  * @return EOK on success or an error code
  */
-errno_t panel_entry_append(panel_t *panel, const char *name, uint64_t size)
+errno_t panel_entry_append(panel_t *panel, const char *name, uint64_t size,
+    bool isdir)
 {
         panel_entry_t *entry;
@@ -421 +435 @@
 
         entry->size = size;
+        entry->isdir = isdir;
         link_initialize(&entry->lentries);
         list_append(&entry->lentries, &panel->entries);
@@ -469 +484 @@
         DIR *dir;
         struct dirent *dirent;
+        vfs_stat_t finfo;
         errno_t rc;
 
@@ -477 +493 @@
         dirent = readdir(dir);
         while (dirent != NULL) {
-                rc = panel_entry_append(panel, dirent->d_name, 1);
+                rc = vfs_stat_path(dirent->d_name, &finfo);
                 if (rc != EOK)
                         goto error;
+
+                rc = panel_entry_append(panel, dirent->d_name, 1,
+                    finfo.is_directory);
+                if (rc != EOK)
+                        goto error;
+
                 dirent = readdir(dir);
         }
@@ -553 +575 @@
         panel_entry_t *a = *(panel_entry_t **)pa;
         panel_entry_t *b = *(panel_entry_t **)pb;
+        int dcmp;
+
+        /* Sort directories first */
+        dcmp = b->isdir - a->isdir;
+        if (dcmp != 0)
+                return dcmp;
 
         return str_cmp(a->name, b->name);