From d0466e842a1dbde028abdab647fa64bbe8f7cd78 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <ofourdan@redhat.com>
Date: Thu, 28 Apr 2022 15:49:51 +0200
Subject: [PATCH] xwayland: move the root window surface to its own function
Currently, when running rootful, the toplevel root surface is created in
the same function as the rest of the Wayland surfaces.
Move it to its own function to improve readability - No function change.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
---
hw/xwayland/xwayland-window.c | 95 ++++++++++++++++++++---------------
1 file changed, 54 insertions(+), 41 deletions(-)
diff --git a/hw/xwayland/xwayland-window.c b/hw/xwayland/xwayland-window.c
index 25c8f6cf7e..dc520a0c64 100644
--- a/hw/xwayland/xwayland-window.c
+++ b/hw/xwayland/xwayland-window.c
@@ -520,13 +520,64 @@ static const struct wl_surface_listener surface_listener = {
xwl_window_surface_leave
};
+static Bool
+xwl_create_root_surface(struct xwl_window *xwl_window)
+{
+ struct xwl_screen *xwl_screen = xwl_window->xwl_screen;
+ WindowPtr window = xwl_window->window;
+ struct wl_region *region;
+
+ xwl_window->xdg_surface =
+ xdg_wm_base_get_xdg_surface(xwl_screen->xdg_wm_base, xwl_window->surface);
+ if (xwl_window->xdg_surface == NULL) {
+ ErrorF("Failed creating xdg_wm_base xdg_surface\n");
+ goto err_surf;
+ }
+
+ xwl_window->xdg_toplevel =
+ xdg_surface_get_toplevel(xwl_window->xdg_surface);
+ if (xwl_window->xdg_surface == NULL) {
+ ErrorF("Failed creating xdg_toplevel\n");
+ goto err_surf;
+ }
+
+ wl_surface_add_listener(xwl_window->surface,
+ &surface_listener, xwl_window);
+
+ xdg_surface_add_listener(xwl_window->xdg_surface,
+ &xdg_surface_listener, xwl_window);
+
+ wl_surface_commit(xwl_window->surface);
+
+ region = wl_compositor_create_region(xwl_screen->compositor);
+ if (region == NULL) {
+ ErrorF("Failed creating region\n");
+ goto err_surf;
+ }
+
+ wl_region_add(region, 0, 0,
+ window->drawable.width, window->drawable.height);
+ wl_surface_set_opaque_region(xwl_window->surface, region);
+ wl_region_destroy(region);
+
+ return TRUE;
+
+err_surf:
+ if (xwl_window->xdg_toplevel)
+ xdg_toplevel_destroy(xwl_window->xdg_toplevel);
+ if (xwl_window->xdg_surface)
+ xdg_surface_destroy(xwl_window->xdg_surface);
+ wl_surface_destroy(xwl_window->surface);
+
+ return FALSE;
+}
+
static Bool
ensure_surface_for_window(WindowPtr window)
{
ScreenPtr screen = window->drawable.pScreen;
struct xwl_screen *xwl_screen;
struct xwl_window *xwl_window;
- struct wl_region *region;
WindowPtr toplevel;
if (xwl_window_from_window(window))
@@ -555,40 +606,8 @@ ensure_surface_for_window(WindowPtr window)
goto err;
}
- if (!xwl_screen->rootless) {
- xwl_window->xdg_surface =
- xdg_wm_base_get_xdg_surface(xwl_screen->xdg_wm_base, xwl_window->surface);
- if (xwl_window->xdg_surface == NULL) {
- ErrorF("Failed creating xdg_wm_base xdg_surface\n");
- goto err_surf;
- }
-
- xwl_window->xdg_toplevel =
- xdg_surface_get_toplevel(xwl_window->xdg_surface);
- if (xwl_window->xdg_surface == NULL) {
- ErrorF("Failed creating xdg_toplevel\n");
- goto err_surf;
- }
-
- wl_surface_add_listener(xwl_window->surface,
- &surface_listener, xwl_window);
-
- xdg_surface_add_listener(xwl_window->xdg_surface,
- &xdg_surface_listener, xwl_window);
-
- wl_surface_commit(xwl_window->surface);
-
- region = wl_compositor_create_region(xwl_screen->compositor);
- if (region == NULL) {
- ErrorF("Failed creating region\n");
- goto err_surf;
- }
-
- wl_region_add(region, 0, 0,
- window->drawable.width, window->drawable.height);
- wl_surface_set_opaque_region(xwl_window->surface, region);
- wl_region_destroy(region);
- }
+ if (!xwl_screen->rootless && !xwl_create_root_surface(xwl_window))
+ goto err;
wl_display_flush(xwl_screen->display);
@@ -624,12 +643,6 @@ ensure_surface_for_window(WindowPtr window)
return TRUE;
-err_surf:
- if (xwl_window->xdg_toplevel)
- xdg_toplevel_destroy(xwl_window->xdg_toplevel);
- if (xwl_window->xdg_surface)
- xdg_surface_destroy(xwl_window->xdg_surface);
- wl_surface_destroy(xwl_window->surface);
err:
free(xwl_window);
return FALSE;
--
GitLab