Changeset 552b69f in mainline

Timestamp:

2021-11-03T20:56:59Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1aa8c86

Parents:

ec8a1bf

Message:

Dual-mode applications should automatically fall back to console

Location:

uspace

Files:

• app/calculator/calculator.c (modified) (1 diff)
• app/hello/hello.c (modified) (1 diff)
• app/launcher/launcher.c (modified) (2 diffs)
• app/uidemo/uidemo.c (modified) (1 diff)
• lib/display/src/display.c (modified) (2 diffs)
• lib/ui/include/types/ui/ui.h (modified) (2 diffs)
• lib/ui/src/ui.c (modified) (6 diffs)

uspace/app/calculator/calculator.c

@@ -787 +787 @@
 int main(int argc, char *argv[])
 {
-        const char *display_spec = UI_DISPLAY_DEFAULT;
+        const char *display_spec = UI_ANY_DEFAULT;
         ui_t *ui;
         ui_resource_t *ui_res;

uspace/app/hello/hello.c

@@ -152 +152 @@
 int main(int argc, char *argv[])
 {
-        const char *display_spec = UI_DISPLAY_DEFAULT;
+        const char *display_spec = UI_ANY_DEFAULT;
         errno_t rc;
         int i;

uspace/app/launcher/launcher.c

@@ -56 +56 @@
 #define NAME  "launcher"
 
-static char *display_spec = UI_DISPLAY_DEFAULT;
+static const char *display_spec = UI_DISPLAY_DEFAULT;
 
 static void wnd_close(ui_window_t *, void *);
@@ -137 +137 @@
         *argp++ = app;
 
-        if (display_spec != UI_DISPLAY_DEFAULT) {
+        if (str_cmp(display_spec, UI_DISPLAY_DEFAULT) != 0) {
                 *argp++ = "-d";
                 *argp++ = display_spec;

uspace/app/uidemo/uidemo.c

@@ -1019 +1019 @@
 int main(int argc, char *argv[])
 {
-        const char *display_spec = UI_DISPLAY_DEFAULT;
+        const char *display_spec = UI_ANY_DEFAULT;
         errno_t rc;
         int i;

uspace/lib/display/src/display.c

@@ -68 +68 @@
                 dsname = SERVICE_NAME_DISPLAY;
 
-        rc = loc_service_get_id(dsname, &display_svc, IPC_FLAG_BLOCKING);
+        rc = loc_service_get_id(dsname, &display_svc, 0);
         if (rc != EOK) {
                 free(display);
@@ -75 +75 @@
 
         display->sess = loc_service_connect(display_svc, INTERFACE_DISPLAY,
-            IPC_FLAG_BLOCKING);
+            0);
         if (display->sess == NULL) {
                 free(display);

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

@@ -43 +43 @@
 
 /** Use the default display service (argument to ui_create()) */
-#define UI_DISPLAY_DEFAULT NULL
+#define UI_DISPLAY_DEFAULT "disp@"
 /** Use the default console service (argument to ui_create()) */
 #define UI_CONSOLE_DEFAULT "cons@"
+/** Use any available service (argument to ui_create()) */
+#define UI_ANY_DEFAULT "@"
 /** Use dummy output (argument to ui_create()) */
 #define UI_DISPLAY_NULL "null@"
@@ -57 +59 @@
         /** Console */
         ui_ws_console,
+        /** Any non-dummy output backend */
+        ui_ws_any,
         /** Dummy output */
         ui_ws_null

uspace/lib/ui/src/ui.c

@@ -69 +69 @@
         const char *cp;
 
-        if (ospec == UI_DISPLAY_DEFAULT) {
-                *ws = ui_ws_display;
-                *osvc = DISPLAY_DEFAULT;
-                return;
-        }
-
         cp = ospec;
         while (isalpha(*cp))
@@ -86 +80 @@
                 } 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;
@@ -123 +119 @@
         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);
-                        return rc;
+                        goto cons_fail;
                 }
 
@@ -150 +154 @@
                 if (rc != EOK) {
                         console_done(console);
-                        return rc;
+                        goto cons_fail;
                 }
 
@@ -157 +161 @@
                         ui_destroy(ui);
                         console_done(console);
-                        return rc;
+                        goto cons_fail;
                 }
 
@@ -167 +171 @@
 
                 (void) ui_paint(ui);
-        } else if (ws == ui_ws_null) {
+                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;
-        } else {
-                return EINVAL;
-        }
-
-        ui->myoutput = true;
-        *rui = ui;
-        return EOK;
+
+                ui->myoutput = true;
+                *rui = ui;
+                return EOK;
+        }
+
+        return EINVAL;
 }