Changes in uspace/lib/ui/src/window.c [ec50d65e:b979ffb] in mainline

File:

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

uspace/lib/ui/src/window.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -171 +171 @@
  * @param window Window
  * @param drect Display rectangle
+ * @param wrect Window rectangle
+ * @param prect Parent rectangle for popup placement or @c NULL
+ * @param placement Window placement
  * @param params Window parameters
  * @param pos Place to store position of top-left corner
  */
 static void ui_window_place(ui_window_t *window, gfx_rect_t *drect,
-    ui_wnd_params_t *params, gfx_coord2_t *pos)
+    gfx_rect_t *wrect, gfx_rect_t *prect, ui_wnd_placement_t placement,
+    gfx_coord2_t *pos)
 {
         gfx_coord2_t dims;
@@ -181 +185 @@
         gfx_rect_t below_rect;
 
-        assert(params->placement != ui_wnd_place_default ||
+        assert(placement != ui_wnd_place_default ||
             ui_is_fullscreen(window->ui));
 
@@ -187 +191 @@
         pos->y = 0;
 
-        switch (params->placement) {
+        switch (placement) {
         case ui_wnd_place_default:
-                assert(ui_is_fullscreen(window->ui));
+        case ui_wnd_place_center:
+                assert(placement != ui_wnd_place_default ||
+                    ui_is_fullscreen(window->ui));
                 /* Center window */
-                gfx_rect_dims(&params->rect, &dims);
+                gfx_rect_dims(wrect, &dims);
                 pos->x = (drect->p0.x + drect->p1.x) / 2 - dims.x / 2;
                 pos->y = (drect->p0.y + drect->p1.y) / 2 - dims.y / 2;
@@ -197 +203 @@
         case ui_wnd_place_top_left:
         case ui_wnd_place_full_screen:
-                pos->x = drect->p0.x - params->rect.p0.x;
-                pos->y = drect->p0.y - params->rect.p0.y;
+                pos->x = drect->p0.x - wrect->p0.x;
+                pos->y = drect->p0.y - wrect->p0.y;
                 break;
         case ui_wnd_place_top_right:
-                pos->x = drect->p1.x - params->rect.p1.x;
-                pos->y = drect->p0.y - params->rect.p0.y;
+                pos->x = drect->p1.x - wrect->p1.x;
+                pos->y = drect->p0.y - wrect->p0.y;
                 break;
         case ui_wnd_place_bottom_left:
-                pos->x = drect->p0.x - params->rect.p0.x;
-                pos->y = drect->p1.y - params->rect.p1.y;
+                pos->x = drect->p0.x - wrect->p0.x;
+                pos->y = drect->p1.y - wrect->p1.y;
                 break;
         case ui_wnd_place_bottom_right:
-                pos->x = drect->p1.x - params->rect.p1.x;
-                pos->y = drect->p1.y - params->rect.p1.y;
+                pos->x = drect->p1.x - wrect->p1.x;
+                pos->y = drect->p1.y - wrect->p1.y;
                 break;
         case ui_wnd_place_popup:
                 /* Compute rectangle when placed below */
-                below_pos.x = params->prect.p0.x;
-                below_pos.y = params->prect.p1.y;
-                gfx_rect_translate(&below_pos, &params->rect, &below_rect);
+                below_pos.x = prect->p0.x;
+                below_pos.y = prect->p1.y;
+                gfx_rect_translate(&below_pos, wrect, &below_rect);
 
                 /* Does below_rect fit within the display? */
                 if (gfx_rect_is_inside(&below_rect, drect)) {
                         /* Place popup window below parent rectangle */
-                        pos->x = params->prect.p0.x - params->rect.p0.x;
-                        pos->y = params->prect.p1.y - params->rect.p0.y;
+                        pos->x = prect->p0.x - wrect->p0.x;
+                        pos->y = prect->p1.y - wrect->p0.y;
                 } else {
                         /* Place popup window above parent rectangle */
-                        pos->x = params->prect.p0.x;
-                        pos->y = params->prect.p0.y -
-                            (params->rect.p1.y - params->rect.p0.y);
+                        pos->x = prect->p0.x;
+                        pos->y = prect->p0.y -
+                            (wrect->p1.y - wrect->p0.y);
                 }
                 break;
         }
+}
+
+static void ui_window_set_dpos(ui_window_t *window, gfx_coord2_t *dpos)
+{
+        window->dpos = *dpos;
+        if (window->xgc != NULL)
+                xlate_gc_set_off(window->xgc, &window->dpos);
 }
 
@@ -332 +345 @@
         mem_gc_t *memgc = NULL;
         xlate_gc_t *xgc = NULL;
+        gfx_coord2_t dpos;
         errno_t rc;
 
@@ -343 +357 @@
         dparams.rect = params->rect;
         dparams.caption = params->caption;
-        /* Only allow making the window larger */
-        gfx_rect_dims(&params->rect, &dparams.min_size);
+        dparams.min_size = params->min_size;
 
         /*
@@ -358 +371 @@
         if ((params->flags & ui_wndf_popup) != 0)
                 dparams.flags |= wndf_popup;
+        if ((params->flags & ui_wndf_nofocus) != 0)
+                dparams.flags |= wndf_nofocus;
         if ((params->flags & ui_wndf_topmost) != 0)
                 dparams.flags |= wndf_topmost;
@@ -381 +396 @@
                 if (params->placement != ui_wnd_place_default) {
                         /* Set initial display window position */
-                        ui_window_place(window, &info.rect, params,
-                            &dparams.pos);
+                        ui_window_place(window, &info.rect, &params->rect,
+                            &params->prect, params->placement, &dparams.pos);
 
                         dparams.flags |= wndf_setpos;
@@ -474 +489 @@
 #endif
         if (ui->display == NULL) {
-                ui_window_place(window, &ui->rect, params, &window->dpos);
-
-                if (window->xgc != NULL)
-                        xlate_gc_set_off(window->xgc, &window->dpos);
+                ui_window_place(window, &ui->rect, &params->rect, &params->prect,
+                    params->placement, &dpos);
+                ui_window_set_dpos(window, &dpos);
         }
 
@@ -535 +549 @@
 }
 
+/** Update window placement after screen resize (only in fullscreen UI).
+ *
+ * @param window UI window
+ */
+void ui_window_update_placement(ui_window_t *window)
+{
+        if (window->placement == ui_wnd_place_full_screen ||
+            (window->flags & uiwf_maximized) != 0) {
+                /* Update size of fullscreen or maximized window. */
+                (void)ui_window_resize(window, &window->ui->rect);
+                ui_window_send_resize(window);
+        }
+}
+
 /** Destroy window.
  *
@@ -569 +597 @@
         /* Need to repaint if windows are emulated */
         if (ui_is_fullscreen(ui)) {
-                ui_paint(ui);
+                (void)ui_paint(ui);
                 /* Send focus event to newly active window */
                 nwindow = ui_window_get_active(ui);
@@ -612 +640 @@
         window->control = NULL;
         control->elemp = NULL;
+}
+
+/** Get first (lowermost) window (only valid in fullscreen mode).
+ *
+ * @param ui User interface
+ * @return First window
+ */
+ui_window_t *ui_window_first(ui_t *ui)
+{
+        link_t *link;
+
+        link = list_first(&ui->windows);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ui_window_t, lwindows);
+}
+
+/** Get next window (only valid in fullscreen mode).
+ *
+ * @param cur Current window
+ * @return First window
+ */
+ui_window_t *ui_window_next(ui_window_t *cur)
+{
+        link_t *link;
+
+        link = list_next(&cur->lwindows, &cur->ui->windows);
+        if (link == NULL)
+                return NULL;
+
+        return list_get_instance(link, ui_window_t, lwindows);
 }
 
@@ -650 +710 @@
         gfx_bitmap_alloc_t app_alloc;
         gfx_bitmap_alloc_t win_alloc;
+        gfx_coord2_t dpos;
         errno_t rc;
 
@@ -725 +786 @@
                         break;
                 }
+        } else {
+                /* fullscreen mode or unit tests */
+                switch (scop) {
+                case ui_wsc_resize:
+                        break;
+                case ui_wsc_maximize:
+                        window->normal_dpos = window->dpos;
+                        dpos.x = 0;
+                        dpos.y = 0;
+                        ui_window_set_dpos(window, &dpos);
+                        break;
+                case ui_wsc_unmaximize:
+                        ui_window_set_dpos(window, &window->normal_dpos);
+                        break;
+                }
         }
 
@@ -732 +808 @@
                 /* 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;
 
@@ -761 +838 @@
                 gfx_bitmap_destroy(window->app_bmp);
                 window->app_bmp = app_bmp;
+        }
+
+        switch (scop) {
+        case ui_wsc_resize:
+                break;
+        case ui_wsc_maximize:
+                window->flags |= uiwf_maximized;
+                break;
+        case ui_wsc_unmaximize:
+                window->flags &= ~uiwf_maximized;
+                break;
         }
 
@@ -784 +872 @@
 errno_t ui_window_resize(ui_window_t *window, gfx_rect_t *rect)
 {
-        return ui_window_size_change(window, rect, ui_wsc_resize);
+        errno_t rc;
+
+        rc = ui_window_size_change(window, rect, ui_wsc_resize);
+        if (rc != EOK)
+                return rc;
+
+        /* Need to repaint UI if windows are emulated */
+        if (ui_is_fullscreen(window->ui))
+                (void)ui_paint(window->ui);
+
+        return EOK;
 }
 
@@ -975 +1073 @@
         ui_t *ui = window->ui;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
         ui_window_send_close(window);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -986 +1084 @@
         ui_t *ui = window->ui;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
         (void)nfocus;
 
@@ -995 +1093 @@
 
         ui_window_send_focus(window, nfocus);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -1004 +1102 @@
         ui_t *ui = window->ui;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
         ui_window_send_kbd(window, kbd_event);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -1020 +1118 @@
                 return;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
 
         claim = ui_wdecor_pos_event(window->wdecor, event);
         if (claim == ui_claimed) {
-                ui_unlock(ui);
+                fibril_mutex_unlock(&ui->lock);
                 return;
         }
 
         ui_window_send_pos(window, event);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -1045 +1143 @@
                 return;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
         (void) ui_window_resize(window, rect);
-        (void) ui_window_paint(window);
-        ui_unlock(ui);
+        ui_window_send_resize(window);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -1057 +1155 @@
         ui_t *ui = window->ui;
 
-        ui_lock(ui);
+        fibril_mutex_lock(&ui->lock);
 
         if (window->wdecor != NULL && nfocus == 0) {
@@ -1065 +1163 @@
 
         ui_window_send_unfocus(window, nfocus);
-        ui_unlock(ui);
+        fibril_mutex_unlock(&ui->lock);
 }
 
@@ -1295 +1393 @@
 void ui_window_send_minimize(ui_window_t *window)
 {
-        if (window->cb != NULL && window->cb->maximize != NULL)
+        if (window->cb != NULL && window->cb->minimize != NULL)
                 window->cb->minimize(window, window->arg);
         else
@@ -1393 +1491 @@
         else
                 return ui_window_def_unfocus(window, nfocus);
+}
+
+/** Send window resize event.
+ *
+ * @param window Window
+ */
+void ui_window_send_resize(ui_window_t *window)
+{
+        if (window->cb != NULL && window->cb->resize != NULL)
+                window->cb->resize(window, window->arg);
+        else
+                return ui_window_def_resize(window);
 }
 
@@ -1474 +1584 @@
 
         window->normal_rect = old_rect;
-        (void) ui_window_paint(window);
+        ui_window_send_resize(window);
+
+        /* Need to repaint UI if windows are emulated */
+        if (ui_is_fullscreen(window->ui))
+                (void)ui_paint(window->ui);
+
         return EOK;
 }
@@ -1499 +1614 @@
         }
 
-        (void) ui_window_paint(window);
+        ui_window_send_resize(window);
+
+        /* Need to repaint UI if windows are emulated */
+        if (ui_is_fullscreen(window->ui))
+                (void)ui_paint(window->ui);
+
         return EOK;
 }
@@ -1573 +1693 @@
         if (window->control != NULL)
                 ui_control_unfocus(window->control, nfocus);
+}
+
+/** Default window resize routine.
+ *
+ * @param window Window
+ * @return EOK on success or an error code
+ */
+void ui_window_def_resize(ui_window_t *window)
+{
+        ui_window_paint(window);
 }