Changeset 1bebc906 in mainline

Timestamp:

2021-06-10T12:51:21Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Parents:

4b72e81

git-author:

Jiri Svoboda <jiri@…> (2021-06-09 18:51:04)

git-committer:

Jiri Svoboda <jiri@…> (2021-06-10 12:51:21)

Message:

Allow setting initial window position (instead of moving the window)

To reduce display artifacts. We can create the menu popup windows
in the correct place from the start. The same goes for regular
windows with specific placement.

Location:

uspace

Files:

• lib/display/include/types/display/wndparams.h (modified) (2 diffs)
• lib/ui/src/window.c (modified) (3 diffs)
• srv/hid/display/window.c (modified) (1 diff)

uspace/lib/display/include/types/display/wndparams.h

@@ -41 +41 @@
 typedef enum {
         /** Popup window (capture events, no focus) */
-        wndf_popup = 0x1
+        wndf_popup = 0x1,
+        /** Set specific initial window position */
+        wndf_setpos = 0x2
 } display_wnd_flags_t;
 
@@ -56 +58 @@
         /** Minimum size (when being resized) */
         gfx_coord2_t min_size;
+        /** Initial position (if flag wndf_setpos is set) */
+        gfx_coord2_t pos;
         /** Flags */
         display_wnd_flags_t flags;

uspace/lib/ui/src/window.c

@@ -109 +109 @@
 }
 
-static errno_t ui_window_place(ui_window_t *window, display_t *display,
-    display_info_t *info, ui_wnd_params_t *params)
-{
-        gfx_coord2_t pos;
-        errno_t rc;
-
+/** 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
+ * @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);
 
-        pos.x = 0;
-        pos.y = 0;
+        pos->x = 0;
+        pos->y = 0;
+
         switch (params->placement) {
         case ui_wnd_place_default:
@@ -124 +132 @@
         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 = info->rect.p0.x - params->rect.p0.x;
+                pos->y = info->rect.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 = info->rect.p1.x - params->rect.p1.x;
+                pos->y = info->rect.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 = info->rect.p0.x - params->rect.p0.x;
+                pos->y = info->rect.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 = info->rect.p1.x - params->rect.p1.x;
+                pos->y = info->rect.p1.y - params->rect.p1.y;
                 break;
         case ui_wnd_place_popup:
                 /* Place popup window below parent rectangle */
-                pos.x = params->prect.p0.x;
-                pos.y = params->prect.p1.y;
+                pos->x = params->prect.p0.x;
+                pos->y = params->prect.p1.y;
                 break;
         }
-
-        rc = display_window_move(window->dwindow, &pos);
-        if (rc != EOK)
-                goto error;
-
-        return EOK;
-error:
-        return rc;
 }
 
@@ -205 +205 @@
                 }
 
+                if (params->placement != ui_wnd_place_default) {
+                        /* Set initial display window position */
+                        ui_window_place(window, ui->display, &info,
+                            params, &dparams.pos);
+
+                        dparams.flags |= wndf_setpos;
+                }
+
                 rc = display_window_create(ui->display, &dparams, &dwnd_cb,
                     (void *) window, &window->dwindow);
                 if (rc != EOK)
                         goto error;
-
-                if (params->placement != ui_wnd_place_default) {
-                        rc = ui_window_place(window, ui->display, &info,
-                            params);
-                        if (rc != EOK)
-                                goto error;
-                }
 
                 rc = display_window_get_gc(window->dwindow, &gc);

uspace/srv/hid/display/window.c

@@ -119 +119 @@
         wnd->flags = params->flags;
 
-        wnd->dpos.x = ((wnd->id - 1) & 1) * 400;
-        wnd->dpos.y = ((wnd->id - 1) & 2) / 2 * 300;
+        if ((params->flags & wndf_setpos) != 0) {
+                /* Specific window position */
+                wnd->dpos = params->pos;
+        } else {
+                /* Automatic window placement */
+                wnd->dpos.x = ((wnd->id - 1) & 1) * 400;
+                wnd->dpos.y = ((wnd->id - 1) & 2) / 2 * 300;
+        }
 
         seat = ds_display_first_seat(client->display);