Changes in uspace/lib/ui/src/ui.c [983052c:b1f0a14] in mainline

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