Changeset 8a9a41e in mainline for uspace/lib/ui/src/ui.c

Timestamp:

2021-10-24T08:28:43Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

f628215

Parents:

2ce943a (diff), cd981f2a (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:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• uspace/lib/ui/src/ui.c (modified) (11 diffs)

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>
@@ -53 +55 @@
  *
  * Output specification has the form <proto>@<service> where proto is
- * eiher 'disp' for display service or 'cons' for console. Service
- * is a location ID service name (e.g. hid/display).
+ * eiher 'disp' for display service, 'cons' for console, 'null'
+ * for dummy output. Service is a location ID service name (e.g. hid/display).
  *
  * @param ospec Output specification
@@ -80 +82 @@
                 } else if (str_lcmp(ospec, "cons@", str_length("cons@")) == 0) {
                         *ws = ui_ws_console;
+                } else if (str_lcmp(ospec, "null@", str_length("null@")) == 0) {
+                        *ws = ui_ws_null;
                 } else {
                         *ws = ui_ws_unknown;
@@ -97 +101 @@
  *
  * @param ospec Output specification or @c UI_DISPLAY_DEFAULT to use
- *              the default output
+ *              the default display service, UI_CONSOLE_DEFAULT to use
+ *              the default console service, UI_DISPLAY_NULL to use
+ *              dummy output.
  * @param rui Place to store pointer to new UI
  * @return EOK on success or an error code
@@ -109 +115 @@
         ui_winsys_t ws;
         const char *osvc;
+        sysarg_t cols;
+        sysarg_t rows;
         ui_t *ui;
 
@@ -128 +136 @@
                         return EIO;
 
+                rc = console_get_size(console, &cols, &rows);
+                if (rc != EOK) {
+                        console_done(console);
+                        return rc;
+                }
+
+                console_cursor_visibility(console, false);
+
                 /* ws == ui_ws_console */
                 rc = ui_create_cons(console, &ui);
@@ -143 +159 @@
 
                 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 if (ws == ui_ws_null) {
+                rc = ui_create_disp(NULL, &ui);
+                if (rc != EOK)
+                        return rc;
         } else {
                 return EINVAL;
@@ -203 +229 @@
                 if (ui->cgc != NULL)
                         console_gc_delete(ui->cgc);
-                if (ui->console != NULL)
+                if (ui->console != NULL) {
+                        console_cursor_visibility(ui->console, true);
                         console_done(ui->console);
+                }
                 if (ui->display != NULL)
                         display_close(ui->display);
@@ -216 +244 @@
         ui_window_t *awnd;
         ui_evclaim_t claim;
+        pos_event_t pos;
 
         awnd = ui_window_get_active(ui);
@@ -226 +255 @@
                 break;
         case CEV_POS:
-                claim = ui_wdecor_pos_event(awnd->wdecor, &event->ev.pos);
+                pos = event->ev.pos;
+                /* Translate event to window-relative coordinates */
+                pos.hpos -= awnd->dpos.x;
+                pos.vpos -= awnd->dpos.y;
+
+                claim = ui_wdecor_pos_event(awnd->wdecor, &pos);
                 /* Note: If event is claimed, awnd might not be valid anymore */
                 if (claim == ui_unclaimed)
-                        ui_window_send_pos(awnd, &event->ev.pos);
+                        ui_window_send_pos(awnd, &pos);
+
                 break;
         }
@@ -280 +315 @@
 {
         errno_t rc;
+        gfx_context_t *gc;
         ui_window_t *awnd;
+        gfx_color_t *color = NULL;
+
+        /* In case of null output */
+        if (ui->cgc == NULL)
+                return EOK;
+
+        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 */