Changes in uspace/lib/ui/src/ui.c [252d03c:e3e64f6] in mainline

File:

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

uspace/lib/ui/src/ui.c

@@ -39 +39 @@
 #include <errno.h>
 #include <fibril.h>
+#include <gfx/color.h>
+#include <gfx/cursor.h>
+#include <gfx/render.h>
 #include <io/console.h>
 #include <stdbool.h>
@@ -47 +50 @@
 #include <ui/wdecor.h>
 #include <ui/window.h>
+#include "../private/wdecor.h"
 #include "../private/window.h"
 #include "../private/ui.h"
@@ -53 +57 @@
  *
  * 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
@@ -64 +68 @@
 {
         const char *cp;
-
-        if (ospec == UI_DISPLAY_DEFAULT) {
-                *ws = ui_ws_display;
-                *osvc = DISPLAY_DEFAULT;
-                return;
-        }
 
         cp = ospec;
@@ -80 +78 @@
                 } 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 if (str_lcmp(ospec, "@", str_length("@")) == 0) {
+                        *ws = ui_ws_any;
                 } else {
                         *ws = ui_ws_unknown;
@@ -97 +99 @@
  *
  * @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 +113 @@
         ui_winsys_t ws;
         const char *osvc;
+        sysarg_t cols;
+        sysarg_t rows;
         ui_t *ui;
 
         ui_ospec_parse(ospec, &ws, &osvc);
 
-        if (ws == ui_ws_display) {
-                rc = display_open(osvc, &display);
+        if (ws == ui_ws_display || ws == ui_ws_any) {
+                rc = display_open(osvc != NULL ? osvc : DISPLAY_DEFAULT,
+                    &display);
                 if (rc != EOK)
-                        return rc;
+                        goto disp_fail;
 
                 rc = ui_create_disp(display, &ui);
                 if (rc != EOK) {
                         display_close(display);
-                        return rc;
-                }
-        } else if (ws == ui_ws_console) {
+                        goto disp_fail;
+                }
+
+                ui->myoutput = true;
+                *rui = ui;
+                return EOK;
+        }
+
+disp_fail:
+        if (ws == ui_ws_console || ws == ui_ws_any) {
                 console = console_init(stdin, stdout);
                 if (console == NULL)
-                        return EIO;
+                        goto cons_fail;
+
+                rc = console_get_size(console, &cols, &rows);
+                if (rc != EOK) {
+                        console_done(console);
+                        goto cons_fail;
+                }
+
+                console_cursor_visibility(console, false);
 
                 /* ws == ui_ws_console */
@@ -132 +154 @@
                 if (rc != EOK) {
                         console_done(console);
-                        return rc;
+                        goto cons_fail;
                 }
 
@@ -139 +161 @@
                         ui_destroy(ui);
                         console_done(console);
+                        goto cons_fail;
+                }
+
+                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);
+                ui->myoutput = true;
+                *rui = ui;
+                return EOK;
+        }
+
+cons_fail:
+        if (ws == ui_ws_null) {
+                rc = ui_create_disp(NULL, &ui);
+                if (rc != EOK)
                         return rc;
-                }
-
-                ui->cgc = cgc;
-        } else {
-                return EINVAL;
-        }
-
-        ui->myoutput = true;
-        *rui = ui;
-        return EOK;
+
+                ui->myoutput = true;
+                *rui = ui;
+                return EOK;
+        }
+
+        return EINVAL;
 }
 
@@ -203 +241 @@
                 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 +256 @@
         ui_window_t *awnd;
         ui_evclaim_t claim;
+        pos_event_t pos;
 
         awnd = ui_window_get_active(ui);
@@ -226 +267 @@
                 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 +327 @@
 {
         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 */
@@ -292 +365 @@
 
         return ui_window_paint(awnd);
+}
+
+/** Free up console for other users.
+ *
+ * Release console resources for another application (that the current
+ * task is starting). After the other application finishes, resume
+ * operation with ui_resume(). No calls to UI must happen inbetween
+ * and no events must be processed (i.e. the calling function must not
+ * return control to UI.
+ *
+ * @param ui UI
+ * @return EOK on success or an error code
+ */
+errno_t ui_suspend(ui_t *ui)
+{
+        if (ui->cgc == NULL)
+                return EOK;
+
+        (void) console_set_caption(ui->console, "");
+        return console_gc_suspend(ui->cgc);
+}
+
+/** Resume suspended UI.
+ *
+ * Reclaim console resources (after child application has finished running)
+ * and restore UI operation previously suspended by calling ui_suspend().
+ *
+ * @param ui UI
+ * @return EOK on success or an error code
+ */
+errno_t ui_resume(ui_t *ui)
+{
+        errno_t rc;
+        ui_window_t *awnd;
+        sysarg_t col;
+        sysarg_t row;
+        cons_event_t ev;
+
+        if (ui->cgc == NULL)
+                return EOK;
+
+        rc = console_get_pos(ui->console, &col, &row);
+        if (rc != EOK)
+                return rc;
+
+        /*
+         * Here's a little heuristic to help determine if we need
+         * to pause before returning to the UI. If we are in the
+         * top-left corner, chances are the screen is empty and
+         * there is no need to pause.
+         */
+        if (col != 0 || row != 0) {
+                printf("Press any key or button to continue...\n");
+
+                while (true) {
+                        rc = console_get_event(ui->console, &ev);
+                        if (rc != EOK)
+                                return EIO;
+
+                        if (ev.type == CEV_KEY && ev.ev.key.type == KEY_PRESS)
+                                break;
+
+                        if (ev.type == CEV_POS && ev.ev.pos.type == POS_PRESS)
+                                break;
+                }
+        }
+
+        rc = console_gc_resume(ui->cgc);
+        if (rc != EOK)
+                return rc;
+
+        awnd = ui_window_get_active(ui);
+        if (awnd != NULL)
+                (void) console_set_caption(ui->console, awnd->wdecor->caption);
+
+        return gfx_cursor_set_visible(console_gc_get_ctx(ui->cgc), false);
 }