Changeset 2c12135 in mainline

Timestamp:

2026-02-18T09:13:26Z (2 days ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

26edcd6

Parents:

a4e4e29

git-author:

Jiri Svoboda <jiri@…> (2026-02-17 21:13:24)

git-committer:

Jiri Svoboda <jiri@…> (2026-02-18 09:13:26)

Message:

GFXDemo resize in console UI, fix UI resize / UI window resize in console.

Location:

uspace

Files:

• app/gfxdemo/gfxdemo.c (modified) (4 diffs)
• lib/ui/src/ui.c (modified) (4 diffs)
• lib/ui/src/window.c (modified) (1 diff)

uspace/app/gfxdemo/gfxdemo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -61 +61 @@
 };
 
+static void uiwnd_resize_event(ui_window_t *, void *);
 static void uiwnd_close_event(ui_window_t *, void *);
 static void uiwnd_kbd_event(ui_window_t *, void *, kbd_event_t *);
 
 static ui_window_cb_t ui_window_cb = {
+        .resize = uiwnd_resize_event,
         .close = uiwnd_close_event,
         .kbd = uiwnd_kbd_event
@@ -1169 +1171 @@
 
         /* Do not decorate the window in fullscreen mode */
-        if (ui_is_fullscreen(ui))
+        if (ui_is_fullscreen(ui)) {
                 params.style &= ~ui_wds_decorated;
+                params.placement = ui_wnd_place_full_screen;
+        }
 
         /*
@@ -1328 +1332 @@
         (void)arg;
         demo_kbd_event(event);
+}
+
+static void uiwnd_resize_event(ui_window_t *window, void *arg)
+{
+        gfx_rect_t rect;
+        gfx_coord2_t dims;
+
+        ui_window_get_app_rect(window, &rect);
+        gfx_rect_dims(&rect, &dims);
+        scr_width = dims.x;
+        scr_height = dims.y;
 }
 

uspace/lib/ui/src/ui.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -326 +326 @@
 }
 
+/** Resize UI after screen size change.
+ *
+ * @param ui UI
+ * @param rect New screen rectangle.
+ */
+static void ui_resize(ui_t *ui, gfx_rect_t *rect)
+{
+        ui_window_t *wnd;
+
+        ui->rect = *rect;
+
+        /* Resize all fullscreen windows */
+        wnd = ui_window_first(ui);
+        while (wnd != NULL) {
+                if (wnd->placement == ui_wnd_place_full_screen) {
+                        (void)ui_window_resize(wnd, rect);
+                        ui_window_send_resize(wnd);
+                }
+
+                wnd = ui_window_next(wnd);
+        }
+
+        (void)ui_paint(ui);
+}
+
 static void ui_cons_event_process(ui_t *ui, cons_event_t *event)
 {
@@ -331 +356 @@
         ui_evclaim_t claim;
         pos_event_t pos;
+        sysarg_t cols, rows;
+        gfx_rect_t rect;
+        errno_t rc;
 
         awnd = ui_window_get_active(ui);
@@ -358 +386 @@
                 break;
         case CEV_RESIZE:
+                rc = console_gc_resize(ui->cgc);
+                if (rc != EOK) {
+                        /* XXX No good way to recover. */
+                        console_done(ui->console);
+                        exit(1);
+                }
+
+                rc = console_get_size(ui->console, &cols, &rows);
+                if (rc != EOK) {
+                        /* XXX No good way to recover. */
+                        console_done(ui->console);
+                        exit(1);
+                }
+
                 ui_lock(ui);
-                ui_window_send_resize(awnd);
+
+                rect.p0.x = 0;
+                rect.p0.y = 0;
+                rect.p1.x = cols;
+                rect.p1.y = rows;
+
+                ui_resize(ui, &rect);
                 ui_unlock(ui);
                 break;

uspace/lib/ui/src/window.c

@@ -767 +767 @@
                 /* Window is resized, now we can map the window bitmap again */
                 gfx_bitmap_params_init(&win_params);
-                win_params.flags |= bmpf_direct_output;
+                if (window->ui->display != NULL)
+                        win_params.flags |= bmpf_direct_output;
                 win_params.rect = nrect;