Changeset 7aeb52cb in mainline for uspace/app/nav/panel.c

Timestamp:

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

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

01e9991

Parents:

f783081

git-author:

Jiri Svoboda <jiri@…> (2021-10-16 21:51:33)

git-committer:

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

Message:

Different color for service-special files

File:

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

uspace/app/nav/panel.c

@@ -98 +98 @@
 
         rc = gfx_color_new_ega(0x0f, &panel->dir_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_ega(0x0a, &panel->svc_color);
         if (rc != EOK)
                 goto error;
@@ -116 +120 @@
         if (panel->dir_color != NULL)
                 gfx_color_delete(panel->dir_color);
+        if (panel->svc_color != NULL)
+                gfx_color_delete(panel->svc_color);
         ui_control_delete(panel->control);
         free(panel);
@@ -131 +137 @@
         gfx_color_delete(panel->act_border_color);
         gfx_color_delete(panel->dir_color);
+        gfx_color_delete(panel->svc_color);
         panel_clear_entries(panel);
         ui_control_delete(panel->control);
@@ -169 +176 @@
         else if (entry->isdir)
                 fmt.color = panel->dir_color;
+        else if (entry->svc != 0)
+                fmt.color = panel->svc_color;
         else
                 fmt.color = panel->color;
@@ -375 +384 @@
 }
 
+/** Initialize panel entry attributes.
+ *
+ * @param attr Attributes
+ */
+void panel_entry_attr_init(panel_entry_attr_t *attr)
+{
+        memset(attr, 0, sizeof(*attr));
+}
+
 /** Destroy panel control.
  *
@@ -427 +445 @@
  *
  * @param panel Panel
- * @param name File name
- * @param size File size
- * @param isdir @c true iff the entry is a directory
+ * @param attr Entry attributes
  * @return EOK on success or an error code
  */
-errno_t panel_entry_append(panel_t *panel, const char *name, uint64_t size,
-    bool isdir)
+errno_t panel_entry_append(panel_t *panel, panel_entry_attr_t *attr)
 {
         panel_entry_t *entry;
@@ -442 +457 @@
 
         entry->panel = panel;
-        entry->name = str_dup(name);
+        entry->name = str_dup(attr->name);
         if (entry->name == NULL) {
                 free(entry);
@@ -448 +463 @@
         }
 
-        entry->size = size;
-        entry->isdir = isdir;
+        entry->size = attr->size;
+        entry->isdir = attr->isdir;
+        entry->svc = attr->svc;
         link_initialize(&entry->lentries);
         list_append(&entry->lentries, &panel->entries);
@@ -469 +485 @@
         list_remove(&entry->lentries);
         --entry->panel->entries_cnt;
-        free(entry->name);
+        free((char *) entry->name);
         free(entry);
 }
@@ -501 +517 @@
         char newdir[256];
         char *ndir = NULL;
+        panel_entry_attr_t attr;
         errno_t rc;
 
@@ -523 +540 @@
         if (str_cmp(ndir, "/") != 0) {
                 /* Need to add a synthetic up-dir entry */
-                rc = panel_entry_append(panel, "..", 0, true);
+                panel_entry_attr_init(&attr);
+                attr.name = "..";
+                attr.isdir = true;
+
+                rc = panel_entry_append(panel, &attr);
                 if (rc != EOK)
                         goto error;
@@ -537 +558 @@
                 }
 
-                rc = panel_entry_append(panel, dirent->d_name, finfo.size,
-                    finfo.is_directory);
+                panel_entry_attr_init(&attr);
+                attr.name = dirent->d_name;
+                attr.size = finfo.size;
+                attr.isdir = finfo.is_directory;
+                attr.svc = finfo.service;
+
+                rc = panel_entry_append(panel, &attr);
                 if (rc != EOK)
                         goto error;