Changeset 77ffa01 in mainline for uspace/lib/ui/src/window.c

Timestamp:

2021-02-27T21:34:15Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9c7dc8e

Parents:

b433f68

Message:

Allow UI to run in the console

Note that everything is way too large.

File:

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

uspace/lib/ui/src/window.c

@@ -34 +34 @@
  */
 
+#include <congfx/console.h>
 #include <display.h>
 #include <errno.h>
@@ -130 +131 @@
         gfx_bitmap_t *bmp = NULL;
         mem_gc_t *memgc = NULL;
+        console_gc_t *cgc;
         errno_t rc;
+
+        if (ui->root_wnd != NULL)
+                return EEXIST;
 
         window = calloc(1, sizeof(ui_window_t));
@@ -194 +199 @@
                 if (rc != EOK)
                         goto error;
+        } else if (ui->console != NULL) {
+                rc = console_gc_create(ui->console, NULL, &cgc);
+                if (rc != EOK)
+                        goto error;
+
+                gc = console_gc_get_ctx(cgc);
         } else {
                 /* Needed for unit tests */
@@ -207 +218 @@
         gfx_bitmap_params_init(&bparams);
 #ifndef CONFIG_WIN_DOUBLE_BUF
-        bparams.flags |= bmpf_direct_output;
+        /* Console does not support direct output */
+        if (ui->display != NULL)
+                bparams.flags |= bmpf_direct_output;
 #endif
 
@@ -262 +275 @@
         window->cursor = ui_curs_arrow;
         *rwindow = window;
+
+        ui->root_wnd = window;
         return EOK;
 error:
@@ -303 +318 @@
                 gfx_bitmap_destroy(window->bmp);
         gfx_context_delete(window->gc);
-        display_window_destroy(window->dwindow);
+        if (window->dwindow != NULL)
+                display_window_destroy(window->dwindow);
         free(window);
 }
@@ -650 +666 @@
         ui_window_t *window = (ui_window_t *) arg;
 
-        (void) display_window_move_req(window->dwindow, pos);
+        if (window->dwindow != NULL)
+                (void) display_window_move_req(window->dwindow, pos);
 }
 
@@ -665 +682 @@
         ui_window_t *window = (ui_window_t *) arg;
 
-        (void) display_window_resize_req(window->dwindow, rsztype, pos);
+        if (window->dwindow != NULL)
+                (void) display_window_resize_req(window->dwindow, rsztype, pos);
 }
 
@@ -703 +721 @@
         }
 
-        (void) display_window_set_cursor(window->dwindow, dcursor);
+        if (window->dwindow != NULL)
+                (void) display_window_set_cursor(window->dwindow, dcursor);
         window->cursor = cursor;
 }