Changeset aefdccd in mainline for uspace/lib/ui/src

Timestamp:

2025-10-20T06:14:54Z (3 months ago)

Author:

GitHub <noreply@…>

Parents:

adbd7e1 (diff), 3e41cc4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2025-10-20 06:14:54)

git-committer:

GitHub <noreply@…> (2025-10-20 06:14:54)

Message:

Merge branch 'HelenOS:master' into ticket/packet-capture

Location:

uspace/lib/ui/src

Files:

• filelist.c (modified) (3 diffs)
• list.c (modified) (2 diffs)
• msgdialog.c (modified) (4 diffs)
• ui.c (modified) (2 diffs)
• window.c (modified) (1 diff)

uspace/lib/ui/src/filelist.c

@@ -349 +349 @@
                 goto error;
         }
+
+        ui_file_list_clear_entries(flist);
 
         if (str_cmp(ndir, "/") != 0) {
@@ -422 +424 @@
 }
 
+/** Re-read file list from directory.
+ *
+ * @param flist File list
+ * @return EOK on success or an error code
+ */
+errno_t ui_file_list_refresh(ui_file_list_t *flist)
+{
+        errno_t rc;
+        ui_list_pos_t pos;
+
+        ui_list_save_pos(flist->list, &pos);
+        rc = ui_file_list_read_dir(flist, flist->dir);
+        if (rc != EOK)
+                return rc;
+        ui_list_restore_pos(flist->list, &pos);
+        return EOK;
+}
+
 /** Sort file list entries.
  *
@@ -593 +613 @@
                 return ENOMEM;
 
-        ui_file_list_clear_entries(flist);
-
         rc = ui_file_list_read_dir(flist, dirname);
         if (rc != EOK) {

uspace/lib/ui/src/list.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -1652 +1652 @@
 }
 
+/** Save list position for later.
+ *
+ * The position will be valid even if the list is cleaned and re-populated
+ * (it just counts position from the top.)
+ *
+ * @param list UI list
+ * @param pos Place to store position
+ */
+void ui_list_save_pos(ui_list_t *list, ui_list_pos_t *pos)
+{
+        pos->page_idx = list->page_idx;
+        pos->cursor_idx = list->cursor_idx;
+}
+
+/** Restore saved list position.
+ *
+ * The position will be valid even if the list is cleaned and re-populated
+ * (it just counts position from the top.)
+ *
+ * @param list UI list
+ * @param pos Saved list position
+ */
+void ui_list_restore_pos(ui_list_t *list, ui_list_pos_t *pos)
+{
+        size_t idx, i;
+        ui_list_entry_t *entry, *next;
+
+        idx = 0;
+        entry = ui_list_first(list);
+
+        for (i = 0; i < pos->cursor_idx; i++) {
+                next = ui_list_next(entry);
+                if (next != NULL) {
+                        entry = next;
+                        ++idx;
+                }
+        }
+
+        list->cursor = entry;
+        list->cursor_idx = idx;
+
+        idx = 0;
+        entry = ui_list_first(list);
+
+        for (i = 0; i < pos->page_idx; i++) {
+                next = ui_list_next(entry);
+                if (next != NULL) {
+                        entry = next;
+                        ++idx;
+                }
+        }
+
+        list->page = entry;
+        list->page_idx = idx;
+}
+
 /** @}
  */

uspace/lib/ui/src/msgdialog.c

@@ -285 +285 @@
         if (dialog->cb != NULL && dialog->cb->close != NULL)
                 dialog->cb->close(dialog, dialog->arg);
+        else
+                ui_msg_dialog_destroy(dialog);
 }
 
@@ -310 +312 @@
                                 dialog->cb->button(dialog, dialog->arg, 0);
                                 return;
+                        } else {
+                                ui_msg_dialog_destroy(dialog);
                         }
                 } else if (event->key == KC_ESCAPE) {
@@ -316 +320 @@
                                 dialog->cb->close(dialog, dialog->arg);
                                 return;
+                        } else {
+                                ui_msg_dialog_destroy(dialog);
                         }
                 }
@@ -337 +343 @@
                                 dialog->cb->button(dialog, dialog->arg, i);
                 }
+        } else {
+                ui_msg_dialog_destroy(dialog);
         }
 }

uspace/lib/ui/src/ui.c

@@ -412 +412 @@
         errno_t rc;
         gfx_context_t *gc;
-        ui_window_t *awnd;
+        ui_window_t *wnd;
         gfx_color_t *color = NULL;
 
@@ -439 +439 @@
         gfx_color_delete(color);
 
-        /* XXX Should repaint all windows */
-        awnd = ui_window_get_active(ui);
-        if (awnd == NULL)
-                return EOK;
-
-        rc = ui_wdecor_paint(awnd->wdecor);
-        if (rc != EOK)
-                return rc;
-
-        return ui_window_paint(awnd);
+        /* Repaint all windows */
+        wnd = ui_window_first(ui);
+        while (wnd != NULL) {
+                rc = ui_wdecor_paint(wnd->wdecor);
+                if (rc != EOK)
+                        return rc;
+
+                rc = ui_window_paint(wnd);
+                if (rc != EOK)
+                        return rc;
+
+                wnd = ui_window_next(wnd);
+        }
+
+        return EOK;
 }
 

uspace/lib/ui/src/window.c

@@ -617 +617 @@
 }
 
+/** Get first (lowermost) window (only valid in fullscreen mode).
+ *
+ * @param ui User interface
+ * @return First window
+ */
+ui_window_t *ui_window_first(ui_t *ui)
+{
+        link_t *link;
+
+        link = list_first(&ui->windows);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ui_window_t, lwindows);
+}
+
+/** Get next window (only valid in fullscreen mode).
+ *
+ * @param cur Current window
+ * @return First window
+ */
+ui_window_t *ui_window_next(ui_window_t *cur)
+{
+        link_t *link;
+
+        link = list_next(&cur->lwindows, &cur->ui->windows);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ui_window_t, lwindows);
+}
+
 /** Get active window (only valid in fullscreen mode).
  *