Changeset 0e80e40 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:

9f7e9bb

Parents:

61784ed

git-author:

Jiri Svoboda <jiri@…> (2021-10-07 17:17:36)

git-committer:

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

Message:

Read and display directory contents

File:

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

uspace/app/nav/panel.c

@@ -35 +35 @@
  */
 
+#include <dirent.h>
 #include <errno.h>
 #include <gfx/render.h>
+#include <gfx/text.h>
 #include <stdlib.h>
 #include <str.h>
 #include <ui/control.h>
 #include <ui/paint.h>
+#include <ui/resource.h>
 #include "panel.h"
 #include "nav.h"
@@ -81 +84 @@
                 goto error;
 
+        rc = gfx_color_new_ega(0x30, &panel->curs_color);
+        if (rc != EOK)
+                goto error;
+
         panel->window = window;
         list_initialize(&panel->entries);
@@ -86 +93 @@
         return EOK;
 error:
+        if (panel->color != NULL)
+                gfx_color_delete(panel->color);
+        if (panel->curs_color != NULL)
+                gfx_color_delete(panel->curs_color);
         ui_control_delete(panel->control);
         free(panel);
@@ -97 +108 @@
 void panel_destroy(panel_t *panel)
 {
-        panel_entry_t *entry;
-
-        entry = panel_first(panel);
-        while (entry != NULL) {
-                panel_entry_delete(entry);
-                entry = panel_first(panel);
-        }
-
+        gfx_color_delete(panel->color);
+        gfx_color_delete(panel->curs_color);
+        panel_clear_entries(panel);
         ui_control_delete(panel->control);
         free(panel);
@@ -117 +123 @@
         gfx_context_t *gc = ui_window_get_gc(panel->window);
         ui_resource_t *res = ui_window_get_res(panel->window);
+        gfx_font_t *font = ui_resource_get_font(res);
+        gfx_text_fmt_t fmt;
+        panel_entry_t *entry;
+        gfx_coord2_t pos;
+        gfx_rect_t rect;
         errno_t rc;
+
+        gfx_text_fmt_init(&fmt);
 
         rc = gfx_set_color(gc, panel->color);
@@ -131 +144 @@
         if (rc != EOK)
                 return rc;
+
+        pos.x = panel->rect.p0.x + 1;
+        pos.y = panel->rect.p0.y + 1;
+
+        entry = panel->page;
+        while (entry != NULL && pos.y < panel->rect.p1.y - 1) {
+                if (entry == panel->cursor) {
+                        /* Draw cursor background */
+                        rect.p0 = pos;
+                        rect.p1.x = panel->rect.p1.x - 1;
+                        rect.p1.y = rect.p0.y + 1;
+
+                        rc = gfx_set_color(gc, panel->curs_color);
+                        if (rc != EOK)
+                                return rc;
+
+                        rc = gfx_fill_rect(gc, &rect);
+                        if (rc != EOK)
+                                return rc;
+
+                        fmt.color = panel->curs_color;
+                } else {
+                        fmt.color = panel->color;
+                }
+
+                rc = gfx_puttext(font, &pos, &fmt, entry->name);
+                if (rc != EOK)
+                        return rc;
+
+                pos.y++;
+                entry = panel_next(entry);
+        }
 
         rc = gfx_update(gc);
@@ -240 +285 @@
 void panel_entry_delete(panel_entry_t *entry)
 {
+        if (entry->panel->cursor == entry)
+                entry->panel->cursor = NULL;
+        if (entry->panel->page == entry)
+                entry->panel->page = NULL;
+
         list_remove(&entry->lentries);
         free(entry->name);
@@ -245 +295 @@
 }
 
+/** Clear panel entry list.
+ *
+ * @param panel Panel
+ */
+void panel_clear_entries(panel_t *panel)
+{
+        panel_entry_t *entry;
+
+        entry = panel_first(panel);
+        while (entry != NULL) {
+                panel_entry_delete(entry);
+                entry = panel_first(panel);
+        }
+}
+
+/** Read directory into panel entry list.
+ *
+ * @param panel Panel
+ * @param dirname Directory path
+ * @return EOK on success or an error code
+ */
+errno_t panel_read_dir(panel_t *panel, const char *dirname)
+{
+        DIR *dir;
+        struct dirent *dirent;
+        errno_t rc;
+
+        dir = opendir(dirname);
+        if (dir == NULL)
+                return errno;
+
+        dirent = readdir(dir);
+        while (dirent != NULL) {
+                rc = panel_entry_append(panel, dirent->d_name, 1);
+                if (rc != EOK)
+                        goto error;
+                dirent = readdir(dir);
+        }
+
+        closedir(dir);
+
+        panel->cursor = panel_first(panel);
+        panel->page = panel_first(panel);
+        return EOK;
+error:
+        closedir(dir);
+        return rc;
+}
+
 /** Return first panel entry.
  *