Changeset 3c3657c in mainline

Timestamp:

2021-09-04T08:04:36Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7896f23

Parents:

81d3612

Message:

Correctly position windows in fullscreen mode (only works with CSR)

This involves translating the rendering operations as well as
hardware cursor operations and position events. This currently
only works with client-side rendering (using memory GC for translation),
but not with server-side rendering (need a new special GC to translate
the operations).

Location:

uspace/lib/ui

Files:

• private/window.h (modified) (1 diff)
• src/ui.c (modified) (2 diffs)
• src/window.c (modified) (10 diffs)

uspace/lib/ui/private/window.h

@@ -74 +74 @@
         /** Window rectangle */
         gfx_rect_t rect;
+        /** Display position (if fullscreen mode) */
+        gfx_coord2_t dpos;
         /** Application area bitmap */
         gfx_bitmap_t *app_bmp;

uspace/lib/ui/src/ui.c

@@ -236 +236 @@
         ui_window_t *awnd;
         ui_evclaim_t claim;
+        pos_event_t pos;
 
         awnd = ui_window_get_active(ui);
@@ -246 +247 @@
                 break;
         case CEV_POS:
-                claim = ui_wdecor_pos_event(awnd->wdecor, &event->ev.pos);
+                pos = event->ev.pos;
+#ifdef CONFIG_UI_CS_RENDER
+                /*
+                 * TODO Enable translation for server-side rendering
+                 * once we can translate rendering operations in this
+                 * case.
+                 */
+                pos.hpos -= awnd->dpos.x;
+                pos.vpos -= awnd->dpos.y;
+#endif
+
+                claim = ui_wdecor_pos_event(awnd->wdecor, &pos);
                 /* Note: If event is claimed, awnd might not be valid anymore */
                 if (claim == ui_unclaimed)
-                        ui_window_send_pos(awnd, &event->ev.pos);
+                        ui_window_send_pos(awnd, &pos);
+
                 break;
         }

uspace/lib/ui/src/window.c

@@ -132 +132 @@
 /** Compute where window should be placed on the screen.
  *
- * This only applies to windows that do not use default placement.
- *
- * @param window Window
- * @param display Display
- * @param info Display info
+ * This only applies to windows that do not use default placement or
+ * if we are running in full-screen mode.
+ *
+ * @param window Window
+ * @param drect Display rectangle
  * @param params Window parameters
  * @param pos Place to store position of top-left corner
  */
-static void ui_window_place(ui_window_t *window, display_t *display,
-    display_info_t *info, ui_wnd_params_t *params, gfx_coord2_t *pos)
-{
-        assert(params->placement != ui_wnd_place_default);
+static void ui_window_place(ui_window_t *window, gfx_rect_t *drect,
+    ui_wnd_params_t *params, gfx_coord2_t *pos)
+{
+        gfx_coord2_t dims;
+
+        assert(params->placement != ui_wnd_place_default ||
+            ui_is_fullscreen(window->ui));
 
         pos->x = 0;
@@ -150 +153 @@
         switch (params->placement) {
         case ui_wnd_place_default:
-                assert(false);
+                assert(ui_is_fullscreen(window->ui));
+                /* Center window */
+                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;
+                break;
         case ui_wnd_place_top_left:
         case ui_wnd_place_full_screen:
-                pos->x = info->rect.p0.x - params->rect.p0.x;
-                pos->y = info->rect.p0.y - params->rect.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 = info->rect.p1.x - params->rect.p1.x;
-                pos->y = info->rect.p0.y - params->rect.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 = info->rect.p0.x - params->rect.p0.x;
-                pos->y = info->rect.p1.y - params->rect.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 = info->rect.p1.x - params->rect.p1.x;
-                pos->y = info->rect.p1.y - params->rect.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:
@@ -204 +212 @@
                 return ENOMEM;
 
+        window->ui = ui;
+
         display_wnd_params_init(&dparams);
         dparams.rect = params->rect;
@@ -228 +238 @@
                 if (params->placement != ui_wnd_place_default) {
                         /* Set initial display window position */
-                        ui_window_place(window, ui->display, &info,
-                            params, &dparams.pos);
+                        ui_window_place(window, &info.rect, params,
+                            &dparams.pos);
 
                         dparams.flags |= wndf_setpos;
@@ -293 +303 @@
         window->gc = gc;
 #endif
+        if (ui->display == NULL)
+                ui_window_place(window, &ui->rect, params, &window->dpos);
 
         rc = ui_resource_create(window->gc, ui_is_textmode(ui), &res);
@@ -308 +320 @@
         ui_resource_set_expose_cb(res, ui_window_expose_cb, (void *) window);
 
-        window->ui = ui;
         window->rect = dparams.rect;
-
         window->res = res;
         window->wdecor = wdecor;
@@ -594 +604 @@
                         return rc;
         } else {
-                pos->x = 0;
-                pos->y = 0;
+                *pos = window->dpos;
         }
 
@@ -1014 +1023 @@
         ui_window_t *window = (ui_window_t *) arg;
 
-        if (!gfx_rect_is_empty(&window->dirty_rect))
-                (void) gfx_bitmap_render(window->bmp, &window->dirty_rect, NULL);
+        if (!gfx_rect_is_empty(&window->dirty_rect)) {
+                (void) gfx_bitmap_render(window->bmp, &window->dirty_rect,
+                    &window->dpos);
+        }
 
         window->dirty_rect.p0.x = 0;
@@ -1031 +1042 @@
 {
         ui_window_t *window = (ui_window_t *) arg;
-
-        return gfx_cursor_get_pos(window->realgc, pos);
+        gfx_coord2_t cpos;
+        errno_t rc;
+
+        rc = gfx_cursor_get_pos(window->realgc, &cpos);
+        if (rc != EOK)
+                return rc;
+
+        pos->x = cpos.x - window->dpos.x;
+        pos->y = cpos.y - window->dpos.y;
+        return EOK;
 }
 
@@ -1043 +1062 @@
 {
         ui_window_t *window = (ui_window_t *) arg;
-
-        return gfx_cursor_set_pos(window->realgc, pos);
+        gfx_coord2_t cpos;
+
+        cpos.x = pos->x + window->dpos.x;
+        cpos.y = pos->y + window->dpos.y;
+
+        return gfx_cursor_set_pos(window->realgc, &cpos);
 }