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

File:

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

uspace/lib/ui/src/window.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2026 Jiri Svoboda
+ * Copyright (c) 2025 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,
-    gfx_rect_t *wrect, gfx_rect_t *prect, ui_wnd_placement_t placement,
-    gfx_coord2_t *pos)
+    ui_wnd_params_t *params, gfx_coord2_t *pos)
 {
         gfx_coord2_t dims;
@@ -185 +181 @@
         gfx_rect_t below_rect;
 
-        assert(placement != ui_wnd_place_default ||
+        assert(params->placement != ui_wnd_place_default ||
             ui_is_fullscreen(window->ui));
 
@@ -191 +187 @@
         pos->y = 0;
 
-        switch (placement) {
+        switch (params->placement) {
         case ui_wnd_place_default:
         case ui_wnd_place_center:
-                assert(placement != ui_wnd_place_default ||
+                assert(params->placement != ui_wnd_place_default ||
                     ui_is_fullscreen(window->ui));
                 /* Center window */
-                gfx_rect_dims(wrect, &dims);
+                gfx_rect_dims(&params->rect, &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;
@@ -203 +199 @@
         case ui_wnd_place_top_left:
         case ui_wnd_place_full_screen:
-                pos->x = drect->p0.x - wrect->p0.x;
-                pos->y = drect->p0.y - wrect->p0.y;
+                pos->x = drect->p0.x - params->rect.p0.x;
+                pos->y = drect->p0.y - params->rect.p0.y;
                 break;
         case ui_wnd_place_top_right:
-                pos->x = drect->p1.x - wrect->p1.x;
-                pos->y = drect->p0.y - wrect->p0.y;
+                pos->x = drect->p1.x - params->rect.p1.x;
+                pos->y = drect->p0.y - params->rect.p0.y;
                 break;
         case ui_wnd_place_bottom_left:
-                pos->x = drect->p0.x - wrect->p0.x;
-                pos->y = drect->p1.y - wrect->p1.y;
+                pos->x = drect->p0.x - params->rect.p0.x;
+                pos->y = drect->p1.y - params->rect.p1.y;
                 break;
         case ui_wnd_place_bottom_right:
-                pos->x = drect->p1.x - wrect->p1.x;
-                pos->y = drect->p1.y - wrect->p1.y;
+                pos->x = drect->p1.x - params->rect.p1.x;
+                pos->y = drect->p1.y - params->rect.p1.y;
                 break;
         case ui_wnd_place_popup:
                 /* Compute rectangle when placed below */
-                below_pos.x = prect->p0.x;
-                below_pos.y = prect->p1.y;
-                gfx_rect_translate(&below_pos, wrect, &below_rect);
+                below_pos.x = params->prect.p0.x;
+                below_pos.y = params->prect.p1.y;
+                gfx_rect_translate(&below_pos, &params->rect, &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 = prect->p0.x - wrect->p0.x;
-                        pos->y = prect->p1.y - wrect->p0.y;
+                        pos->x = params->prect.p0.x - params->rect.p0.x;
+                        pos->y = params->prect.p1.y - params->rect.p0.y;
                 } else {
                         /* Place popup window above parent rectangle */
-                        pos->x = prect->p0.x;
-                        pos->y = prect->p0.y -
-                            (wrect->p1.y - wrect->p0.y);
+                        pos->x = params->prect.p0.x;
+                        pos->y = params->prect.p0.y -
+                            (params->rect.p1.y - params->rect.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);
 }
 
@@ -345 +334 @@
         mem_gc_t *memgc = NULL;
         xlate_gc_t *xgc = NULL;
-        gfx_coord2_t dpos;
         errno_t rc;
 
@@ -396 +384 @@
                 if (params->placement != ui_wnd_place_default) {
                         /* Set initial display window position */
-                        ui_window_place(window, &info.rect, &params->rect,
-                            &params->prect, params->placement, &dparams.pos);
+                        ui_window_place(window, &info.rect, params,
+                            &dparams.pos);
 
                         dparams.flags |= wndf_setpos;
@@ -489 +477 @@
 #endif
         if (ui->display == NULL) {
-                ui_window_place(window, &ui->rect, &params->rect, &params->prect,
-                    params->placement, &dpos);
-                ui_window_set_dpos(window, &dpos);
+                ui_window_place(window, &ui->rect, params, &window->dpos);
+
+                if (window->xgc != NULL)
+                        xlate_gc_set_off(window->xgc, &window->dpos);
         }
 
@@ -549 +538 @@
 }
 
-/** 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.
  *
@@ -597 +572 @@
         /* Need to repaint if windows are emulated */
         if (ui_is_fullscreen(ui)) {
-                (void)ui_paint(ui);
+                ui_paint(ui);
                 /* Send focus event to newly active window */
                 nwindow = ui_window_get_active(ui);
@@ -640 +615 @@
         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);
 }
 
@@ -710 +653 @@
         gfx_bitmap_alloc_t app_alloc;
         gfx_bitmap_alloc_t win_alloc;
-        gfx_coord2_t dpos;
         errno_t rc;
 
@@ -786 +728 @@
                         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;
-                }
         }
 
@@ -808 +735 @@
                 /* Window is resized, now we can map the window bitmap again */
                 gfx_bitmap_params_init(&win_params);
-                if (window->ui->display != NULL)
-                        win_params.flags |= bmpf_direct_output;
+                win_params.flags |= bmpf_direct_output;
                 win_params.rect = nrect;
 
@@ -838 +764 @@
                 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;
         }
 
@@ -872 +787 @@
 errno_t ui_window_resize(ui_window_t *window, gfx_rect_t *rect)
 {
-        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;
+        return ui_window_size_change(window, rect, ui_wsc_resize);
 }
 
@@ -1584 +1489 @@
 
         window->normal_rect = old_rect;
-        ui_window_send_resize(window);
-
-        /* Need to repaint UI if windows are emulated */
-        if (ui_is_fullscreen(window->ui))
-                (void)ui_paint(window->ui);
-
+        (void) ui_window_paint(window);
         return EOK;
 }
@@ -1614 +1514 @@
         }
 
-        ui_window_send_resize(window);
-
-        /* Need to repaint UI if windows are emulated */
-        if (ui_is_fullscreen(window->ui))
-                (void)ui_paint(window->ui);
-
+        (void) ui_window_paint(window);
         return EOK;
 }