Changeset 1eb0fafe 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:

fa792e8

Parents:

692c7f40

git-author:

Jiri Svoboda <jiri@…> (2021-10-15 16:13:21)

git-committer:

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

Message:

Sort panel entries

File:

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

uspace/app/nav/panel.c

@@ -44 +44 @@
 #include <ui/paint.h>
 #include <ui/resource.h>
+#include <qsort.h>
 #include "panel.h"
 #include "nav.h"
@@ -484 +485 @@
         closedir(dir);
 
+        rc = panel_sort(panel);
+        if (rc != EOK)
+                goto error;
+
         panel->cursor = panel_first(panel);
         panel->cursor_idx = 0;
@@ -492 +497 @@
         closedir(dir);
         return rc;
+}
+
+/** Sort panel entries.
+ *
+ * @param panel Panel
+ * @return EOK on success, ENOMEM if out of memory
+ */
+errno_t panel_sort(panel_t *panel)
+{
+        panel_entry_t **emap;
+        panel_entry_t *entry;
+        size_t i;
+
+        /* Create an array to hold pointer to each entry */
+        emap = calloc(panel->entries_cnt, sizeof(panel_entry_t *));
+        if (emap == NULL)
+                return ENOMEM;
+
+        /* Write entry pointers to array */
+        entry = panel_first(panel);
+        i = 0;
+        while (entry != NULL) {
+                assert(i < panel->entries_cnt);
+                emap[i++] = entry;
+                entry = panel_next(entry);
+        }
+
+        /* Sort the array of pointers */
+        qsort(emap, panel->entries_cnt, sizeof(panel_entry_t *),
+            panel_entry_ptr_cmp);
+
+        /* Unlink entries from entry list */
+        entry = panel_first(panel);
+        while (entry != NULL) {
+                list_remove(&entry->lentries);
+                entry = panel_first(panel);
+        }
+
+        /* Add entries back to entry list sorted */
+        for (i = 0; i < panel->entries_cnt; i++)
+                list_append(&emap[i]->lentries, &panel->entries);
+
+        free(emap);
+        return EOK;
+}
+
+/** Compare two panel entries indirectly referenced by pointers.
+ *
+ * @param pa Pointer to pointer to first entry
+ * @param pb Pointer to pointer to second entry
+ * @return <0, =0, >=0 if pa < b, pa == pb, pa > pb, resp.
+ */
+int panel_entry_ptr_cmp(const void *pa, const void *pb)
+{
+        panel_entry_t *a = *(panel_entry_t **)pa;
+        panel_entry_t *b = *(panel_entry_t **)pb;
+
+        return str_cmp(a->name, b->name);
 }