Changeset 77ffa01 in mainline for uspace/lib/ui/src/ui.c

Timestamp:

2021-02-27T21:34:15Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9c7dc8e

Parents:

b433f68

Message:

Allow UI to run in the console

Note that everything is way too large.

File:

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

uspace/lib/ui/src/ui.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -34 +34 @@
  */
 
+#include <ctype.h>
 #include <display.h>
 #include <errno.h>
 #include <fibril.h>
+#include <io/console.h>
 #include <stdlib.h>
+#include <str.h>
 #include <task.h>
 #include <ui/ui.h>
+#include <ui/wdecor.h>
+#include "../private/window.h"
 #include "../private/ui.h"
+
+/** Parse output specification.
+ *
+ * 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).
+ *
+ * @param ospec Output specification
+ * @param ws Place to store window system type (protocol)
+ * @param osvc Place to store pointer to output service name
+ */
+static void ui_ospec_parse(const char *ospec, ui_winsys_t *ws,
+    const char **osvc)
+{
+        const char *cp;
+
+        if (ospec == UI_DISPLAY_DEFAULT) {
+                *ws = ui_ws_display;
+                *osvc = DISPLAY_DEFAULT;
+                return;
+        }
+
+        cp = ospec;
+        while (isalpha(*cp))
+                ++cp;
+
+        if (*cp == '@') {
+                if (str_lcmp(ospec, "disp@", str_length("disp@")) == 0) {
+                        *ws = ui_ws_display;
+                } else if (str_lcmp(ospec, "cons@", str_length("cons@")) == 0) {
+                        *ws = ui_ws_console;
+                } else {
+                        *ws = ui_ws_unknown;
+                }
+
+                if (cp[1] != '\0')
+                        *osvc = cp + 1;
+                else
+                        *osvc = NULL;
+        } else {
+                *ws = ui_ws_display;
+                *osvc = ospec;
+        }
+}
 
 /** Create new user interface.
@@ -53 +102 @@
         errno_t rc;
         display_t *display;
+        console_ctrl_t *console;
+        ui_winsys_t ws;
+        const char *osvc;
         ui_t *ui;
 
-        rc = display_open(ospec, &display);
-        if (rc != EOK)
-                return rc;
-
-        rc = ui_create_disp(display, &ui);
-        if (rc != EOK) {
-                display_close(display);
-                return rc;
-        }
-
-        ui->display = display;
+        ui_ospec_parse(ospec, &ws, &osvc);
+
+        if (ws == ui_ws_display) {
+                rc = display_open(osvc, &display);
+                if (rc != EOK)
+                        return rc;
+
+                rc = ui_create_disp(display, &ui);
+                if (rc != EOK) {
+                        display_close(display);
+                        return rc;
+                }
+        } else if (ws == ui_ws_console) {
+                console = console_init(stdin, stdout);
+                if (console == NULL)
+                        return EIO;
+
+                /* ws == ui_ws_console */
+                rc = ui_create_cons(console, &ui);
+                if (rc != EOK) {
+                        console_done(console);
+                        return rc;
+                }
+        } else {
+                return EINVAL;
+        }
+
         ui->myoutput = true;
         *rui = ui;
@@ -71 +139 @@
 }
 
+/** Create new user interface using console service.
+ *
+ * @param rui Place to store pointer to new UI
+ * @return EOK on success or an error code
+ */
+errno_t ui_create_cons(console_ctrl_t *console, ui_t **rui)
+{
+        ui_t *ui;
+
+        ui = calloc(1, sizeof(ui_t));
+        if (ui == NULL)
+                return ENOMEM;
+
+        ui->console = console;
+        *rui = ui;
+        return EOK;
+}
+
 /** Create new user interface using display service.
  *
@@ -99 +185 @@
                 return;
 
-        if (ui->myoutput)
-                display_close(ui->display);
+        if (ui->myoutput) {
+                if (ui->console != NULL)
+                        console_done(ui->console);
+                if (ui->display != NULL)
+                        display_close(ui->display);
+        }
+
         free(ui);
+}
+
+static void ui_cons_event_process(ui_t *ui, cons_event_t *event)
+{
+        if (ui->root_wnd == NULL)
+                return;
+
+        switch (event->type) {
+        case CEV_KEY:
+                ui_window_send_kbd(ui->root_wnd, &event->ev.key);
+                break;
+        case CEV_POS:
+                ui_wdecor_pos_event(ui->root_wnd->wdecor, &event->ev.pos);
+                ui_window_send_pos(ui->root_wnd, &event->ev.pos);
+                break;
+        }
 }
 
@@ -113 +220 @@
 void ui_run(ui_t *ui)
 {
-        task_retval(0);
-
-        while (!ui->quit)
-                fibril_usleep(100000);
+        bool have_event;
+        cons_event_t event;
+        usec_t timeout;
+
+        /* Only return command prompt if we are running in a separate window */
+        if (ui->display != NULL)
+                task_retval(0);
+
+        while (!ui->quit) {
+                if (ui->console != NULL) {
+                        timeout = 100000;
+                        have_event = console_get_event_timeout(ui->console,
+                            &event, &timeout);
+                        if (have_event)
+                                ui_cons_event_process(ui, &event);
+                } else {
+                        fibril_usleep(100000);
+                }
+        }
 }