Changeset 983052c in mainline for uspace/lib/ui

Timestamp:

2023-10-10T12:30:54Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd2fab5

Parents:

9bec33a

git-author:

Jiri Svoboda <jiri@…> (2023-10-09 18:30:06)

git-committer:

Jiri Svoboda <jiri@…> (2023-10-10 12:30:54)

Message:

Task bar should not crash when starting in terminal

Firstly, we need to make sure we do not paint anything while
UI is suspended. Also, we were missing calls to ui_lock/unlock()
while delivering kbd/pos events from console.

Location:

uspace/lib/ui

Files:

• include/ui/ui.h (modified) (1 diff)
• private/ui.h (modified) (1 diff)
• src/ui.c (modified) (5 diffs)
• test/ui.c (modified) (3 diffs)

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

@@ -57 +57 @@
 extern errno_t ui_suspend(ui_t *);
 extern errno_t ui_resume(ui_t *);
+extern bool ui_is_suspended(ui_t *);
 extern void ui_lock(ui_t *);
 extern void ui_unlock(ui_t *);

uspace/lib/ui/private/ui.h

@@ -61 +61 @@
         /** Output owned by UI, clean up when destroying UI */
         bool myoutput;
+        /** @c true iff UI is suspended */
+        bool suspended;
         /** @c true if terminating */
         bool quit;

uspace/lib/ui/src/ui.c

@@ -338 +338 @@
         switch (event->type) {
         case CEV_KEY:
+                ui_lock(ui);
                 ui_window_send_kbd(awnd, &event->ev.key);
+                ui_unlock(ui);
                 break;
         case CEV_POS:
@@ -348 +350 @@
                 claim = ui_wdecor_pos_event(awnd->wdecor, &pos);
                 /* Note: If event is claimed, awnd might not be valid anymore */
-                if (claim == ui_unclaimed)
+                if (claim == ui_unclaimed) {
+                        ui_lock(ui);
                         ui_window_send_pos(awnd, &pos);
+                        ui_unlock(ui);
+                }
 
                 break;
@@ -454 +459 @@
 errno_t ui_suspend(ui_t *ui)
 {
-        if (ui->cgc == NULL)
+        errno_t rc;
+
+        assert(!ui->suspended);
+
+        if (ui->cgc == NULL) {
+                ui->suspended = true;
                 return EOK;
+        }
 
         (void) console_set_caption(ui->console, "");
-        return console_gc_suspend(ui->cgc);
+        rc = console_gc_suspend(ui->cgc);
+        if (rc != EOK)
+                return rc;
+
+        ui->suspended = true;
+        return EOK;
 }
 
@@ -477 +493 @@
         cons_event_t ev;
 
-        if (ui->cgc == NULL)
+        assert(ui->suspended);
+
+        if (ui->cgc == NULL) {
+                ui->suspended = false;
                 return EOK;
+        }
 
         rc = console_get_pos(ui->console, &col, &row);
@@ -510 +530 @@
                 return rc;
 
+        ui->suspended = false;
+
         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);
+        rc = gfx_cursor_set_visible(console_gc_get_ctx(ui->cgc), false);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+/** Determine if UI is suspended.
+ *
+ * @param ui UI
+ * @return @c true iff UI is suspended
+ */
+bool ui_is_suspended(ui_t *ui)
+{
+        return ui->suspended;
 }
 

uspace/lib/ui/test/ui.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -69 +69 @@
 }
 
-/** ui_suspend() / ui_resume() do nothing if we don't have a console */
+/** ui_suspend() / ui_resume() do nothing if we don't have a console,
+ * ui_is_suspended() returns suspend status
+ */
 PCUT_TEST(suspend_resume)
 {
@@ -79 +81 @@
         PCUT_ASSERT_NOT_NULL(ui);
 
+        PCUT_ASSERT_FALSE(ui_is_suspended(ui));
+
         rc = ui_suspend(ui);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_TRUE(ui_is_suspended(ui));
+
         rc = ui_resume(ui);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_FALSE(ui_is_suspended(ui));
 
         ui_destroy(ui);