Changeset 3d10a2f in mainline for uspace/lib/ui/src/ui.c

Timestamp:

2021-10-04T12:25:43Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cd981f2a, e0e1b3d

Parents:

6d172f6

git-author:

Jiri Svoboda <jiri@…> (2021-10-03 17:25:36)

git-committer:

Jiri Svoboda <jiri@…> (2021-10-04 12:25:43)

Message:

Null display spec for the benefit of unit testing

When testing something that takes a display specification as argument,
it is useful to be able to be able to specify dummy output (so far,
only ui_create_disp() could create a UI with dummy output.

File:

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

uspace/lib/ui/src/ui.c

@@ -55 +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
@@ -82 +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;
@@ -99 +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
@@ -161 +165 @@
 
                 (void) ui_paint(ui);
+        } else if (ws == ui_ws_null) {
+                rc = ui_create_disp(NULL, &ui);
+                if (rc != EOK)
+                        return rc;
         } else {
                 return EINVAL;