Changeset 7cf5ddb in mainline

Timestamp:

2023-03-08T18:21:22Z (21 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

42c2e65, 72ac106

Parents:

bea6233

Message:

Generic UI list control

Derived from file list, now file list is based on UI list.
Whew!

Location:

uspace

Files:

• app/nav/panel.c (modified) (5 diffs)
• app/uidemo/uidemo.c (modified) (3 diffs)
• app/uidemo/uidemo.h (modified) (3 diffs)
• lib/ui/include/types/ui/list.h (added)
• lib/ui/include/ui/filelist.h (modified) (2 diffs)
• lib/ui/include/ui/list.h (added)
• lib/ui/meson.build (modified) (2 diffs)
• lib/ui/private/filelist.h (modified) (7 diffs)
• lib/ui/private/list.h (added)
• lib/ui/src/filelist.c (modified) (27 diffs)
• lib/ui/src/list.c (added)
• lib/ui/test/filelist.c (modified) (15 diffs)
• lib/ui/test/list.c (added)
• lib/ui/test/main.c (modified) (1 diff)

uspace/app/nav/panel.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -60 +60 @@
 };
 
+static void panel_flist_activate_req(ui_file_list_t *, void *);
 static void panel_flist_selected(ui_file_list_t *, void *, const char *);
 
 /** Panel file list callbacks */
 static ui_file_list_cb_t panel_flist_cb = {
-        .selected = panel_flist_selected
+        .activate_req = panel_flist_activate_req,
+        .selected = panel_flist_selected,
 };
 
@@ -216 +218 @@
         gfx_coord2_t pos;
         ui_control_t *ctl;
+        ui_evclaim_t claim;
 
         pos.x = event->hpos;
@@ -222 +225 @@
                 return ui_unclaimed;
 
+        ctl = ui_file_list_ctl(panel->flist);
+        claim = ui_control_pos_event(ctl, event);
+        if (claim == ui_claimed)
+                return ui_claimed;
+
         if (!panel->active && event->type == POS_PRESS)
                 panel_activate_req(panel);
 
-        ctl = ui_file_list_ctl(panel->flist);
-        return ui_control_pos_event(ctl, event);
+        return ui_claimed;
 }
 
@@ -416 +423 @@
 }
 
+/** File list in panel requests activation.
+ *
+ * @param flist File list
+ * @param arg Argument (panel_t *)
+ */
+static void panel_flist_activate_req(ui_file_list_t *flist, void *arg)
+{
+        panel_t *panel = (panel_t *)arg;
+
+        panel_activate_req(panel);
+}
+
 /** File in panel file list was selected.
  *

uspace/app/uidemo/uidemo.c

@@ -44 +44 @@
 #include <ui/image.h>
 #include <ui/label.h>
+#include <ui/list.h>
 #include <ui/menubar.h>
 #include <ui/menuentry.h>
@@ -598 +599 @@
         ui_menu_entry_t *mmodify;
         ui_menu_entry_t *mabout;
+        ui_list_entry_attr_t eattr;
         errno_t rc;
 
@@ -1183 +1185 @@
 
         ui_tab_add(demo.tbasic, ui_fixed_ctl(demo.bfixed));
+
+        rc = ui_fixed_create(&demo.lfixed);
+        if (rc != EOK) {
+                printf("Error creating fixed layout.\n");
+                return rc;
+        }
+
+        rc = ui_list_create(window, false, &demo.list);
+        if (rc != EOK) {
+                printf("Error creating list.\n");
+                return rc;
+        }
+
+        ui_list_entry_attr_init(&eattr);
+
+        eattr.caption = "One";
+        rc = ui_list_entry_append(demo.list, &eattr, NULL);
+        if (rc != EOK) {
+                printf("Error adding list entry.\n");
+                return rc;
+        }
+
+        eattr.caption = "Two";
+        rc = ui_list_entry_append(demo.list, &eattr, NULL);
+        if (rc != EOK) {
+                printf("Error adding list entry.\n");
+                return rc;
+        }
+
+        eattr.caption = "Three";
+        rc = ui_list_entry_append(demo.list, &eattr, NULL);
+        if (rc != EOK) {
+                printf("Error adding list entry.\n");
+                return rc;
+        }
+
+        eattr.caption = "Four";
+        rc = ui_list_entry_append(demo.list, &eattr, NULL);
+        if (rc != EOK) {
+                printf("Error adding list entry.\n");
+                return rc;
+        }
+
+        eattr.caption = "Five";
+        rc = ui_list_entry_append(demo.list, &eattr, NULL);
+        if (rc != EOK) {
+                printf("Error adding list entry.\n");
+                return rc;
+        }
+
+        eattr.caption = "Six";
+        rc = ui_list_entry_append(demo.list, &eattr, NULL);
+        if (rc != EOK) {
+                printf("Error adding list entry.\n");
+                return rc;
+        }
+
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 4;
+                rect.p0.y = 5;
+                rect.p1.x = 41;
+                rect.p1.y = 10;
+        } else {
+                rect.p0.x = 15;
+                rect.p0.y = 88;
+                rect.p1.x = 245;
+                rect.p1.y = 173;
+        }
+
+        ui_list_set_rect(demo.list, &rect);
+
+        rc = ui_fixed_add(demo.lfixed, ui_list_ctl(demo.list));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
+        ui_tab_add(demo.tlists, ui_fixed_ctl(demo.lfixed));
 
         ui_window_add(window, ui_fixed_ctl(demo.fixed));

uspace/app/uidemo/uidemo.h

@@ -42 +42 @@
 #include <ui/fixed.h>
 #include <ui/label.h>
+#include <ui/list.h>
 #include <ui/menu.h>
 #include <ui/menubar.h>
@@ -59 +60 @@
         ui_fixed_t *fixed;
         ui_fixed_t *bfixed;
+        ui_fixed_t *lfixed;
         ui_menu_bar_t *mbar;
         ui_menu_t *mfile;
@@ -80 +82 @@
         ui_scrollbar_t *hscrollbar;
         ui_scrollbar_t *vscrollbar;
+        ui_list_t *list;
 } ui_demo_t;
 

uspace/lib/ui/include/ui/filelist.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <errno.h>
 #include <gfx/coord.h>
-#include <io/kbd_event.h>
-#include <io/pos_event.h>
 #include <ui/control.h>
 #include <ui/window.h>

uspace/lib/ui/meson.build

@@ -40 +40 @@
         'src/image.c',
         'src/label.c',
+        'src/list.c',
         'src/menu.c',
         'src/menubar.c',
@@ -71 +72 @@
         'test/image.c',
         'test/label.c',
+        'test/list.c',
         'test/main.c',
         'test/menu.c',

uspace/lib/ui/private/filelist.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #define _UI_PRIVATE_FILELIST_H
 
-#include <adt/list.h>
 #include <gfx/color.h>
-#include <gfx/coord.h>
 #include <ipc/loc.h>
+#include <ui/list.h>
 #include <ui/window.h>
 #include <stdint.h>
@@ -61 +60 @@
         /** Containing file list */
         struct ui_file_list *flist;
-        /** Link to @c flist->entries */
-        link_t lentries;
+        /** List entry */
+        ui_list_entry_t *entry;
         /** File name */
         char *name;
@@ -82 +81 @@
 
         /** Containing window */
-        ui_window_t *window;
+        struct ui_window *window;
+
+        /** UI list */
+        ui_list_t *list;
 
         /** Callbacks */
@@ -90 +92 @@
         void *cb_arg;
 
-        /** File list rectangle */
-        gfx_rect_t rect;
-
-        /** Scrollbar */
-        struct ui_scrollbar *scrollbar;
-
         /** Directory-type entry color */
         gfx_color_t *dir_color;
@@ -102 +98 @@
         gfx_color_t *svc_color;
 
-        /** File list entries (list of ui_file_list_entry_t) */
-        list_t entries;
-
-        /** Number of entries */
-        size_t entries_cnt;
-
-        /** First entry of current page */
-        ui_file_list_entry_t *page;
-
-        /** Index of first entry of current page */
-        size_t page_idx;
-
-        /** Cursor position */
-        ui_file_list_entry_t *cursor;
-
-        /** Index of entry under cursor */
-        size_t cursor_idx;
-
-        /** @c true iff the file list is active */
-        bool active;
-
         /** Directory */
         char *dir;
 } ui_file_list_t;
 
-extern gfx_coord_t ui_file_list_entry_height(ui_file_list_t *);
-extern errno_t ui_file_list_entry_paint(ui_file_list_entry_t *, size_t);
-extern errno_t ui_file_list_paint(ui_file_list_t *);
-extern ui_evclaim_t ui_file_list_kbd_event(ui_file_list_t *, kbd_event_t *);
-extern ui_evclaim_t ui_file_list_pos_event(ui_file_list_t *, pos_event_t *);
-extern unsigned ui_file_list_page_size(ui_file_list_t *);
-extern void ui_file_list_inside_rect(ui_file_list_t *, gfx_rect_t *);
-extern void ui_file_list_scrollbar_rect(ui_file_list_t *, gfx_rect_t *);
-extern gfx_coord_t ui_file_list_scrollbar_pos(ui_file_list_t *);
-extern void ui_file_list_scrollbar_update(ui_file_list_t *);
 extern bool ui_file_list_is_active(ui_file_list_t *);
 extern void ui_file_list_entry_delete(ui_file_list_entry_t *);
@@ -142 +107 @@
 extern errno_t ui_file_list_sort(ui_file_list_t *);
 extern int ui_file_list_entry_ptr_cmp(const void *, const void *);
+extern void ui_file_list_entry_attr_init(ui_file_list_entry_attr_t *);
+extern errno_t ui_file_list_entry_append(ui_file_list_t *,
+    ui_file_list_entry_attr_t *);
 extern ui_file_list_entry_t *ui_file_list_first(ui_file_list_t *);
 extern ui_file_list_entry_t *ui_file_list_last(ui_file_list_t *);
 extern ui_file_list_entry_t *ui_file_list_next(ui_file_list_entry_t *);
 extern ui_file_list_entry_t *ui_file_list_prev(ui_file_list_entry_t *);
-extern ui_file_list_entry_t *ui_file_list_page_nth_entry(ui_file_list_t *,
-    size_t, size_t *);
-extern void ui_file_list_entry_attr_init(ui_file_list_entry_attr_t *);
-extern errno_t ui_file_list_entry_append(ui_file_list_t *,
-    ui_file_list_entry_attr_t *);
-extern void ui_file_list_cursor_move(ui_file_list_t *, ui_file_list_entry_t *,
-    size_t);
-extern void ui_file_list_cursor_up(ui_file_list_t *);
-extern void ui_file_list_cursor_down(ui_file_list_t *);
-extern void ui_file_list_cursor_top(ui_file_list_t *);
-extern void ui_file_list_cursor_bottom(ui_file_list_t *);
-extern void ui_file_list_page_up(ui_file_list_t *);
-extern void ui_file_list_page_down(ui_file_list_t *);
-extern void ui_file_list_scroll_up(ui_file_list_t *);
-extern void ui_file_list_scroll_down(ui_file_list_t *);
-extern void ui_file_list_scroll_page_up(ui_file_list_t *);
-extern void ui_file_list_scroll_page_down(ui_file_list_t *);
-extern void ui_file_list_scroll_pos(ui_file_list_t *, size_t);
 extern errno_t ui_file_list_open_dir(ui_file_list_t *, ui_file_list_entry_t *);
 extern errno_t ui_file_list_open_file(ui_file_list_t *, ui_file_list_entry_t *);
 extern void ui_file_list_activate_req(ui_file_list_t *);
 extern void ui_file_list_selected(ui_file_list_t *, const char *);
+extern errno_t ui_file_list_paint(ui_file_list_t *);
+extern int ui_file_list_list_compare(ui_list_entry_t *, ui_list_entry_t *);
 
 #endif

uspace/lib/ui/src/filelist.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -30 +30 @@
  * @{
  */
-/** @file File list.
+/** @file File list control.
  *
  * Displays a file listing.
@@ -37 +37 @@
 #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/filelist.h>
-#include <ui/paint.h>
+#include <ui/list.h>
 #include <ui/resource.h>
-#include <ui/scrollbar.h>
 #include <vfs/vfs.h>
 #include <qsort.h>
@@ -56 +53 @@
 static ui_evclaim_t ui_file_list_ctl_pos_event(void *, pos_event_t *);
 
-/** File list control ops */
+/** List control ops */
 ui_control_ops_t ui_file_list_ctl_ops = {
         .destroy = ui_file_list_ctl_destroy,
@@ -64 +61 @@
 };
 
-enum {
-        file_list_entry_hpad = 2,
-        file_list_entry_vpad = 2,
-        file_list_entry_hpad_text = 1,
-        file_list_entry_vpad_text = 0,
-};
-
-static void ui_file_list_scrollbar_up(ui_scrollbar_t *, void *);
-static void ui_file_list_scrollbar_down(ui_scrollbar_t *, void *);
-static void ui_file_list_scrollbar_page_up(ui_scrollbar_t *, void *);
-static void ui_file_list_scrollbar_page_down(ui_scrollbar_t *, void *);
-static void ui_file_list_scrollbar_moved(ui_scrollbar_t *, void *, gfx_coord_t);
-
-/** File list scrollbar callbacks */
-static ui_scrollbar_cb_t ui_file_list_scrollbar_cb = {
-        .up = ui_file_list_scrollbar_up,
-        .down = ui_file_list_scrollbar_down,
-        .page_up = ui_file_list_scrollbar_page_up,
-        .page_down = ui_file_list_scrollbar_page_down,
-        .moved = ui_file_list_scrollbar_moved
+static void ui_file_list_list_activate_req(ui_list_t *, void *);
+static void ui_file_list_list_selected(ui_list_entry_t *, void *);
+
+/** List callbacks */
+ui_list_cb_t ui_file_list_list_cb = {
+        .activate_req = ui_file_list_list_activate_req,
+        .selected = ui_file_list_list_selected,
+        .compare = ui_file_list_list_compare,
 };
 
@@ -105 +90 @@
         rc = ui_control_new(&ui_file_list_ctl_ops, (void *)flist,
             &flist->control);
-        if (rc != EOK) {
-                free(flist);
-                return rc;
-        }
+        if (rc != EOK)
+                goto error;
 
         rc = gfx_color_new_ega(0x0f, &flist->dir_color);
@@ -118 +101 @@
                 goto error;
 
-        rc = ui_scrollbar_create(ui_window_get_ui(window), window,
-            ui_sbd_vert, &flist->scrollbar);
+        rc = ui_list_create(window, active, &flist->list);
         if (rc != EOK)
                 goto error;
 
-        ui_scrollbar_set_cb(flist->scrollbar, &ui_file_list_scrollbar_cb,
-            (void *) flist);
+        ui_list_set_cb(flist->list, &ui_file_list_list_cb, (void *)flist);
 
         flist->window = window;
-        list_initialize(&flist->entries);
-        flist->entries_cnt = 0;
-        flist->active = active;
-
         *rflist = flist;
         return EOK;
 error:
+        ui_control_delete(flist->control);
         if (flist->dir_color != NULL)
                 gfx_color_delete(flist->dir_color);
         if (flist->svc_color != NULL)
                 gfx_color_delete(flist->svc_color);
+        free(flist);
+        return rc;
+}
+
+/** Destroy file list.
+ *
+ * @param flist File list
+ */
+void ui_file_list_destroy(ui_file_list_t *flist)
+{
+        ui_file_list_clear_entries(flist);
+        ui_list_destroy(flist->list);
         ui_control_delete(flist->control);
         free(flist);
-        return rc;
-}
-
-/** Destroy file list.
- *
- * @param flist File list
- */
-void ui_file_list_destroy(ui_file_list_t *flist)
-{
-        ui_file_list_clear_entries(flist);
-        ui_control_delete(flist->control);
-        free(flist);
 }
 
@@ -166 +144 @@
 }
 
-/** Get height of file list entry.
- *
- * @param flist File list
- * @return Entry height in pixels
- */
-gfx_coord_t ui_file_list_entry_height(ui_file_list_t *flist)
-{
-        ui_resource_t *res;
-        gfx_font_metrics_t metrics;
-        gfx_coord_t height;
-        gfx_coord_t vpad;
-
-        res = ui_window_get_res(flist->window);
-
-        if (res->textmode) {
-                vpad = file_list_entry_vpad_text;
-        } else {
-                vpad = file_list_entry_vpad;
-        }
-
-        /* Normal menu entry */
-        gfx_font_get_metrics(res->font, &metrics);
-        height = metrics.ascent + metrics.descent + 1;
-
-        return height + 2 * vpad;
-}
-
-/** Paint file list entry.
- *
- * @param entry File list entry
- * @param entry_idx Entry index (within list of entries)
- * @return EOK on success or an error code
- */
-errno_t ui_file_list_entry_paint(ui_file_list_entry_t *entry, size_t entry_idx)
-{
-        ui_file_list_t *flist = entry->flist;
-        gfx_context_t *gc = ui_window_get_gc(flist->window);
-        ui_resource_t *res = ui_window_get_res(flist->window);
-        gfx_font_t *font = ui_resource_get_font(res);
-        gfx_text_fmt_t fmt;
-        gfx_coord2_t pos;
-        gfx_rect_t rect;
-        gfx_rect_t lrect;
-        gfx_rect_t crect;
-        gfx_color_t *bgcolor;
-        char *caption;
-        gfx_coord_t hpad, vpad;
-        gfx_coord_t line_height;
-        size_t rows;
-        errno_t rc;
-        int rv;
-
-        line_height = ui_file_list_entry_height(flist);
-        ui_file_list_inside_rect(entry->flist, &lrect);
-
-        gfx_text_fmt_init(&fmt);
-        fmt.font = font;
-        rows = ui_file_list_page_size(flist) + 1;
-
-        /* Do not display entry outside of current page */
-        if (entry_idx < flist->page_idx ||
-            entry_idx >= flist->page_idx + rows)
-                return EOK;
-
-        if (res->textmode) {
-                hpad = file_list_entry_hpad_text;
-                vpad = file_list_entry_vpad_text;
-        } else {
-                hpad = file_list_entry_hpad;
-                vpad = file_list_entry_vpad;
-        }
-
-        pos.x = lrect.p0.x;
-        pos.y = lrect.p0.y + line_height * (entry_idx - flist->page_idx);
-
-        if (entry == flist->cursor && flist->active) {
-                fmt.color = res->entry_sel_text_fg_color;
-                bgcolor = res->entry_sel_text_bg_color;
-        } else if (entry->isdir) {
-                if (res->textmode) {
-                        fmt.color = flist->dir_color;
-                        bgcolor = flist->dir_color;
-                } else {
-                        fmt.color = res->entry_fg_color;
-                        bgcolor = res->entry_bg_color;
-                }
-        } else if (entry->svc != 0) {
-                if (res->textmode) {
-                        fmt.color = flist->svc_color;
-                        bgcolor = flist->svc_color;
-                } else {
-                        fmt.color = res->entry_fg_color;
-                        bgcolor = res->entry_bg_color;
-                }
-        } else {
-                fmt.color = res->entry_fg_color;
-                bgcolor = res->entry_bg_color;
-        }
-
-        /* Draw entry background */
-        rect.p0 = pos;
-        rect.p1.x = lrect.p1.x;
-        rect.p1.y = rect.p0.y + line_height;
-
-        /* Clip to file list interior */
-        gfx_rect_clip(&rect, &lrect, &crect);
-
-        rc = gfx_set_color(gc, bgcolor);
-        if (rc != EOK)
-                return rc;
-
-        rc = gfx_fill_rect(gc, &crect);
-        if (rc != EOK)
-                return rc;
-
-        /*
-         * Make sure name does not overflow the entry rectangle.
-         *
-         * XXX We probably want to measure the text width, and,
-         * if it's too long, use gfx_text_find_pos() to find where
-         * it should be cut off (and append some sort of overflow
-         * marker.
-         */
-        rc = gfx_set_clip_rect(gc, &crect);
-        if (rc != EOK)
-                return rc;
-
-        pos.x += hpad;
-        pos.y += vpad;
-
-        if (res->textmode || !entry->isdir) {
-                rc = gfx_puttext(&pos, &fmt, entry->name);
-                if (rc != EOK) {
-                        (void) gfx_set_clip_rect(gc, NULL);
-                        return rc;
-                }
-        } else {
-                /*
-                 * XXX This is mostly a hack to distinguish directories
-                 * util a better solution is available. (E.g. a Size
-                 * column where we can put <dir>, an icon.)
-                 */
-                rv = asprintf(&caption, "[%s]", entry->name);
-                if (rv < 0) {
-                        (void) gfx_set_clip_rect(gc, NULL);
-                        return rc;
-                }
-
-                rc = gfx_puttext(&pos, &fmt, caption);
-                if (rc != EOK) {
-                        free(caption);
-                        (void) gfx_set_clip_rect(gc, NULL);
-                        return rc;
-                }
-
-                free(caption);
-        }
-
-        return gfx_set_clip_rect(gc, NULL);
-}
-
-/** Paint file list.
- *
- * @param flist File list
- */
-errno_t ui_file_list_paint(ui_file_list_t *flist)
-{
-        gfx_context_t *gc = ui_window_get_gc(flist->window);
-        ui_resource_t *res = ui_window_get_res(flist->window);
-        ui_file_list_entry_t *entry;
-        int i, lines;
-        errno_t rc;
-
-        rc = gfx_set_color(gc, res->entry_bg_color);
-        if (rc != EOK)
-                return rc;
-
-        rc = gfx_fill_rect(gc, &flist->rect);
-        if (rc != EOK)
-                return rc;
-
-        if (!res->textmode) {
-                rc = ui_paint_inset_frame(res, &flist->rect, NULL);
-                if (rc != EOK)
-                        return rc;
-        }
-
-        lines = ui_file_list_page_size(flist) + 1;
-        i = 0;
-
-        entry = flist->page;
-        while (entry != NULL && i < lines) {
-                rc = ui_file_list_entry_paint(entry, flist->page_idx + i);
-                if (rc != EOK)
-                        return rc;
-
-                ++i;
-                entry = ui_file_list_next(entry);
-        }
-
-        rc = ui_scrollbar_paint(flist->scrollbar);
-        if (rc != EOK)
-                return rc;
-
-        rc = gfx_update(gc);
-        if (rc != EOK)
-                return rc;
-
-        return EOK;
-}
-
-/** Handle file list keyboard event.
- *
- * @param flist File list
- * @param event Keyboard event
- * @return ui_claimed iff event was claimed
- */
-ui_evclaim_t ui_file_list_kbd_event(ui_file_list_t *flist, kbd_event_t *event)
-{
-        if (!flist->active)
-                return ui_unclaimed;
-
-        if (event->type == KEY_PRESS) {
-                if ((event->mods & (KM_CTRL | KM_ALT | KM_SHIFT)) == 0) {
-                        switch (event->key) {
-                        case KC_UP:
-                                ui_file_list_cursor_up(flist);
-                                break;
-                        case KC_DOWN:
-                                ui_file_list_cursor_down(flist);
-                                break;
-                        case KC_HOME:
-                                ui_file_list_cursor_top(flist);
-                                break;
-                        case KC_END:
-                                ui_file_list_cursor_bottom(flist);
-                                break;
-                        case KC_PAGE_UP:
-                                ui_file_list_page_up(flist);
-                                break;
-                        case KC_PAGE_DOWN:
-                                ui_file_list_page_down(flist);
-                                break;
-                        case KC_ENTER:
-                                ui_file_list_open(flist, flist->cursor);
-                                break;
-                        default:
-                                break;
-                        }
-                }
-        }
-
-        return ui_claimed;
-}
-
-/** Handle file list position event.
- *
- * @param flist File list
- * @param event Position event
- * @return ui_claimed iff event was claimed
- */
-ui_evclaim_t ui_file_list_pos_event(ui_file_list_t *flist, pos_event_t *event)
-{
-        gfx_coord2_t pos;
-        gfx_rect_t irect;
-        ui_file_list_entry_t *entry;
-        gfx_coord_t line_height;
-        size_t entry_idx;
-        ui_evclaim_t claim;
-        int n;
-
-        claim = ui_scrollbar_pos_event(flist->scrollbar, event);
-        if (claim == ui_claimed)
-                return ui_claimed;
-
-        line_height = ui_file_list_entry_height(flist);
-
-        pos.x = event->hpos;
-        pos.y = event->vpos;
-        if (!gfx_pix_inside_rect(&pos, &flist->rect))
-                return ui_unclaimed;
-
-        if (!flist->active && event->type == POS_PRESS)
-                ui_file_list_activate_req(flist);
-
-        if (event->type == POS_PRESS || event->type == POS_DCLICK) {
-                ui_file_list_inside_rect(flist, &irect);
-
-                /* Did we click on one of the entries? */
-                if (gfx_pix_inside_rect(&pos, &irect)) {
-                        /* Index within page */
-                        n = (pos.y - irect.p0.y) / line_height;
-
-                        /* Entry and its index within entire listing */
-                        entry = ui_file_list_page_nth_entry(flist, n, &entry_idx);
-                        if (entry == NULL)
-                                return ui_claimed;
-
-                        if (event->type == POS_PRESS) {
-                                /* Move to the entry found */
-                                ui_file_list_cursor_move(flist, entry, entry_idx);
-                        } else {
-                                /* event->type == POS_DCLICK */
-                                ui_file_list_open(flist, entry);
-                        }
-                } else {
-                        /* It's in the border. */
-                        if (event->type == POS_PRESS) {
-                                /* Top or bottom half? */
-                                if (pos.y >= (irect.p0.y + irect.p1.y) / 2)
-                                        ui_file_list_page_down(flist);
-                                else
-                                        ui_file_list_page_up(flist);
-                        }
-                }
-        }
-
-        return ui_claimed;
-}
-
 /** Get base control for file list.
  *
@@ -503 +161 @@
 void ui_file_list_set_rect(ui_file_list_t *flist, gfx_rect_t *rect)
 {
-        gfx_rect_t srect;
-
-        flist->rect = *rect;
-
-        ui_file_list_scrollbar_rect(flist, &srect);
-        ui_scrollbar_set_rect(flist->scrollbar, &srect);
-}
-
-/** Get file list page size.
- *
- * @param flist File list
- * @return Number of entries that fit in flist at the same time.
- */
-unsigned ui_file_list_page_size(ui_file_list_t *flist)
-{
-        gfx_coord_t line_height;
-        gfx_rect_t irect;
-
-        line_height = ui_file_list_entry_height(flist);
-        ui_file_list_inside_rect(flist, &irect);
-        return (irect.p1.y - irect.p0.y) / line_height;
-}
-
-/** Get file list interior rectangle.
- *
- * @param flist File list
- * @param irect Place to store interior rectangle
- */
-void ui_file_list_inside_rect(ui_file_list_t *flist, gfx_rect_t *irect)
-{
-        ui_resource_t *res = ui_window_get_res(flist->window);
-        gfx_rect_t rect;
-        gfx_coord_t width;
-
-        if (res->textmode) {
-                rect = flist->rect;
-        } else {
-                ui_paint_get_inset_frame_inside(res, &flist->rect, &rect);
-        }
-
-        if (res->textmode) {
-                width = 1;
-        } else {
-                width = 23;
-        }
-
-        irect->p0 = rect.p0;
-        irect->p1.x = rect.p1.x - width;
-        irect->p1.y = rect.p1.y;
-}
-
-/** Get file list scrollbar rectangle.
- *
- * @param flist File list
- * @param irect Place to store interior rectangle
- */
-void ui_file_list_scrollbar_rect(ui_file_list_t *flist, gfx_rect_t *srect)
-{
-        ui_resource_t *res = ui_window_get_res(flist->window);
-        gfx_rect_t rect;
-        gfx_coord_t width;
-
-        if (res->textmode) {
-                rect = flist->rect;
-        } else {
-                ui_paint_get_inset_frame_inside(res, &flist->rect, &rect);
-        }
-
-        if (res->textmode) {
-                width = 1;
-        } else {
-                width = 23;
-        }
-
-        srect->p0.x = rect.p1.x - width;
-        srect->p0.y = rect.p0.y;
-        srect->p1 = rect.p1;
-}
-
-/** Compute new position for file list scrollbar thumb.
- *
- * @param flist File list
- * @return New position
- */
-gfx_coord_t ui_file_list_scrollbar_pos(ui_file_list_t *flist)
-{
-        size_t entries;
-        size_t pglen;
-        size_t sbar_len;
-
-        entries = list_count(&flist->entries);
-        pglen = ui_file_list_page_size(flist);
-        sbar_len = ui_scrollbar_move_length(flist->scrollbar);
-
-        if (entries > pglen)
-                return sbar_len * flist->page_idx / (entries - pglen);
-        else
-                return 0;
-}
-
-/** Update file list scrollbar position.
- *
- * @param flist File list
- */
-void ui_file_list_scrollbar_update(ui_file_list_t *flist)
-{
-        ui_scrollbar_set_pos(flist->scrollbar,
-            ui_file_list_scrollbar_pos(flist));
+        ui_list_set_rect(flist->list, rect);
 }
 
@@ -620 +171 @@
 bool ui_file_list_is_active(ui_file_list_t *flist)
 {
-        return flist->active;
+        return ui_list_is_active(flist->list);
 }
 
@@ -639 +190 @@
         }
 
-        flist->active = true;
-        (void) ui_file_list_paint(flist);
-        return EOK;
+        return ui_list_activate(flist->list);
 }
 
@@ -650 +199 @@
 void ui_file_list_deactivate(ui_file_list_t *flist)
 {
-        flist->active = false;
-        (void) ui_file_list_paint(flist);
+        ui_list_deactivate(flist->list);
 }
 
@@ -661 +209 @@
 {
         memset(attr, 0, sizeof(*attr));
-}
-
-/** Destroy file list control.
- *
- * @param arg Argument (ui_file_list_t *)
- */
-void ui_file_list_ctl_destroy(void *arg)
-{
-        ui_file_list_t *flist = (ui_file_list_t *) arg;
-
-        ui_file_list_destroy(flist);
-}
-
-/** Paint file list control.
- *
- * @param arg Argument (ui_file_list_t *)
- * @return EOK on success or an error code
- */
-errno_t ui_file_list_ctl_paint(void *arg)
-{
-        ui_file_list_t *flist = (ui_file_list_t *) arg;
-
-        return ui_file_list_paint(flist);
-}
-
-/** Handle file list control keyboard event.
- *
- * @param arg Argument (ui_file_list_t *)
- * @param kbd_event Keyboard event
- * @return @c ui_claimed iff the event is claimed
- */
-ui_evclaim_t ui_file_list_ctl_kbd_event(void *arg, kbd_event_t *event)
-{
-        ui_file_list_t *flist = (ui_file_list_t *) arg;
-
-        return ui_file_list_kbd_event(flist, event);
-}
-
-/** Handle file list control position event.
- *
- * @param arg Argument (ui_file_list_t *)
- * @param pos_event Position event
- * @return @c ui_claimed iff the event is claimed
- */
-ui_evclaim_t ui_file_list_ctl_pos_event(void *arg, pos_event_t *event)
-{
-        ui_file_list_t *flist = (ui_file_list_t *) arg;
-
-        return ui_file_list_pos_event(flist, event);
 }
 
@@ -721 +220 @@
 {
         ui_file_list_entry_t *entry;
+        ui_list_entry_attr_t lattr;
+        ui_list_entry_t *lentry;
+        ui_resource_t *res;
+        char *caption;
+        errno_t rc;
+        int rv;
+
+        res = ui_window_get_res(flist->window);
 
         entry = calloc(1, sizeof(ui_file_list_entry_t));
@@ -736 +243 @@
         entry->isdir = attr->isdir;
         entry->svc = attr->svc;
-        link_initialize(&entry->lentries);
-        list_append(&entry->lentries, &flist->entries);
-        ++flist->entries_cnt;
+
+        if (attr->isdir && !res->textmode) {
+                rv = asprintf(&caption, "[%s]", attr->name);
+                if (rv < 0)
+                        caption = NULL;
+        } else {
+                caption = str_dup(attr->name);
+        }
+
+        if (caption == NULL) {
+                free(entry->name);
+                free(entry);
+                return ENOMEM;
+        }
+
+        lattr.caption = caption;
+        lattr.arg = (void *)entry;
+        lattr.color = NULL;
+        lattr.bgcolor = NULL;
+
+        if (res->textmode) {
+                if (attr->isdir) {
+                        lattr.color = flist->dir_color;
+                        lattr.bgcolor = flist->dir_color;
+                } else if (attr->svc != 0) {
+                        lattr.color = flist->svc_color;
+                        lattr.bgcolor = flist->svc_color;
+                }
+        }
+
+        rc = ui_list_entry_append(flist->list, &lattr, &lentry);
+        if (rc != EOK) {
+                free(caption);
+                free(entry->name);
+                free(entry);
+                return rc;
+        }
+
+        free(caption);
+        entry->entry = lentry;
         return EOK;
 }
@@ -748 +292 @@
 void ui_file_list_entry_delete(ui_file_list_entry_t *entry)
 {
-        if (entry->flist->cursor == entry)
-                entry->flist->cursor = NULL;
-        if (entry->flist->page == entry)
-                entry->flist->page = NULL;
-
-        list_remove(&entry->lentries);
-        --entry->flist->entries_cnt;
-        free((char *) entry->name);
+        ui_list_entry_delete(entry->entry);
+        free(entry->name);
         free(entry);
 }
@@ -788 +326 @@
         char *ndir = NULL;
         ui_file_list_entry_attr_t attr;
+        ui_file_list_entry_t *cur;
         ui_file_list_entry_t *next;
-        ui_file_list_entry_t *prev;
         char *olddn;
-        size_t pg_size;
-        size_t max_idx;
-        size_t i;
         errno_t rc;
 
@@ -853 +388 @@
                 goto error;
 
-        flist->cursor = ui_file_list_first(flist);
-        flist->cursor_idx = 0;
-        flist->page = ui_file_list_first(flist);
-        flist->page_idx = 0;
-
         /* Moving up? */
         if (str_cmp(dirname, "..") == 0) {
@@ -865 +395 @@
                         /* Find corresponding entry */
                         ++olddn;
-                        next = ui_file_list_next(flist->cursor);
+                        cur = ui_file_list_first(flist);
+                        next = ui_file_list_next(cur);
                         while (next != NULL && str_cmp(next->name, olddn) <= 0 &&
                             next->isdir) {
-                                flist->cursor = next;
-                                ++flist->cursor_idx;
-                                next = ui_file_list_next(flist->cursor);
+                                cur = next;
+                                next = ui_file_list_next(cur);
                         }
 
-                        /* Move page so that cursor is in the center */
-                        flist->page = flist->cursor;
-                        flist->page_idx = flist->cursor_idx;
-
-                        pg_size = ui_file_list_page_size(flist);
-
-                        for (i = 0; i < pg_size / 2; i++) {
-                                prev = ui_file_list_prev(flist->page);
-                                if (prev == NULL)
-                                        break;
-
-                                flist->page = prev;
-                                --flist->page_idx;
-                        }
-
-                        /* Make sure page is not beyond the end if possible */
-                        if (flist->entries_cnt > pg_size)
-                                max_idx = flist->entries_cnt - pg_size;
-                        else
-                                max_idx = 0;
-
-                        while (flist->page_idx > 0 && flist->page_idx > max_idx) {
-                                prev = ui_file_list_prev(flist->page);
-                                if (prev == NULL)
-                                        break;
-
-                                flist->page = prev;
-                                --flist->page_idx;
-                        }
+                        /* Center on the entry */
+                        ui_list_cursor_center(flist->list, cur->entry);
                 }
         }
@@ -925 +428 @@
 errno_t ui_file_list_sort(ui_file_list_t *flist)
 {
-        ui_file_list_entry_t **emap;
-        ui_file_list_entry_t *entry;
-        size_t i;
-
-        /* Create an array to hold pointer to each entry */
-        emap = calloc(flist->entries_cnt, sizeof(ui_file_list_entry_t *));
-        if (emap == NULL)
-                return ENOMEM;
-
-        /* Write entry pointers to array */
-        entry = ui_file_list_first(flist);
-        i = 0;
-        while (entry != NULL) {
-                assert(i < flist->entries_cnt);
-                emap[i++] = entry;
-                entry = ui_file_list_next(entry);
-        }
-
-        /* Sort the array of pointers */
-        qsort(emap, flist->entries_cnt, sizeof(ui_file_list_entry_t *),
-            ui_file_list_entry_ptr_cmp);
-
-        /* Unlink entries from entry list */
-        entry = ui_file_list_first(flist);
-        while (entry != NULL) {
-                list_remove(&entry->lentries);
-                entry = ui_file_list_first(flist);
-        }
-
-        /* Add entries back to entry list sorted */
-        for (i = 0; i < flist->entries_cnt; i++)
-                list_append(&emap[i]->lentries, &flist->entries);
-
-        free(emap);
-        return EOK;
-}
-
-/** Compare two file list 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 ui_file_list_entry_ptr_cmp(const void *pa, const void *pb)
-{
-        ui_file_list_entry_t *a = *(ui_file_list_entry_t **)pa;
-        ui_file_list_entry_t *b = *(ui_file_list_entry_t **)pb;
+        return ui_list_sort(flist->list);
+}
+
+/** Compare two list entries within file list entries.
+ *
+ * @param ea First UI list entry
+ * @param eb Second UI list entry
+ * @return <0, =0, >=0 if a < b, a == b, a > b, resp.
+ */
+int ui_file_list_list_compare(ui_list_entry_t *ea, ui_list_entry_t *eb)
+{
+        ui_file_list_entry_t *a;
+        ui_file_list_entry_t *b;
         int dcmp;
+
+        a = (ui_file_list_entry_t *)ui_list_entry_get_arg(ea);
+        b = (ui_file_list_entry_t *)ui_list_entry_get_arg(eb);
 
         /* Sort directories first */
@@ -989 +461 @@
 ui_file_list_entry_t *ui_file_list_first(ui_file_list_t *flist)
 {
-        link_t *link;
-
-        link = list_first(&flist->entries);
-        if (link == NULL)
+        ui_list_entry_t *lentry;
+
+        lentry = ui_list_first(flist->list);
+        if (lentry == NULL)
                 return NULL;
 
-        return list_get_instance(link, ui_file_list_entry_t, lentries);
+        return (ui_file_list_entry_t *)ui_list_entry_get_arg(lentry);
 }
 
@@ -1005 +477 @@
 ui_file_list_entry_t *ui_file_list_last(ui_file_list_t *flist)
 {
-        link_t *link;
-
-        link = list_last(&flist->entries);
-        if (link == NULL)
+        ui_list_entry_t *lentry;
+
+        lentry = ui_list_last(flist->list);
+        if (lentry == NULL)
                 return NULL;
 
-        return list_get_instance(link, ui_file_list_entry_t, lentries);
+        return (ui_file_list_entry_t *)ui_list_entry_get_arg(lentry);
 }
 
@@ -1021 +493 @@
 ui_file_list_entry_t *ui_file_list_next(ui_file_list_entry_t *cur)
 {
-        link_t *link;
-
-        link = list_next(&cur->lentries, &cur->flist->entries);
-        if (link == NULL)
+        ui_list_entry_t *lentry;
+
+        lentry = ui_list_next(cur->entry);
+        if (lentry == NULL)
                 return NULL;
 
-        return list_get_instance(link, ui_file_list_entry_t, lentries);
+        return (ui_file_list_entry_t *)ui_list_entry_get_arg(lentry);
 }
 
@@ -1037 +509 @@
 ui_file_list_entry_t *ui_file_list_prev(ui_file_list_entry_t *cur)
 {
-        link_t *link;
-
-        link = list_prev(&cur->lentries, &cur->flist->entries);
-        if (link == NULL)
+        ui_list_entry_t *lentry;
+
+        lentry = ui_list_prev(cur->entry);
+        if (lentry == NULL)
                 return NULL;
 
-        return list_get_instance(link, ui_file_list_entry_t, lentries);
-}
-
-/** Find the n-th entry of the current file list page.
- *
- * @param flist File list
- * @param n Which entry to get (starting from 0)
- * @param ridx Place to store index (within listing) of the entry
- * @return n-th entry of the page
- */
-ui_file_list_entry_t *ui_file_list_page_nth_entry(ui_file_list_t *flist,
-    size_t n, size_t *ridx)
-{
-        ui_file_list_entry_t *entry;
-        size_t i;
-        size_t idx;
-
-        assert(n <= ui_file_list_page_size(flist));
-
-        entry = flist->page;
+        return (ui_file_list_entry_t *)ui_list_entry_get_arg(lentry);
+}
+
+/** Get entry under cursor.
+ *
+ * @param flist File list
+ * @return Current cursor
+ */
+ui_file_list_entry_t *ui_file_list_get_cursor(ui_file_list_t *flist)
+{
+        ui_list_entry_t *entry;
+
+        entry = ui_list_get_cursor(flist->list);
         if (entry == NULL)
                 return NULL;
 
-        idx = flist->page_idx;
-        for (i = 0; i < n; i++) {
-                entry = ui_file_list_next(entry);
-                if (entry == NULL)
-                        return NULL;
-
-                ++idx;
-        }
-
-        *ridx = idx;
-        return entry;
-}
-
-/** Get entry under cursor.
- *
- * @param flist File list
- * @return Current cursor
- */
-ui_file_list_entry_t *ui_file_list_get_cursor(ui_file_list_t *flist)
-{
-        return flist->cursor;
-}
-
-/** Move cursor to a new position, possibly scrolling.
- *
- * @param flist File list
- * @param entry New entry under cursor
- * @param entry_idx Index of new entry under cursor
- */
-void ui_file_list_cursor_move(ui_file_list_t *flist,
-    ui_file_list_entry_t *entry, size_t entry_idx)
-{
-        gfx_context_t *gc = ui_window_get_gc(flist->window);
-        ui_file_list_entry_t *old_cursor;
-        size_t old_idx;
-        size_t rows;
-        ui_file_list_entry_t *e;
-        size_t i;
-
-        rows = ui_file_list_page_size(flist);
-
-        old_cursor = flist->cursor;
-        old_idx = flist->cursor_idx;
-
-        flist->cursor = entry;
-        flist->cursor_idx = entry_idx;
-
-        if (entry_idx >= flist->page_idx &&
-            entry_idx < flist->page_idx + rows) {
-                /*
-                 * If cursor is still on the current page, we're not
-                 * scrolling. Just unpaint old cursor and paint new
-                 * cursor.
-                 */
-                ui_file_list_entry_paint(old_cursor, old_idx);
-                ui_file_list_entry_paint(flist->cursor, flist->cursor_idx);
-
-                (void) gfx_update(gc);
-        } else {
-                /*
-                 * Need to scroll and update all rows.
-                 */
-
-                /* Scrolling up */
-                if (entry_idx < flist->page_idx) {
-                        flist->page = entry;
-                        flist->page_idx = entry_idx;
-                }
-
-                /* Scrolling down */
-                if (entry_idx >= flist->page_idx + rows) {
-                        if (entry_idx >= rows) {
-                                flist->page_idx = entry_idx - rows + 1;
-                                /* Find first page entry (go back rows - 1) */
-                                e = entry;
-                                for (i = 0; i < rows - 1; i++) {
-                                        e = ui_file_list_prev(e);
-                                }
-
-                                /* Should be valid */
-                                assert(e != NULL);
-                                flist->page = e;
-                        } else {
-                                flist->page = ui_file_list_first(flist);
-                                flist->page_idx = 0;
-                        }
-                }
-
-                ui_file_list_scrollbar_update(flist);
-                (void) ui_file_list_paint(flist);
-        }
-}
-
-/** Move cursor one entry up.
- *
- * @param flist File list
- */
-void ui_file_list_cursor_up(ui_file_list_t *flist)
-{
-        ui_file_list_entry_t *prev;
-        size_t prev_idx;
-
-        prev = ui_file_list_prev(flist->cursor);
-        prev_idx = flist->cursor_idx - 1;
-        if (prev != NULL)
-                ui_file_list_cursor_move(flist, prev, prev_idx);
-}
-
-/** Move cursor one entry down.
- *
- * @param flist File list
- */
-void ui_file_list_cursor_down(ui_file_list_t *flist)
-{
-        ui_file_list_entry_t *next;
-        size_t next_idx;
-
-        next = ui_file_list_next(flist->cursor);
-        next_idx = flist->cursor_idx + 1;
-        if (next != NULL)
-                ui_file_list_cursor_move(flist, next, next_idx);
-}
-
-/** Move cursor to top.
- *
- * @param flist File list
- */
-void ui_file_list_cursor_top(ui_file_list_t *flist)
-{
-        ui_file_list_cursor_move(flist, ui_file_list_first(flist), 0);
-}
-
-/** Move cursor to bottom.
- *
- * @param flist File list
- */
-void ui_file_list_cursor_bottom(ui_file_list_t *flist)
-{
-        ui_file_list_cursor_move(flist, ui_file_list_last(flist),
-            flist->entries_cnt - 1);
-}
-
-/** Move cursor one page up.
- *
- * @param flist File list
- */
-void ui_file_list_page_up(ui_file_list_t *flist)
-{
-        gfx_context_t *gc = ui_window_get_gc(flist->window);
-        ui_file_list_entry_t *old_page;
-        ui_file_list_entry_t *old_cursor;
-        size_t old_idx;
-        size_t rows;
-        ui_file_list_entry_t *entry;
-        size_t i;
-
-        rows = ui_file_list_page_size(flist);
-
-        old_page = flist->page;
-        old_cursor = flist->cursor;
-        old_idx = flist->cursor_idx;
-
-        /* Move page by rows entries up (if possible) */
-        for (i = 0; i < rows; i++) {
-                entry = ui_file_list_prev(flist->page);
-                if (entry != NULL) {
-                        flist->page = entry;
-                        --flist->page_idx;
-                }
-        }
-
-        /* Move cursor by rows entries up (if possible) */
-
-        for (i = 0; i < rows; i++) {
-                entry = ui_file_list_prev(flist->cursor);
-                if (entry != NULL) {
-                        flist->cursor = entry;
-                        --flist->cursor_idx;
-                }
-        }
-
-        if (flist->page != old_page) {
-                /* We have scrolled. Need to repaint all entries */
-                ui_file_list_scrollbar_update(flist);
-                (void) ui_file_list_paint(flist);
-        } else if (flist->cursor != old_cursor) {
-                /* No scrolling, but cursor has moved */
-                ui_file_list_entry_paint(old_cursor, old_idx);
-                ui_file_list_entry_paint(flist->cursor, flist->cursor_idx);
-
-                (void) gfx_update(gc);
-        }
-}
-
-/** Move cursor one page down.
- *
- * @param flist File list
- */
-void ui_file_list_page_down(ui_file_list_t *flist)
-{
-        gfx_context_t *gc = ui_window_get_gc(flist->window);
-        ui_file_list_entry_t *old_page;
-        ui_file_list_entry_t *old_cursor;
-        size_t old_idx;
-        size_t max_idx;
-        size_t rows;
-        ui_file_list_entry_t *entry;
-        size_t i;
-
-        rows = ui_file_list_page_size(flist);
-
-        old_page = flist->page;
-        old_cursor = flist->cursor;
-        old_idx = flist->cursor_idx;
-
-        if (flist->entries_cnt > rows)
-                max_idx = flist->entries_cnt - rows;
-        else
-                max_idx = 0;
-
-        /* Move page by rows entries down (if possible) */
-        for (i = 0; i < rows; i++) {
-                entry = ui_file_list_next(flist->page);
-                /* Do not scroll that results in a short page */
-                if (entry != NULL && flist->page_idx < max_idx) {
-                        flist->page = entry;
-                        ++flist->page_idx;
-                }
-        }
-
-        /* Move cursor by rows entries down (if possible) */
-
-        for (i = 0; i < rows; i++) {
-                entry = ui_file_list_next(flist->cursor);
-                if (entry != NULL) {
-                        flist->cursor = entry;
-                        ++flist->cursor_idx;
-                }
-        }
-
-        if (flist->page != old_page) {
-                /* We have scrolled. Need to repaint all entries */
-                ui_file_list_scrollbar_update(flist);
-                (void) ui_file_list_paint(flist);
-        } else if (flist->cursor != old_cursor) {
-                /* No scrolling, but cursor has moved */
-                ui_file_list_entry_paint(old_cursor, old_idx);
-                ui_file_list_entry_paint(flist->cursor, flist->cursor_idx);
-
-                (void) gfx_update(gc);
-        }
-}
-
-/** Scroll one entry up.
- *
- * @param flist File list
- */
-void ui_file_list_scroll_up(ui_file_list_t *flist)
-{
-        ui_file_list_entry_t *prev;
-
-        prev = ui_file_list_prev(flist->page);
-        if (prev == NULL)
-                return;
-
-        flist->page = prev;
-        assert(flist->page_idx > 0);
-        --flist->page_idx;
-
-        ui_file_list_scrollbar_update(flist);
-        (void) ui_file_list_paint(flist);
-}
-
-/** Scroll one entry down.
- *
- * @param flist File list
- */
-void ui_file_list_scroll_down(ui_file_list_t *flist)
-{
-        ui_file_list_entry_t *next;
-        ui_file_list_entry_t *pgend;
-        size_t i;
-        size_t rows;
-
-        next = ui_file_list_next(flist->page);
-        if (next == NULL)
-                return;
-
-        rows = ui_file_list_page_size(flist);
-
-        /* Find last page entry */
-        pgend = flist->page;
-        for (i = 0; i < rows && pgend != NULL; i++) {
-                pgend = ui_file_list_next(pgend);
-        }
-
-        /* Scroll down by one entry, if the page remains full */
-        if (pgend != NULL) {
-                flist->page = next;
-                ++flist->page_idx;
-        }
-
-        ui_file_list_scrollbar_update(flist);
-        (void) ui_file_list_paint(flist);
-}
-
-/** Scroll one page up.
- *
- * @param flist File list
- */
-void ui_file_list_scroll_page_up(ui_file_list_t *flist)
-{
-        ui_file_list_entry_t *prev;
-        size_t i;
-        size_t rows;
-
-        prev = ui_file_list_prev(flist->page);
-        if (prev == NULL)
-                return;
-
-        rows = ui_file_list_page_size(flist);
-
-        for (i = 0; i < rows && prev != NULL; i++) {
-                flist->page = prev;
-                assert(flist->page_idx > 0);
-                --flist->page_idx;
-                prev = ui_file_list_prev(prev);
-        }
-
-        ui_file_list_scrollbar_update(flist);
-        (void) ui_file_list_paint(flist);
-}
-
-/** Scroll one page down.
- *
- * @param flist File list
- */
-void ui_file_list_scroll_page_down(ui_file_list_t *flist)
-{
-        ui_file_list_entry_t *next;
-        ui_file_list_entry_t *pgend;
-        size_t i;
-        size_t rows;
-
-        next = ui_file_list_next(flist->page);
-        if (next == NULL)
-                return;
-
-        rows = ui_file_list_page_size(flist);
-
-        /* Find last page entry */
-        pgend = flist->page;
-        for (i = 0; i < rows && pgend != NULL; i++) {
-                pgend = ui_file_list_next(pgend);
-        }
-
-        /* Scroll by up to 'rows' entries, keeping the page full */
-        for (i = 0; i < rows && pgend != NULL; i++) {
-                flist->page = next;
-                ++flist->page_idx;
-                next = ui_file_list_next(next);
-                pgend = ui_file_list_next(pgend);
-        }
-
-        ui_file_list_scrollbar_update(flist);
-        (void) ui_file_list_paint(flist);
-}
-
-/** Scroll to a specific entry
- *
- * @param flist File list
- * @param page_idx New index of first entry on the page
- */
-void ui_file_list_scroll_pos(ui_file_list_t *flist, size_t page_idx)
-{
-        ui_file_list_entry_t *entry;
-        size_t i;
-
-        entry = ui_file_list_first(flist);
-        for (i = 0; i < page_idx; i++) {
-                entry = ui_file_list_next(entry);
-                assert(entry != NULL);
-        }
-
-        flist->page = entry;
-        flist->page_idx = page_idx;
-
-        (void) ui_file_list_paint(flist);
+        return (ui_file_list_entry_t *)ui_list_entry_get_arg(entry);
 }
 
@@ -1487 +565 @@
     ui_file_list_entry_t *entry)
 {
-        gfx_context_t *gc = ui_window_get_gc(flist->window);
         char *dirname;
         errno_t rc;
@@ -1515 +592 @@
                 return rc;
 
-        return gfx_update(gc);
+        return EOK;
 }
 
@@ -1557 +634 @@
 }
 
-/** File list scrollbar up button pressed.
- *
- * @param scrollbar Scrollbar
+/** Paint file list.
+ *
+ * @param flist File list
+ * @return EOK on success or an error code.
+ */
+errno_t ui_file_list_paint(ui_file_list_t *flist)
+{
+        return ui_control_paint(ui_list_ctl(flist->list));
+}
+
+/** Destroy file list control.
+ *
+ * @param arg Argument (ui_list_t *)
+ */
+void ui_file_list_ctl_destroy(void *arg)
+{
+        ui_file_list_t *flist = (ui_file_list_t *) arg;
+
+        ui_file_list_destroy(flist);
+}
+
+/** Paint file list control.
+ *
  * @param arg Argument (ui_file_list_t *)
- */
-static void ui_file_list_scrollbar_up(ui_scrollbar_t *scrollbar, void *arg)
+ * @return EOK on success or an error code
+ */
+errno_t ui_file_list_ctl_paint(void *arg)
+{
+        ui_file_list_t *flist = (ui_file_list_t *) arg;
+
+        return ui_file_list_paint(flist);
+}
+
+/** Handle file list control keyboard event.
+ *
+ * @param arg Argument (ui_file_list_t *)
+ * @param kbd_event Keyboard event
+ * @return @c ui_claimed iff the event is claimed
+ */
+ui_evclaim_t ui_file_list_ctl_kbd_event(void *arg, kbd_event_t *event)
+{
+        ui_file_list_t *flist = (ui_file_list_t *) arg;
+
+        return ui_control_kbd_event(ui_list_ctl(flist->list), event);
+}
+
+/** Handle file list control position event.
+ *
+ * @param arg Argument (ui_file_list_t *)
+ * @param pos_event Position event
+ * @return @c ui_claimed iff the event is claimed
+ */
+ui_evclaim_t ui_file_list_ctl_pos_event(void *arg, pos_event_t *event)
+{
+        ui_file_list_t *flist = (ui_file_list_t *) arg;
+
+        return ui_control_pos_event(ui_list_ctl(flist->list), event);
+}
+
+/** Activate request callback handler for UI list within file list.
+ *
+ * @param list UI list
+ * @param arg Argument (File list)
+ */
+static void ui_file_list_list_activate_req(ui_list_t *list, void *arg)
 {
         ui_file_list_t *flist = (ui_file_list_t *)arg;
-        ui_file_list_scroll_up(flist);
-}
-
-/** File list scrollbar down button pressed.
- *
- * @param scrollbar Scrollbar
- * @param arg Argument (ui_file_list_t *)
- */
-static void ui_file_list_scrollbar_down(ui_scrollbar_t *scrollbar, void *arg)
-{
-        ui_file_list_t *flist = (ui_file_list_t *)arg;
-        ui_file_list_scroll_down(flist);
-}
-
-/** File list scrollbar page up pressed.
- *
- * @param scrollbar Scrollbar
- * @param arg Argument (ui_file_list_t *)
- */
-static void ui_file_list_scrollbar_page_up(ui_scrollbar_t *scrollbar, void *arg)
-{
-        ui_file_list_t *flist = (ui_file_list_t *)arg;
-        ui_file_list_scroll_page_up(flist);
-}
-
-/** File list scrollbar page down pressed.
- *
- * @param scrollbar Scrollbar
- * @param arg Argument (ui_file_list_t *)
- */
-static void ui_file_list_scrollbar_page_down(ui_scrollbar_t *scrollbar,
-    void *arg)
-{
-        ui_file_list_t *flist = (ui_file_list_t *)arg;
-        ui_file_list_scroll_page_down(flist);
-}
-
-/** File list scrollbar moved.
- *
- * @param scrollbar Scrollbar
- * @param arg Argument (ui_file_list_t *)
- */
-static void ui_file_list_scrollbar_moved(ui_scrollbar_t *scrollbar, void *arg,
-    gfx_coord_t pos)
-{
-        ui_file_list_t *flist = (ui_file_list_t *)arg;
-        size_t entries;
-        size_t pglen;
-        size_t sbar_len;
-        size_t pgstart;
-
-        entries = list_count(&flist->entries);
-        pglen = ui_file_list_page_size(flist);
-        sbar_len = ui_scrollbar_move_length(flist->scrollbar);
-
-        if (entries > pglen)
-                pgstart = (entries - pglen) * pos / (sbar_len - 1);
-        else
-                pgstart = 0;
-
-        ui_file_list_scroll_pos(flist, pgstart);
+
+        ui_file_list_activate_req(flist);
+}
+
+/** Entry selected callback handler for UI list within file list.
+ *
+ * @param entr Activated UI list entry
+ * @param arg Argument (File list entry)
+ */
+static void ui_file_list_list_selected(ui_list_entry_t *entry, void *arg)
+{
+        ui_file_list_entry_t *fentry = (void *)arg;
+
+        (void) ui_file_list_open(fentry->flist, fentry);
 }
 

uspace/lib/ui/test/filelist.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +37 @@
 #include <vfs/vfs.h>
 #include "../private/filelist.h"
+#include "../private/list.h"
 
 PCUT_INIT;
@@ -117 +118 @@
 }
 
-/** ui_file_list_entry_height() gives the correct height */
-PCUT_TEST(entry_height)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        errno_t rc;
-        gfx_coord_t height;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        /* Font height is 13, padding: 2 (top) + 2 (bottom) */
-        height = ui_file_list_entry_height(flist);
-        PCUT_ASSERT_INT_EQUALS(17, height);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** Test ui_file_list_entry_paint() */
-PCUT_TEST(entry_paint)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_attr_t attr;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_file_list_entry_attr_init(&attr);
-        attr.name = "a";
-        attr.size = 1;
-
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_entry_paint(ui_file_list_first(flist), 0);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
 /** Test ui_file_list_paint() */
 PCUT_TEST(paint)
@@ -238 +171 @@
         control = ui_file_list_ctl(flist);
         PCUT_ASSERT_NOT_NULL(control);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** Test ui_file_list_kbd_event() */
-PCUT_TEST(kbd_event)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_evclaim_t claimed;
-        kbd_event_t event;
-        errno_t rc;
-
-        /* Active file list should claim events */
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        event.type = KEY_PRESS;
-        event.key = KC_ESCAPE;
-        event.mods = 0;
-        event.c = '\0';
-
-        claimed = ui_file_list_kbd_event(flist, &event);
-        PCUT_ASSERT_EQUALS(ui_claimed, claimed);
-
-        ui_file_list_destroy(flist);
-
-        /* Inactive file list should not claim events */
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, false, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        event.type = KEY_PRESS;
-        event.key = KC_ESCAPE;
-        event.mods = 0;
-        event.c = '\0';
-
-        claimed = ui_file_list_kbd_event(flist, &event);
-        PCUT_ASSERT_EQUALS(ui_unclaimed, claimed);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** Test ui_file_list_pos_event() */
-PCUT_TEST(pos_event)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_evclaim_t claimed;
-        pos_event_t event;
-        gfx_rect_t rect;
-        ui_file_list_entry_attr_t attr;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 10;
-        rect.p0.y = 20;
-        rect.p1.x = 50;
-        rect.p1.y = 220;
-
-        ui_file_list_set_rect(flist, &rect);
-
-        ui_file_list_entry_attr_init(&attr);
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "c";
-        attr.size = 3;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        flist->cursor = ui_file_list_first(flist);
-        flist->cursor_idx = 0;
-        flist->page = ui_file_list_first(flist);
-        flist->page_idx = 0;
-
-        event.pos_id = 0;
-        event.type = POS_PRESS;
-        event.btn_num = 1;
-
-        /* Clicking on the middle entry should select it */
-        event.hpos = 20;
-        event.vpos = 40;
-
-        claimed = ui_file_list_pos_event(flist, &event);
-        PCUT_ASSERT_EQUALS(ui_claimed, claimed);
-
-        PCUT_ASSERT_NOT_NULL(flist->cursor);
-        PCUT_ASSERT_STR_EQUALS("b", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(2, flist->cursor->size);
-
-        /* Clicking on the top edge should do a page-up */
-        event.hpos = 20;
-        event.vpos = 20;
-        claimed = ui_file_list_pos_event(flist, &event);
-        PCUT_ASSERT_EQUALS(ui_claimed, claimed);
-
-        PCUT_ASSERT_NOT_NULL(flist->cursor);
-        PCUT_ASSERT_STR_EQUALS("a", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor->size);
 
         ui_file_list_destroy(flist);
@@ -417 +205 @@
 
         ui_file_list_set_rect(flist, &rect);
-        PCUT_ASSERT_INT_EQUALS(rect.p0.x, flist->rect.p0.x);
-        PCUT_ASSERT_INT_EQUALS(rect.p0.y, flist->rect.p0.y);
-        PCUT_ASSERT_INT_EQUALS(rect.p1.x, flist->rect.p1.x);
-        PCUT_ASSERT_INT_EQUALS(rect.p1.y, flist->rect.p1.y);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_page_size() returns correct size */
-PCUT_TEST(page_size)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        gfx_rect_t rect;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 10;
-        rect.p0.y = 20;
-        rect.p1.x = 50;
-        rect.p1.y = 220;
-
-        ui_file_list_set_rect(flist, &rect);
-
-        /* NOTE If page size changes, we have problems elsewhere in the tests */
-        PCUT_ASSERT_INT_EQUALS(11, ui_file_list_page_size(flist));
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_inside_rect() gives correct interior rectangle */
-PCUT_TEST(inside_rect)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        gfx_rect_t rect;
-        gfx_rect_t irect;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 10;
-        rect.p0.y = 20;
-        rect.p1.x = 50;
-        rect.p1.y = 220;
-
-        ui_file_list_set_rect(flist, &rect);
-
-        ui_file_list_inside_rect(flist, &irect);
-        PCUT_ASSERT_INT_EQUALS(10 + 2, irect.p0.x);
-        PCUT_ASSERT_INT_EQUALS(20 + 2, irect.p0.y);
-        PCUT_ASSERT_INT_EQUALS(50 - 2 - 23, irect.p1.x);
-        PCUT_ASSERT_INT_EQUALS(220 - 2, irect.p1.y);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_scrollbar_rect() gives correct scrollbar rectangle */
-PCUT_TEST(scrollbar_rect)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        gfx_rect_t rect;
-        gfx_rect_t srect;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 10;
-        rect.p0.y = 20;
-        rect.p1.x = 50;
-        rect.p1.y = 220;
-
-        ui_file_list_set_rect(flist, &rect);
-
-        ui_file_list_scrollbar_rect(flist, &srect);
-        PCUT_ASSERT_INT_EQUALS(50 - 2 - 23, srect.p0.x);
-        PCUT_ASSERT_INT_EQUALS(20 + 2, srect.p0.y);
-        PCUT_ASSERT_INT_EQUALS(50 - 2, srect.p1.x);
-        PCUT_ASSERT_INT_EQUALS(220 - 2, srect.p1.y);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_scrollbar_update() updates scrollbar position */
-PCUT_TEST(scrollbar_update)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        gfx_rect_t rect;
+        PCUT_ASSERT_INT_EQUALS(rect.p0.x, flist->list->rect.p0.x);
+        PCUT_ASSERT_INT_EQUALS(rect.p0.y, flist->list->rect.p0.y);
+        PCUT_ASSERT_INT_EQUALS(rect.p1.x, flist->list->rect.p1.x);
+        PCUT_ASSERT_INT_EQUALS(rect.p1.y, flist->list->rect.p1.y);
+
+        ui_file_list_destroy(flist);
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
+/** ui_file_list_is_active() returns file list activity state */
+PCUT_TEST(is_active)
+{
+        ui_t *ui;
+        ui_window_t *window;
+        ui_wnd_params_t params;
+        ui_file_list_t *flist;
+        errno_t rc;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Test";
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_file_list_create(window, true, &flist);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_TRUE(ui_file_list_is_active(flist));
+        ui_file_list_destroy(flist);
+
+        rc = ui_file_list_create(window, false, &flist);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_FALSE(ui_file_list_is_active(flist));
+        ui_file_list_destroy(flist);
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
+/** ui_file_list_activate() activates file list */
+PCUT_TEST(activate)
+{
+        ui_t *ui;
+        ui_window_t *window;
+        ui_wnd_params_t params;
+        ui_file_list_t *flist;
+        errno_t rc;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Test";
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_file_list_create(window, false, &flist);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_FALSE(ui_file_list_is_active(flist));
+        rc = ui_file_list_activate(flist);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_TRUE(ui_file_list_is_active(flist));
+
+        ui_file_list_destroy(flist);
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
+/** ui_file_list_deactivate() deactivates file list */
+PCUT_TEST(deactivate)
+{
+        ui_t *ui;
+        ui_window_t *window;
+        ui_wnd_params_t params;
+        ui_file_list_t *flist;
+        errno_t rc;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Test";
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_file_list_create(window, true, &flist);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_TRUE(ui_file_list_is_active(flist));
+        ui_file_list_deactivate(flist);
+        PCUT_ASSERT_FALSE(ui_file_list_is_active(flist));
+
+        ui_file_list_destroy(flist);
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
+/** ui_file_list_entry_append() appends new entry */
+PCUT_TEST(entry_append)
+{
+        ui_t *ui;
+        ui_window_t *window;
+        ui_wnd_params_t params;
+        ui_file_list_t *flist;
         ui_file_list_entry_attr_t attr;
+        errno_t rc;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Test";
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_file_list_create(window, true, &flist);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_file_list_entry_attr_init(&attr);
+
+        attr.name = "a";
+        attr.size = 1;
+        rc = ui_file_list_entry_append(flist, &attr);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_INT_EQUALS(1, ui_list_entries_cnt(flist->list));
+
+        attr.name = "b";
+        attr.size = 2;
+        rc = ui_file_list_entry_append(flist, &attr);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_INT_EQUALS(2, ui_list_entries_cnt(flist->list));
+
+        ui_file_list_destroy(flist);
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
+/** ui_file_list_entry_delete() deletes entry */
+PCUT_TEST(entry_delete)
+{
+        ui_t *ui;
+        ui_window_t *window;
+        ui_wnd_params_t params;
+        ui_file_list_t *flist;
         ui_file_list_entry_t *entry;
-        gfx_coord_t pos;
-        gfx_coord_t move_len;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = 50;
-        rect.p1.y = 38;
-
-        ui_file_list_set_rect(flist, &rect);
+        ui_file_list_entry_attr_t attr;
+        errno_t rc;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Test";
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_file_list_create(window, true, &flist);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        attr.name = "a";
+        attr.size = 1;
+        rc = ui_file_list_entry_append(flist, &attr);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        attr.name = "b";
+        attr.size = 2;
+        rc = ui_file_list_entry_append(flist, &attr);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_INT_EQUALS(2, ui_list_entries_cnt(flist->list));
+
+        entry = ui_file_list_first(flist);
+        ui_file_list_entry_delete(entry);
+
+        PCUT_ASSERT_INT_EQUALS(1, ui_list_entries_cnt(flist->list));
+
+        entry = ui_file_list_first(flist);
+        ui_file_list_entry_delete(entry);
+
+        PCUT_ASSERT_INT_EQUALS(0, ui_list_entries_cnt(flist->list));
+
+        ui_file_list_destroy(flist);
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
+/** ui_file_list_clear_entries() removes all entries from file list */
+PCUT_TEST(clear_entries)
+{
+        ui_t *ui;
+        ui_window_t *window;
+        ui_wnd_params_t params;
+        ui_file_list_t *flist;
+        ui_file_list_entry_attr_t attr;
+        errno_t rc;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Test";
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_file_list_create(window, true, &flist);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
         ui_file_list_entry_attr_init(&attr);
@@ -585 +428 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "c";
-        attr.size = 3;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        entry = ui_file_list_next(ui_file_list_first(flist));
-
-        flist->cursor = entry;
-        flist->cursor_idx = 1;
-        flist->page = entry;
-        flist->page_idx = 1;
-
-        ui_file_list_scrollbar_update(flist);
-
-        /* Now scrollbar thumb should be all the way down */
-        move_len = ui_scrollbar_move_length(flist->scrollbar);
-        pos = ui_scrollbar_get_pos(flist->scrollbar);
-        PCUT_ASSERT_INT_EQUALS(move_len, pos);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_is_active() returns file list activity state */
-PCUT_TEST(is_active)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_TRUE(ui_file_list_is_active(flist));
-        ui_file_list_destroy(flist);
-
-        rc = ui_file_list_create(window, false, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_FALSE(ui_file_list_is_active(flist));
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_activate() activates file list */
-PCUT_TEST(activate)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, false, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        PCUT_ASSERT_FALSE(ui_file_list_is_active(flist));
-        rc = ui_file_list_activate(flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-        PCUT_ASSERT_TRUE(ui_file_list_is_active(flist));
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_deactivate() deactivates file list */
-PCUT_TEST(deactivate)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        PCUT_ASSERT_TRUE(ui_file_list_is_active(flist));
-        ui_file_list_deactivate(flist);
-        PCUT_ASSERT_FALSE(ui_file_list_is_active(flist));
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_entry_append() appends new entry */
-PCUT_TEST(entry_append)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_attr_t attr;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_file_list_entry_attr_init(&attr);
-
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        PCUT_ASSERT_INT_EQUALS(1, list_count(&flist->entries));
-
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        PCUT_ASSERT_INT_EQUALS(2, list_count(&flist->entries));
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_entry_delete() deletes entry */
-PCUT_TEST(entry_delete)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_t *entry;
-        ui_file_list_entry_attr_t attr;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        PCUT_ASSERT_INT_EQUALS(2, list_count(&flist->entries));
-
-        entry = ui_file_list_first(flist);
-        ui_file_list_entry_delete(entry);
-
-        PCUT_ASSERT_INT_EQUALS(1, list_count(&flist->entries));
-
-        entry = ui_file_list_first(flist);
-        ui_file_list_entry_delete(entry);
-
-        PCUT_ASSERT_INT_EQUALS(0, list_count(&flist->entries));
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_clear_entries() removes all entries from file list */
-PCUT_TEST(clear_entries)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_attr_t attr;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_file_list_entry_attr_init(&attr);
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
         attr.name = "a";
         attr.size = 2;
@@ -832 +433 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        PCUT_ASSERT_INT_EQUALS(2, list_count(&flist->entries));
+        PCUT_ASSERT_INT_EQUALS(2, ui_list_entries_cnt(flist->list));
 
         ui_file_list_clear_entries(flist);
-        PCUT_ASSERT_INT_EQUALS(0, list_count(&flist->entries));
+        PCUT_ASSERT_INT_EQUALS(0, ui_list_entries_cnt(flist->list));
 
         ui_file_list_destroy(flist);
@@ -892 +493 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        PCUT_ASSERT_INT_EQUALS(2, list_count(&flist->entries));
+        PCUT_ASSERT_INT_EQUALS(2, ui_list_entries_cnt(flist->list));
 
         entry = ui_file_list_first(flist);
@@ -979 +580 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        PCUT_ASSERT_NOT_NULL(flist->cursor);
-        PCUT_ASSERT_STR_EQUALS("b", flist->cursor->name);
+        PCUT_ASSERT_NOT_NULL(ui_file_list_get_cursor(flist));
+        PCUT_ASSERT_STR_EQUALS("b", ui_file_list_get_cursor(flist)->name);
 
         ui_file_list_destroy(flist);
@@ -1064 +665 @@
 }
 
-/** ui_file_list_entry_ptr_cmp compares two indirectly referenced entries */
-PCUT_TEST(entry_ptr_cmp)
+/** ui_file_list_list_compare compares two file list entries */
+PCUT_TEST(list_compare)
 {
         ui_t *ui;
@@ -1106 +707 @@
 
         /* a < b */
-        rel = ui_file_list_entry_ptr_cmp(&a, &b);
+        rel = ui_file_list_list_compare(a->entry, b->entry);
         PCUT_ASSERT_TRUE(rel < 0);
 
         /* b > a */
-        rel = ui_file_list_entry_ptr_cmp(&b, &a);
+        rel = ui_file_list_list_compare(b->entry, a->entry);
         PCUT_ASSERT_TRUE(rel > 0);
 
         /* a == a */
-        rel = ui_file_list_entry_ptr_cmp(&a, &a);
+        rel = ui_file_list_list_compare(a->entry, a->entry);
         PCUT_ASSERT_INT_EQUALS(0, rel);
 
@@ -1120 +721 @@
         ui_window_destroy(window);
         ui_destroy(ui);
+}
+
+/** ui_file_list_entry_attr_init() initializes file list attribute structure */
+PCUT_TEST(entry_attr_init)
+{
+        ui_file_list_entry_attr_t attr;
+
+        ui_file_list_entry_attr_init(&attr);
+        PCUT_ASSERT_NULL(attr.name);
+        PCUT_ASSERT_INT_EQUALS(0, attr.size);
+        PCUT_ASSERT_EQUALS(false, attr.isdir);
+        PCUT_ASSERT_INT_EQUALS(0, attr.svc);
 }
 
@@ -1354 +967 @@
 }
 
-/** ui_file_list_page_nth_entry() .. */
-PCUT_TEST(page_nth_entry)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_t *entry;
-        ui_file_list_entry_attr_t attr;
-        gfx_rect_t rect;
-        size_t idx;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_file_list_entry_attr_init(&attr);
-
-        /* Add some entries */
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "c";
-        attr.size = 3;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        flist->page = ui_file_list_next(ui_file_list_first(flist));
-        flist->page_idx = 1;
-
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = 100;
-        rect.p1.y = 100;
-        ui_file_list_set_rect(flist, &rect);
-
-        entry = ui_file_list_page_nth_entry(flist, 0, &idx);
-        PCUT_ASSERT_NOT_NULL(entry);
-        PCUT_ASSERT_STR_EQUALS("b", entry->name);
-        PCUT_ASSERT_INT_EQUALS(1, idx);
-
-        entry = ui_file_list_page_nth_entry(flist, 1, &idx);
-        PCUT_ASSERT_NOT_NULL(entry);
-        PCUT_ASSERT_STR_EQUALS("c", entry->name);
-        PCUT_ASSERT_INT_EQUALS(2, idx);
-
-        entry = ui_file_list_page_nth_entry(flist, 2, &idx);
-        PCUT_ASSERT_NULL(entry);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_cursor_move() moves cursor and scrolls */
-PCUT_TEST(cursor_move)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_attr_t attr;
-        gfx_rect_t rect;
-        errno_t rc;
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = 10;
-        rect.p1.y = 38; /* Assuming this makes page size 2 */
-        ui_file_list_set_rect(flist, &rect);
-
-        PCUT_ASSERT_INT_EQUALS(2, ui_file_list_page_size(flist));
-
-        /* Add tree entries (more than page size, which is 2) */
-
-        ui_file_list_entry_attr_init(&attr);
-
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "c";
-        attr.size = 3;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        /* Cursor to the last entry and page start to the next-to-last entry */
-        flist->cursor = ui_file_list_last(flist);
-        flist->cursor_idx = 2;
-        flist->page = ui_file_list_prev(flist->cursor);
-        flist->page_idx = 1;
-
-        /* Move cursor one entry up */
-        ui_file_list_cursor_move(flist, ui_file_list_prev(flist->cursor),
-            flist->cursor_idx - 1);
-
-        /* Cursor and page start should now both be at the second entry */
-        PCUT_ASSERT_STR_EQUALS("b", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(2, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor_idx);
-        PCUT_ASSERT_EQUALS(flist->cursor, flist->page);
-        PCUT_ASSERT_INT_EQUALS(1, flist->page_idx);
-
-        /* Move cursor to the first entry. This should scroll up. */
-        ui_file_list_cursor_move(flist, ui_file_list_first(flist), 0);
-
-        /* Cursor and page start should now both be at the first entry */
-        PCUT_ASSERT_STR_EQUALS("a", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->cursor_idx);
-        PCUT_ASSERT_EQUALS(flist->cursor, flist->page);
-        PCUT_ASSERT_INT_EQUALS(0, flist->page_idx);
-
-        /* Move cursor to the last entry. */
-        ui_file_list_cursor_move(flist, ui_file_list_last(flist), 2);
-
-        /* Cursor should be on the last entry and page on the next to last */
-        PCUT_ASSERT_STR_EQUALS("c", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(3, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(2, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("b", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(2, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(1, flist->page_idx);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_cursor_up() moves cursor one entry up */
-PCUT_TEST(cursor_up)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_attr_t attr;
-        gfx_rect_t rect;
-        errno_t rc;
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = 10;
-        rect.p1.y = 38; /* Assuming this makes page size 2 */
-        ui_file_list_set_rect(flist, &rect);
-
-        PCUT_ASSERT_INT_EQUALS(2, ui_file_list_page_size(flist));
-
-        /* Add tree entries (more than page size, which is 2) */
-
-        ui_file_list_entry_attr_init(&attr);
-
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "c";
-        attr.size = 3;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        /* Cursor to the last entry and page start to the next-to-last entry */
-        flist->cursor = ui_file_list_last(flist);
-        flist->cursor_idx = 2;
-        flist->page = ui_file_list_prev(flist->cursor);
-        flist->page_idx = 1;
-
-        /* Move cursor one entry up */
-        ui_file_list_cursor_up(flist);
-
-        /* Cursor and page start should now both be at the second entry */
-        PCUT_ASSERT_STR_EQUALS("b", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(2, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor_idx);
-        PCUT_ASSERT_EQUALS(flist->cursor, flist->page);
-        PCUT_ASSERT_INT_EQUALS(1, flist->page_idx);
-
-        /* Move cursor one entry up. This should scroll up. */
-        ui_file_list_cursor_up(flist);
-
-        /* Cursor and page start should now both be at the first entry */
-        PCUT_ASSERT_STR_EQUALS("a", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->cursor_idx);
-        PCUT_ASSERT_EQUALS(flist->cursor, flist->page);
-        PCUT_ASSERT_INT_EQUALS(0, flist->page_idx);
-
-        /* Moving further up should do nothing (we are at the top). */
-        ui_file_list_cursor_up(flist);
-
-        /* Cursor and page start should still be at the first entry */
-        PCUT_ASSERT_STR_EQUALS("a", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->cursor_idx);
-        PCUT_ASSERT_EQUALS(flist->cursor, flist->page);
-        PCUT_ASSERT_INT_EQUALS(0, flist->page_idx);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_cursor_down() moves cursor one entry down */
-PCUT_TEST(cursor_down)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_attr_t attr;
-        gfx_rect_t rect;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = 10;
-        rect.p1.y = 38; /* Assuming this makes page size 2 */
-        ui_file_list_set_rect(flist, &rect);
-
-        PCUT_ASSERT_INT_EQUALS(2, ui_file_list_page_size(flist));
-
-        /* Add tree entries (more than page size, which is 2) */
-
-        ui_file_list_entry_attr_init(&attr);
-
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "c";
-        attr.size = 3;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        /* Cursor and page start to the first entry */
-        flist->cursor = ui_file_list_first(flist);
-        flist->cursor_idx = 0;
-        flist->page = flist->cursor;
-        flist->page_idx = 0;
-
-        /* Move cursor one entry down */
-        ui_file_list_cursor_down(flist);
-
-        /* Cursor should now be at the second entry, page stays the same */
-        PCUT_ASSERT_STR_EQUALS("b", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(2, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor_idx);
-        PCUT_ASSERT_EQUALS(ui_file_list_first(flist), flist->page);
-        PCUT_ASSERT_INT_EQUALS(0, flist->page_idx);
-
-        /* Move cursor one entry down. This should scroll down. */
-        ui_file_list_cursor_down(flist);
-
-        /* Cursor should now be at the third and page at the second entry. */
-        PCUT_ASSERT_STR_EQUALS("c", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(3, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(2, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("b", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(2, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(1, flist->page_idx);
-
-        /* Moving further down should do nothing (we are at the bottom). */
-        ui_file_list_cursor_down(flist);
-
-        /* Cursor should still be at the third and page at the second entry. */
-        PCUT_ASSERT_STR_EQUALS("c", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(3, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(2, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("b", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(2, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(1, flist->page_idx);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_cursor_top() moves cursor to the first entry */
-PCUT_TEST(cursor_top)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_attr_t attr;
-        gfx_rect_t rect;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = 10;
-        rect.p1.y = 38; /* Assuming this makes page size 2 */
-        ui_file_list_set_rect(flist, &rect);
-
-        PCUT_ASSERT_INT_EQUALS(2, ui_file_list_page_size(flist));
-
-        /* Add tree entries (more than page size, which is 2) */
-
-        ui_file_list_entry_attr_init(&attr);
-
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "c";
-        attr.size = 3;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        /* Cursor to the last entry and page start to the next-to-last entry */
-        flist->cursor = ui_file_list_last(flist);
-        flist->cursor_idx = 2;
-        flist->page = ui_file_list_prev(flist->cursor);
-        flist->page_idx = 1;
-
-        /* Move cursor to the top. This should scroll up. */
-        ui_file_list_cursor_top(flist);
-
-        /* Cursor and page start should now both be at the first entry */
-        PCUT_ASSERT_STR_EQUALS("a", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->cursor_idx);
-        PCUT_ASSERT_EQUALS(flist->cursor, flist->page);
-        PCUT_ASSERT_INT_EQUALS(0, flist->page_idx);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_cursor_bottom() moves cursor to the last entry */
-PCUT_TEST(cursor_bottom)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_attr_t attr;
-        gfx_rect_t rect;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = 10;
-        rect.p1.y = 38; /* Assuming this makes page size 2 */
-        ui_file_list_set_rect(flist, &rect);
-
-        PCUT_ASSERT_INT_EQUALS(2, ui_file_list_page_size(flist));
-
-        /* Add tree entries (more than page size, which is 2) */
-
-        ui_file_list_entry_attr_init(&attr);
-
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "c";
-        attr.size = 3;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        /* Cursor and page start to the first entry */
-        flist->cursor = ui_file_list_first(flist);
-        flist->cursor_idx = 0;
-        flist->page = flist->cursor;
-        flist->page_idx = 0;
-
-        /* Move cursor to the bottom. This should scroll down. */
-        ui_file_list_cursor_bottom(flist);
-
-        /* Cursor should now be at the third and page at the second entry. */
-        PCUT_ASSERT_STR_EQUALS("c", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(3, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(2, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("b", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(2, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(1, flist->page_idx);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_page_up() moves one page up */
-PCUT_TEST(page_up)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_attr_t attr;
-        gfx_rect_t rect;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = 10;
-        rect.p1.y = 38; /* Assuming this makes page size 2 */
-        ui_file_list_set_rect(flist, &rect);
-
-        PCUT_ASSERT_INT_EQUALS(2, ui_file_list_page_size(flist));
-
-        /* Add five entries (2 full pages, one partial) */
-
-        ui_file_list_entry_attr_init(&attr);
-
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "c";
-        attr.size = 3;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "d";
-        attr.size = 4;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "e";
-        attr.size = 5;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        /* Cursor to the last entry and page start to the next-to-last entry */
-        flist->cursor = ui_file_list_last(flist);
-        flist->cursor_idx = 4;
-        flist->page = ui_file_list_prev(flist->cursor);
-        flist->page_idx = 3;
-
-        /* Move one page up */
-        ui_file_list_page_up(flist);
-
-        /* Page should now start at second entry and cursor at third */
-        PCUT_ASSERT_STR_EQUALS("c", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(3, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(2, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("b", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(2, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(1, flist->page_idx);
-
-        /* Move one page up again. */
-        ui_file_list_page_up(flist);
-
-        /* Cursor and page start should now both be at the first entry */
-        PCUT_ASSERT_STR_EQUALS("a", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->cursor_idx);
-        PCUT_ASSERT_EQUALS(flist->cursor, flist->page);
-        PCUT_ASSERT_INT_EQUALS(0, flist->page_idx);
-
-        /* Moving further up should do nothing (we are at the top). */
-        ui_file_list_page_up(flist);
-
-        /* Cursor and page start should still be at the first entry */
-        PCUT_ASSERT_STR_EQUALS("a", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->cursor_idx);
-        PCUT_ASSERT_EQUALS(flist->cursor, flist->page);
-        PCUT_ASSERT_INT_EQUALS(0, flist->page_idx);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_page_up() moves one page down */
-PCUT_TEST(page_down)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_attr_t attr;
-        gfx_rect_t rect;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = 10;
-        rect.p1.y = 38; /* Assuming this makes page size 2 */
-        ui_file_list_set_rect(flist, &rect);
-
-        PCUT_ASSERT_INT_EQUALS(2, ui_file_list_page_size(flist));
-
-        /* Add five entries (2 full pages, one partial) */
-
-        ui_file_list_entry_attr_init(&attr);
-
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "c";
-        attr.size = 3;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "d";
-        attr.size = 4;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "e";
-        attr.size = 5;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        /* Cursor and page to the first entry */
-        flist->cursor = ui_file_list_first(flist);
-        flist->cursor_idx = 0;
-        flist->page = flist->cursor;
-        flist->page_idx = 0;
-
-        /* Move one page down */
-        ui_file_list_page_down(flist);
-
-        /* Page and cursor should point to the third entry */
-        PCUT_ASSERT_STR_EQUALS("c", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(3, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(2, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("c", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(3, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(2, flist->page_idx);
-
-        /* Move one page down again. */
-        ui_file_list_page_down(flist);
-
-        /* Cursor should point to last and page to next-to-last entry */
-        PCUT_ASSERT_STR_EQUALS("e", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(5, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(4, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("d", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(4, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(3, flist->page_idx);
-
-        /* Moving further down should do nothing (we are at the bottom). */
-        ui_file_list_page_down(flist);
-
-        /* Cursor should still point to last and page to next-to-last entry */
-        PCUT_ASSERT_STR_EQUALS("e", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(5, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(4, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("d", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(4, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(3, flist->page_idx);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_scroll_up() scrolls up by one row */
-PCUT_TEST(scroll_up)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_attr_t attr;
-        gfx_rect_t rect;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = 10;
-        rect.p1.y = 38; /* Assuming this makes page size 2 */
-        ui_file_list_set_rect(flist, &rect);
-
-        PCUT_ASSERT_INT_EQUALS(2, ui_file_list_page_size(flist));
-
-        /* Add tree entries (more than page size, which is 2) */
-
-        ui_file_list_entry_attr_init(&attr);
-
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "c";
-        attr.size = 3;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        /* Cursor to the last entry, page to the second */
-        flist->cursor = ui_file_list_last(flist);
-        flist->cursor_idx = 2;
-        flist->page = ui_file_list_prev(flist->cursor);
-        flist->page_idx = 1;
-
-        /* Scroll one entry up */
-        ui_file_list_scroll_up(flist);
-
-        /* Page should start on the first entry, cursor unchanged */
-        PCUT_ASSERT_STR_EQUALS("c", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(3, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(2, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("a", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->page_idx);
-
-        /* Try scrolling one more entry up */
-        ui_file_list_scroll_up(flist);
-
-        /* We were at the beginning, so nothing should have changed  */
-        PCUT_ASSERT_STR_EQUALS("c", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(3, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(2, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("a", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->page_idx);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_scroll_down() scrolls down by one row */
-PCUT_TEST(scroll_down)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_attr_t attr;
-        gfx_rect_t rect;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = 10;
-        rect.p1.y = 38; /* Assuming this makes page size 2 */
-        ui_file_list_set_rect(flist, &rect);
-
-        PCUT_ASSERT_INT_EQUALS(2, ui_file_list_page_size(flist));
-
-        /* Add tree entries (more than page size, which is 2) */
-
-        ui_file_list_entry_attr_init(&attr);
-
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "c";
-        attr.size = 3;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        /* Cursor and page start to the first entry */
-        flist->cursor = ui_file_list_first(flist);
-        flist->cursor_idx = 0;
-        flist->page = flist->cursor;
-        flist->page_idx = 0;
-
-        /* Scroll one entry down */
-        ui_file_list_scroll_down(flist);
-
-        /* Page should start on the second entry, cursor unchanged */
-        PCUT_ASSERT_STR_EQUALS("a", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("b", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(2, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(1, flist->page_idx);
-
-        /* Try scrolling one more entry down */
-        ui_file_list_scroll_down(flist);
-
-        /* We were at the end, so nothing should have changed  */
-        PCUT_ASSERT_STR_EQUALS("a", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("b", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(2, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(1, flist->page_idx);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_scroll_page_up() scrolls up by one page */
-PCUT_TEST(scroll_page_up)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_attr_t attr;
-        gfx_rect_t rect;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = 10;
-        rect.p1.y = 38; /* Assuming this makes page size 2 */
-        ui_file_list_set_rect(flist, &rect);
-
-        PCUT_ASSERT_INT_EQUALS(2, ui_file_list_page_size(flist));
-
-        /* Add five entries (more than twice the page size, which is 2) */
-
-        ui_file_list_entry_attr_init(&attr);
-
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "c";
-        attr.size = 3;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "d";
-        attr.size = 4;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "e";
-        attr.size = 5;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        /* Cursor to the last entry, page to the second last */
-        flist->cursor = ui_file_list_last(flist);
-        flist->cursor_idx = 4;
-        flist->page = ui_file_list_prev(flist->cursor);
-        flist->page_idx = 3;
-
-        /* Scroll one page up */
-        ui_file_list_scroll_page_up(flist);
-
-        /* Page should start on 'b', cursor unchanged */
-        PCUT_ASSERT_STR_EQUALS("e", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(5, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(4, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("b", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(2, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(1, flist->page_idx);
-
-        /* Page up again */
-        ui_file_list_scroll_page_up(flist);
-
-        /* Page should now be at the beginning, cursor unchanged */
-        PCUT_ASSERT_STR_EQUALS("e", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(5, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(4, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("a", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->page_idx);
-
-        /* Page up again */
-        ui_file_list_scroll_page_up(flist);
-
-        /* We were at the beginning, nothing should have changed */
-        PCUT_ASSERT_STR_EQUALS("e", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(5, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(4, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("a", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->page_idx);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-/** ui_file_list_scroll_page_up() scrolls down by one page */
-PCUT_TEST(scroll_page_down)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_attr_t attr;
-        gfx_rect_t rect;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = 10;
-        rect.p1.y = 38; /* Assuming this makes page size 2 */
-        ui_file_list_set_rect(flist, &rect);
-
-        PCUT_ASSERT_INT_EQUALS(2, ui_file_list_page_size(flist));
-
-        /* Add five entries (more than twice the page size, which is 2) */
-
-        ui_file_list_entry_attr_init(&attr);
-
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "c";
-        attr.size = 3;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "d";
-        attr.size = 4;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "e";
-        attr.size = 5;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        /* Cursor and page to the first entry */
-        flist->cursor = ui_file_list_first(flist);
-        flist->cursor_idx = 0;
-        flist->page = ui_file_list_first(flist);
-        flist->page_idx = 0;
-
-        /* Scroll one page down */
-        ui_file_list_scroll_page_down(flist);
-
-        /* Page should start on 'c', cursor unchanged */
-        PCUT_ASSERT_STR_EQUALS("a", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("c", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(3, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(2, flist->page_idx);
-
-        /* Page down again */
-        ui_file_list_scroll_page_down(flist);
-
-        /* Page should now start at 'd', cursor unchanged */
-        PCUT_ASSERT_STR_EQUALS("a", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("d", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(4, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(3, flist->page_idx);
-
-        /* Page down again */
-        ui_file_list_scroll_page_down(flist);
-
-        /* We were at the end, nothing should have changed */
-        PCUT_ASSERT_STR_EQUALS("a", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("d", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(4, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(3, flist->page_idx);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
-PCUT_TEST(scroll_pos)
-{
-        ui_t *ui;
-        ui_window_t *window;
-        ui_wnd_params_t params;
-        ui_file_list_t *flist;
-        ui_file_list_entry_attr_t attr;
-        gfx_rect_t rect;
-        errno_t rc;
-
-        rc = ui_create_disp(NULL, &ui);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        ui_wnd_params_init(&params);
-        params.caption = "Test";
-
-        rc = ui_window_create(ui, &params, &window);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rc = ui_file_list_create(window, true, &flist);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        rect.p0.x = 0;
-        rect.p0.y = 0;
-        rect.p1.x = 10;
-        rect.p1.y = 38; /* Assuming this makes page size 2 */
-        ui_file_list_set_rect(flist, &rect);
-
-        PCUT_ASSERT_INT_EQUALS(2, ui_file_list_page_size(flist));
-
-        /* Add five entries (more than twice the page size, which is 2) */
-
-        ui_file_list_entry_attr_init(&attr);
-
-        attr.name = "a";
-        attr.size = 1;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "b";
-        attr.size = 2;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "c";
-        attr.size = 3;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "d";
-        attr.size = 4;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        attr.name = "e";
-        attr.size = 5;
-        rc = ui_file_list_entry_append(flist, &attr);
-        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
-
-        /* Cursor and page to the first entry */
-        flist->cursor = ui_file_list_first(flist);
-        flist->cursor_idx = 0;
-        flist->page = ui_file_list_first(flist);
-        flist->page_idx = 0;
-
-        /* Scroll to entry 1 (one down) */
-        ui_file_list_scroll_pos(flist, 1);
-
-        /* Page should start on 'b', cursor unchanged */
-        PCUT_ASSERT_STR_EQUALS("a", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("b", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(2, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(1, flist->page_idx);
-
-        /* Scroll to entry 3 (i.e. the end) */
-        ui_file_list_scroll_pos(flist, 3);
-
-        /* Page should now start at 'd', cursor unchanged */
-        PCUT_ASSERT_STR_EQUALS("a", flist->cursor->name);
-        PCUT_ASSERT_INT_EQUALS(1, flist->cursor->size);
-        PCUT_ASSERT_INT_EQUALS(0, flist->cursor_idx);
-        PCUT_ASSERT_STR_EQUALS("d", flist->page->name);
-        PCUT_ASSERT_INT_EQUALS(4, flist->page->size);
-        PCUT_ASSERT_INT_EQUALS(3, flist->page_idx);
-
-        ui_file_list_destroy(flist);
-        ui_window_destroy(window);
-        ui_destroy(ui);
-}
-
 /** ui_file_list_open_dir() opens a directory entry */
 PCUT_TEST(open_dir)
@@ -2559 +1012 @@
         PCUT_ASSERT_STR_EQUALS(p, flist->dir);
 
-        PCUT_ASSERT_INT_EQUALS(2, list_count(&flist->entries));
+        PCUT_ASSERT_INT_EQUALS(2, ui_list_entries_cnt(flist->list));
 
         entry = ui_file_list_first(flist);
@@ -2706 +1159 @@
 }
 
+/** ui_file_list_get_cursor() returns the current cursor position */
+PCUT_TEST(get_cursor)
+{
+        ui_t *ui;
+        ui_window_t *window;
+        ui_wnd_params_t params;
+        ui_file_list_t *flist;
+        ui_file_list_entry_attr_t attr;
+        ui_file_list_entry_t *entry;
+        ui_file_list_entry_t *cursor;
+        errno_t rc;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_wnd_params_init(&params);
+        params.caption = "Test";
+
+        rc = ui_window_create(ui, &params, &window);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_file_list_create(window, true, &flist);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_file_list_entry_attr_init(&attr);
+
+        /* Append entry */
+        attr.name = "a";
+        attr.size = 1;
+        rc = ui_file_list_entry_append(flist, &attr);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        entry = ui_file_list_first(flist);
+        PCUT_ASSERT_NOT_NULL(entry);
+
+        /* Cursor should be at the only entry */
+        cursor = ui_file_list_get_cursor(flist);
+        PCUT_ASSERT_EQUALS(entry, cursor);
+
+        ui_file_list_destroy(flist);
+        ui_window_destroy(window);
+        ui_destroy(ui);
+}
+
 static void test_file_list_activate_req(ui_file_list_t *flist, void *arg)
 {

uspace/lib/ui/test/main.c

@@ -41 +41 @@
 PCUT_IMPORT(image);
 PCUT_IMPORT(label);
+PCUT_IMPORT(list);
 PCUT_IMPORT(menu);
 PCUT_IMPORT(menubar);