Changeset 1ebcb791 in mainline

Timestamp:

2021-09-01T19:44:37Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f7c12b3

Parents:

45004f3

Message:

Fill text UI background with color

Location:

uspace/lib/ui

Files:

• private/resource.h (modified) (2 diffs)
• private/ui.h (modified) (2 diffs)
• src/resource.c (modified) (1 diff)
• src/ui.c (modified) (5 diffs)

uspace/lib/ui/private/resource.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -59 +59 @@
         bool textmode;
 
+        /** UI background color */
+        gfx_color_t *ui_bg_color;
+
         /** Button frame color */
         gfx_color_t *btn_frame_color;

uspace/lib/ui/private/ui.h

@@ -39 +39 @@
 
 #include <adt/list.h>
+#include <gfx/coord.h>
 #include <display.h>
 #include <io/console.h>
@@ -54 +55 @@
         /** Display */
         display_t *display;
+        /** UI rectangle (only used in fullscreen mode) */
+        gfx_rect_t rect;
         /** Output owned by UI, clean up when destroying UI */
         bool myoutput;

uspace/lib/ui/src/resource.c

@@ -327 +327 @@
                 goto error;
 
-        rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff,
-            &btn_highlight_color);
+        rc = gfx_color_new_ega(0x20, &btn_highlight_color);
         if (rc != EOK)
                 goto error;

uspace/lib/ui/src/ui.c

@@ -39 +39 @@
 #include <errno.h>
 #include <fibril.h>
+#include <gfx/color.h>
+#include <gfx/render.h>
 #include <io/console.h>
 #include <stdbool.h>
@@ -109 +111 @@
         ui_winsys_t ws;
         const char *osvc;
+        sysarg_t cols;
+        sysarg_t rows;
         ui_t *ui;
 
@@ -128 +132 @@
                         return EIO;
 
+                rc = console_get_size(console, &cols, &rows);
+                if (rc != EOK) {
+                        console_done(console);
+                        return rc;
+                }
+
                 console_cursor_visibility(console, false);
 
@@ -145 +155 @@
 
                 ui->cgc = cgc;
+                ui->rect.p0.x = 0;
+                ui->rect.p0.y = 0;
+                ui->rect.p1.x = cols;
+                ui->rect.p1.y = rows;
+
+                (void) ui_paint(ui);
         } else {
                 return EINVAL;
@@ -284 +300 @@
 {
         errno_t rc;
+        gfx_context_t *gc;
         ui_window_t *awnd;
+        gfx_color_t *color = NULL;
+
+        gc = console_gc_get_ctx(ui->cgc);
+
+        rc = gfx_color_new_ega(0x11, &color);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_set_color(gc, color);
+        if (rc != EOK) {
+                gfx_color_delete(color);
+                return rc;
+        }
+
+        rc = gfx_fill_rect(gc, &ui->rect);
+        if (rc != EOK) {
+                gfx_color_delete(color);
+                return rc;
+        }
+
+        gfx_color_delete(color);
 
         /* XXX Should repaint all windows */