Changeset 1c6c3e1d in mainline for uspace/lib/ui/src/ui.c

Timestamp:

2023-10-22T17:55:33Z (21 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket

File:

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

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;
 }