wayland: obey initial size hints set by the compositor

In the past, this worked by accident because the initial startup was
racy and sometimes the initial firing of handle_toplevel_config would
happen after reconfig. Since we now properly wait on all compositor
events we can save the initial size hint that is given to us and try to
use that as the window-size/geometry provided the --autofit/geometry
options aren't explictly set. Fixes #11134.

1 files changed, 16 insertions, 10 deletions

diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index ca1d17bb2d..c75a1db5de 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -894,9 +894,17 @@ static void handle_toplevel_config(void *data, struct xdg_toplevel *toplevel,
     wl->toplevel_width = width;
     wl->toplevel_height = height;
 
-    /* Don't do anything here if we haven't finished setting geometry. */
-    if (mp_rect_w(wl->geometry) == 0 || mp_rect_h(wl->geometry) == 0)
+    if (!wl->configured) {
+        /* Save initial window size if the compositor gives us a hint here. */
+        bool autofit_or_geometry = vo_opts->geometry.wh_valid || vo_opts->autofit.wh_valid ||
+                                   vo_opts->autofit_larger.wh_valid || vo_opts->autofit_smaller.wh_valid;
+        if (width && height && !autofit_or_geometry) {
+            wl->initial_size_hint = true;
+            wl->window_size = (struct mp_rect){0, 0, width, height};
+            wl->geometry = wl->window_size;
+        }
         return;
+    }
 
     bool is_maximized = false;
     bool is_fullscreen = false;
@@ -1790,7 +1798,9 @@ static void set_geometry(struct vo_wayland_state *wl, bool resize)
     wl->reduced_width = vo->dwidth / gcd;
     wl->reduced_height = vo->dheight / gcd;
 
-    wl->window_size = (struct mp_rect){0, 0, vo->dwidth, vo->dheight};
+    if (!wl->initial_size_hint)
+        wl->window_size = (struct mp_rect){0, 0, vo->dwidth, vo->dheight};
+    wl->initial_size_hint = false;
 
     if (resize) {
         if (!wl->locked_size)
@@ -2345,19 +2355,15 @@ bool vo_wayland_reconfig(struct vo *vo)
         wl->pending_vo_events |= VO_EVENT_DPI;
     }
 
-    if (wl->vo_opts->auto_window_resize || mp_rect_w(wl->geometry) == 0 ||
-        mp_rect_h(wl->geometry) == 0)
-    {
+    if (wl->vo_opts->auto_window_resize || !wl->configured)
         set_geometry(wl, false);
-    }
 
     if (wl->opts->configure_bounds)
         set_window_bounds(wl);
 
-    if (mp_rect_w(wl->geometry) == 0 || mp_rect_h(wl->geometry) == 0 ||
-        !wl->locked_size)
-    {
+    if (!wl->configured || !wl->locked_size) {
         wl->geometry = wl->window_size;
+        wl->configured = true;
     }
 
     if (wl->vo_opts->cursor_passthrough)