Changeset 0e80e40 in mainline

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

Location:

uspace

Files:

• app/nav/nav.c (modified) (1 diff)
• app/nav/panel.c (modified) (8 diffs)
• app/nav/panel.h (modified) (3 diffs)
• app/nav/test/panel.c (modified) (2 diffs)
• lib/gfxfont/include/gfx/text.h (modified) (1 diff)

uspace/app/nav/nav.c

@@ -136 +136 @@
                 if (rc != EOK) {
                         printf("Error adding control to layout.\n");
-                        return rc;
+                        goto error;
+                }
+
+                rc = panel_read_dir(navigator->panel[i], ".");
+                if (rc != EOK) {
+                        printf("Error reading directory.\n");
+                        goto error;
                 }
         }

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.
  *

uspace/app/nav/panel.h

@@ -48 +48 @@
 #include "panel.h"
 
+/** Panel entry */
+typedef struct {
+        /** Containing panel */
+        struct panel *panel;
+        /** Link to @c panel->entries */
+        link_t lentries;
+        /** File name */
+        char *name;
+        /** File size */
+        uint64_t size;
+} panel_entry_t;
+
 /** Navigator panel
  *
@@ -65 +77 @@
         gfx_color_t *color;
 
+        /** Panel cursor color */
+        gfx_color_t *curs_color;
+
         /** Panel entries (list of panel_entry_t) */
         list_t entries;
+
+        /** First entry of current page */
+        panel_entry_t *page;
+
+        /** Cursor position */
+        panel_entry_t *cursor;
 } panel_t;
-
-/** Panel entry */
-typedef struct {
-        /** Containing panel */
-        panel_t *panel;
-        /** Link to @c panel->entries */
-        link_t lentries;
-        /** File name */
-        char *name;
-        /** File size */
-        uint64_t size;
-} panel_entry_t;
 
 extern errno_t panel_create(ui_window_t *, panel_t **);
@@ -89 +98 @@
 extern errno_t panel_entry_append(panel_t *, const char *, uint64_t);
 extern void panel_entry_delete(panel_entry_t *);
+extern void panel_clear_entries(panel_t *);
+extern errno_t panel_read_dir(panel_t *, const char *);
 extern panel_entry_t *panel_first(panel_t *);
 extern panel_entry_t *panel_next(panel_entry_t *);

uspace/app/nav/test/panel.c

@@ -29 +29 @@
 #include <errno.h>
 #include <pcut/pcut.h>
+#include <stdio.h>
+#include <vfs/vfs.h>
 #include "../panel.h"
 
@@ -194 +196 @@
 }
 
+/** panel_clear_entries() removes all entries from panel */
+PCUT_TEST(clear_entries)
+{
+        panel_t *panel;
+        errno_t rc;
+
+        rc = panel_create(NULL, &panel);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = panel_entry_append(panel, "a", 1);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = panel_entry_append(panel, "b", 2);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_INT_EQUALS(2, list_count(&panel->entries));
+
+        panel_clear_entries(panel);
+        PCUT_ASSERT_INT_EQUALS(0, list_count(&panel->entries));
+
+        panel_destroy(panel);
+}
+
+/** panel_read_dir() reads the contents of a directory */
+PCUT_TEST(read_dir)
+{
+        panel_t *panel;
+        panel_entry_t *entry;
+        char buf[L_tmpnam];
+        char *fname;
+        char *p;
+        errno_t rc;
+        FILE *f;
+        int rv;
+
+        /* Create name for temporary directory */
+        p = tmpnam(buf);
+        PCUT_ASSERT_NOT_NULL(p);
+
+        /* Create temporary directory */
+        rc = vfs_link_path(p, KIND_DIRECTORY, NULL);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rv = asprintf(&fname, "%s/%s", p, "a");
+        PCUT_ASSERT_TRUE(rv >= 0);
+
+        f = fopen(fname, "wb");
+        PCUT_ASSERT_NOT_NULL(f);
+
+        rv = fprintf(f, "X");
+        PCUT_ASSERT_TRUE(rv >= 0);
+
+        rv = fclose(f);
+        PCUT_ASSERT_INT_EQUALS(0, rv);
+
+        rc = panel_create(NULL, &panel);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = panel_read_dir(panel, p);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_INT_EQUALS(1, list_count(&panel->entries));
+
+        entry = panel_first(panel);
+        PCUT_ASSERT_NOT_NULL(entry);
+        PCUT_ASSERT_STR_EQUALS("a", entry->name);
+        // PCUT_ASSERT_INT_EQUALS(1, entry->size);
+
+        panel_destroy(panel);
+
+        rv = remove(fname);
+        PCUT_ASSERT_INT_EQUALS(0, rv);
+
+        rv = remove(p);
+        PCUT_ASSERT_INT_EQUALS(0, rv);
+        free(fname);
+}
+
 /** panel_first() returns valid entry or @c NULL as appropriate */
 PCUT_TEST(first)

uspace/lib/gfxfont/include/gfx/text.h

@@ -38 +38 @@
 
 #include <errno.h>
+#include <stddef.h>
 #include <types/gfx/coord.h>
 #include <types/gfx/font.h>