Changeset 252d03c in mainline for uspace/lib/ui/src/ui.c

Timestamp:

2021-04-28T09:22:39Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7470d97

Parents:

de227aba

Message:

Popping up a message, in text mode as well

File:

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

uspace/lib/ui/src/ui.c

@@ -34 +34 @@
  */
 
+#include <adt/list.h>
 #include <ctype.h>
 #include <display.h>
@@ -45 +46 @@
 #include <ui/ui.h>
 #include <ui/wdecor.h>
+#include <ui/window.h>
 #include "../private/window.h"
 #include "../private/ui.h"
@@ -104 +106 @@
         display_t *display;
         console_ctrl_t *console;
+        console_gc_t *cgc;
         ui_winsys_t ws;
         const char *osvc;
@@ -131 +134 @@
                         return rc;
                 }
+
+                rc = console_gc_create(console, NULL, &cgc);
+                if (rc != EOK) {
+                        ui_destroy(ui);
+                        console_done(console);
+                        return rc;
+                }
+
+                ui->cgc = cgc;
         } else {
                 return EINVAL;
@@ -154 +166 @@
 
         ui->console = console;
+        list_initialize(&ui->windows);
         *rui = ui;
         return EOK;
@@ -173 +186 @@
 
         ui->display = disp;
+        list_initialize(&ui->windows);
         *rui = ui;
         return EOK;
@@ -187 +201 @@
 
         if (ui->myoutput) {
+                if (ui->cgc != NULL)
+                        console_gc_delete(ui->cgc);
                 if (ui->console != NULL)
                         console_done(ui->console);
@@ -198 +214 @@
 static void ui_cons_event_process(ui_t *ui, cons_event_t *event)
 {
-        if (ui->root_wnd == NULL)
+        ui_window_t *awnd;
+        ui_evclaim_t claim;
+
+        awnd = ui_window_get_active(ui);
+        if (awnd == NULL)
                 return;
 
         switch (event->type) {
         case CEV_KEY:
-                ui_window_send_kbd(ui->root_wnd, &event->ev.key);
+                ui_window_send_kbd(awnd, &event->ev.key);
                 break;
         case CEV_POS:
-                ui_wdecor_pos_event(ui->root_wnd->wdecor, &event->ev.pos);
-                ui_window_send_pos(ui->root_wnd, &event->ev.pos);
+                claim = ui_wdecor_pos_event(awnd->wdecor, &event->ev.pos);
+                /* Note: If event is claimed, awnd might not be valid anymore */
+                if (claim == ui_unclaimed)
+                        ui_window_send_pos(awnd, &event->ev.pos);
                 break;
         }
@@ -248 +270 @@
 }
 
+/** Repaint UI (only used in fullscreen mode).
+ *
+ * This is used when an area is exposed in fullscreen mode.
+ *
+ * @param ui UI
+ * @return @c EOK on success or an error code
+ */
+errno_t ui_paint(ui_t *ui)
+{
+        errno_t rc;
+        ui_window_t *awnd;
+
+        /* XXX Should repaint all windows */
+        awnd = ui_window_get_active(ui);
+        if (awnd == NULL)
+                return EOK;
+
+        rc = ui_wdecor_paint(awnd->wdecor);
+        if (rc != EOK)
+                return rc;
+
+        return ui_window_paint(awnd);
+}
+
 /** Terminate user interface.
  *
@@ -275 +321 @@
 }
 
+/** Determine if we are emulating windows.
+ *
+ * @param ui User interface
+ * @return @c true iff we are running in text mode
+ */
+bool ui_is_fullscreen(ui_t *ui)
+{
+        return (ui->display == NULL);
+}
+
 /** @}
  */