Changeset 9adae25 in mainline

Timestamp:

2023-10-16T09:26:58Z (7 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f1ce7ff

Parents:

489f405

git-author:

Jiri Svoboda <jiri@…> (2023-10-15 09:26:00)

git-committer:

Jiri Svoboda <jiri@…> (2023-10-16 09:26:58)

Message:

GFX Demo should call ui_run()

This is needed to process console messages. Since it blocks the main
fibril, we need to run the demo loop in a separate fibril.

File:

• uspace/app/gfxdemo/gfxdemo.c (modified) (7 diffs)

uspace/app/gfxdemo/gfxdemo.c

@@ -51 +51 @@
 #include <ui/window.h>
 #include <ui/wdecor.h>
+#include "gfxdemo.h"
 
 static void wnd_close_event(void *);
@@ -77 +78 @@
 static gfx_coord_t vpad;
 static console_ctrl_t *con = NULL;
+static ui_t *ui;
 
 /** Determine if we are running in text mode.
@@ -100 +102 @@
         cons_event_t cevent;
 
+        if (ui != NULL)
+                ui_unlock(ui);
         fibril_mutex_lock(&quit_lock);
         if (!quit) {
@@ -120 +124 @@
         }
         fibril_mutex_unlock(&quit_lock);
+        if (ui != NULL)
+                ui_lock(ui);
 }
 
@@ -1099 +1105 @@
 }
 
+static errno_t demo_ui_fibril(void *arg)
+{
+        demo_ui_args_t *args = (demo_ui_args_t *)arg;
+        errno_t rc;
+
+        ui_lock(args->ui);
+        rc = demo_loop(args->gc, args->dims.x, args->dims.y);
+        ui_unlock(args->ui);
+        ui_quit(args->ui);
+        return rc;
+}
+
 /** Run demo on UI. */
 static errno_t demo_ui(const char *display_spec)
 {
-        ui_t *ui = NULL;
         ui_wnd_params_t params;
         ui_window_t *window = NULL;
@@ -1111 +1128 @@
         gfx_rect_t ui_rect;
         gfx_coord2_t dims;
+        demo_ui_args_t args;
+        fid_t fid;
         errno_t rc;
 
@@ -1169 +1188 @@
                 task_retval(0);
 
-        rc = demo_loop(gc, dims.x, dims.y);
-        if (rc != EOK)
-                goto error;
-
+        args.gc = gc;
+        args.dims = dims;
+        args.ui = ui;
+
+        fid = fibril_create(demo_ui_fibril, (void *)&args);
+        if (fid == 0) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        fibril_add_ready(fid);
+
+        ui_run(ui);
         ui_window_destroy(window);
         ui_destroy(ui);