Changeset 3fd38b2 in mainline for uspace/lib/ui

Timestamp:

2022-09-29T07:45:07Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c77cfd8

Parents:

50a16d9

git-author:

Jiri Svoboda <jiri@…> (2022-09-28 07:44:28)

git-committer:

Jiri Svoboda <jiri@…> (2022-09-29 07:45:07)

Message:

Size taskbar based on display size, fix text mode

Location:

uspace/lib/ui

Files:

• include/ui/ui.h (modified) (2 diffs)
• src/ui.c (modified) (1 diff)
• test/ui.c (modified) (1 diff)

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

@@ -39 +39 @@
 #include <display.h>
 #include <errno.h>
+#include <gfx/coord.h>
 #include <io/console.h>
 #include <stdbool.h>
@@ -53 +54 @@
 extern bool ui_is_textmode(ui_t *);
 extern bool ui_is_fullscreen(ui_t *);
+extern errno_t ui_get_rect(ui_t *, gfx_rect_t *);
 extern errno_t ui_suspend(ui_t *);
 extern errno_t ui_resume(ui_t *);

uspace/lib/ui/src/ui.c

@@ -524 +524 @@
 }
 
+/** Get UI screen rectangle.
+ *
+ * @param ui User interface
+ * @param rect Place to store bounding rectangle
+ */
+errno_t ui_get_rect(ui_t *ui, gfx_rect_t *rect)
+{
+        display_info_t info;
+        sysarg_t cols, rows;
+        errno_t rc;
+
+        if (ui->display != NULL) {
+                rc = display_get_info(ui->display, &info);
+                if (rc != EOK)
+                        return rc;
+
+                *rect = info.rect;
+        } else if (ui->console != NULL) {
+                rc = console_get_size(ui->console, &cols, &rows);
+                if (rc != EOK)
+                        return rc;
+
+                rect->p0.x = 0;
+                rect->p0.y = 0;
+                rect->p1.x = cols;
+                rect->p1.y = rows;
+        } else {
+                return ENOTSUP;
+        }
+
+        return EOK;
+}
+
 /** Get clickmatic from UI.
  *

uspace/lib/ui/test/ui.c

@@ -169 +169 @@
 }
 
+/** ui_is_get_rect() */
+PCUT_TEST(get_rect)
+{
+        ui_t *ui = NULL;
+        gfx_rect_t rect;
+        errno_t rc;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(ui);
+
+        /* This won't work without a display service */
+        rc = ui_get_rect(ui, &rect);
+        PCUT_ASSERT_ERRNO_VAL(ENOTSUP, rc);
+
+        ui_destroy(ui);
+}
+
 /** ui_lock(), ui_unlock() */
 PCUT_TEST(lock_unlock)