xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-window.c |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit a7ee25f67dfc44a7e3007d0c86d86d6cf76072d7
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Wed Feb 1 11:33:30 2023 +0100

    xwayland: Commit surface changes with libdecor configure
    
    With libdecor, when the state changes (in the configure handler), we
    need to commit the libdecor frame but also the wl_surface, otherwise
    the surface is left in a uncommitted state until a wl_surface commit
    eventually occurs later.
    
    Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
    Fixes: c74c6add3e - xwayland: add optional support for libdecor
    Reviewed-by: Jonas Ådahl <jadahl at gmail.com>

diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index 941c1b01b..d254eab4c 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -617,6 +617,13 @@ handle_libdecor_configure(struct libdecor_frame *frame,
         libdecor_frame_unset_capabilities(frame, LIBDECOR_ACTION_RESIZE);
     if (libdecor_frame_has_capability(frame, LIBDECOR_ACTION_FULLSCREEN))
         libdecor_frame_unset_capabilities(frame, LIBDECOR_ACTION_FULLSCREEN);
+
+    /* FIXME:
+     * We're not xdg-shell compliant here, we are supposed to adjust to
+     * the given configure size.
+     */
+
+    wl_surface_commit(xwl_window->surface);
 }
 
 static void