frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xwayland: Refactor surface creation into a separate function 

This is just called from xwl_window_realize() ATM, but will be useful in
future commits.

Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
(cherry picked from commit c2e8ae9640)
This commit is contained in:
Carlos Garnacho 2019-01-07 15:33:31 +01:00 committed by Olivier Fourdan
parent e0af09061f
commit 12db645c7f
1 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
hw/xwayland/xwayland.c
View File

@ -518,36 +518,25 @@ send_surface_id_event(struct xwl_window *xwl_window)
} }
static Bool static Bool
xwl_realize_window(WindowPtr window) ensure_surface_for_window(WindowPtr window)
{ {
ScreenPtr screen = window->drawable.pScreen; ScreenPtr screen = window->drawable.pScreen;
struct xwl_screen *xwl_screen; struct xwl_screen *xwl_screen;
struct xwl_window *xwl_window; struct xwl_window *xwl_window;
struct wl_region *region; struct wl_region *region;
Bool ret;
if (xwl_window_get(window))
return TRUE;
xwl_screen = xwl_screen_get(screen); xwl_screen = xwl_screen_get(screen);
screen->RealizeWindow = xwl_screen->RealizeWindow;
ret = (*screen->RealizeWindow) (window);
xwl_screen->RealizeWindow = screen->RealizeWindow;
screen->RealizeWindow = xwl_realize_window;
if (xwl_screen->rootless && !window->parent) {
BoxRec box = { 0, 0, xwl_screen->width, xwl_screen->height };
RegionReset(&window->winSize, &box);
RegionNull(&window->clipList);
RegionNull(&window->borderClip);
}
if (xwl_screen->rootless) { if (xwl_screen->rootless) {
if (window->redirectDraw != RedirectDrawManual) if (window->redirectDraw != RedirectDrawManual)
return ret; return TRUE;
} }
else { else {
if (window->parent) if (window->parent)
return ret; return TRUE;
} }
xwl_window = calloc(1, sizeof *xwl_window); xwl_window = calloc(1, sizeof *xwl_window);
@ -595,15 +584,12 @@ xwl_realize_window(WindowPtr window)
compRedirectWindow(serverClient, window, CompositeRedirectManual); compRedirectWindow(serverClient, window, CompositeRedirectManual);
if (!register_damage(window))
goto err_surf;
dixSetPrivate(&window->devPrivates, &xwl_window_private_key, xwl_window); dixSetPrivate(&window->devPrivates, &xwl_window_private_key, xwl_window);
xorg_list_init(&xwl_window->link_damage); xorg_list_init(&xwl_window->link_damage);
xwl_window_init_allow_commits(xwl_window); xwl_window_init_allow_commits(xwl_window);
return ret; return TRUE;
err_surf: err_surf:
if (xwl_window->shell_surface) if (xwl_window->shell_surface)
@ -614,6 +600,42 @@ err:
return FALSE; return FALSE;
} }
static Bool
xwl_realize_window(WindowPtr window)
{
ScreenPtr screen = window->drawable.pScreen;
struct xwl_screen *xwl_screen;
Bool ret;
xwl_screen = xwl_screen_get(screen);
screen->RealizeWindow = xwl_screen->RealizeWindow;
ret = (*screen->RealizeWindow) (window);
xwl_screen->RealizeWindow = screen->RealizeWindow;
screen->RealizeWindow = xwl_realize_window;
if (!ret)
return FALSE;
if (xwl_screen->rootless && !window->parent) {
BoxRec box = { 0, 0, xwl_screen->width, xwl_screen->height };
RegionReset(&window->winSize, &box);
RegionNull(&window->clipList);
RegionNull(&window->borderClip);
}
if (xwl_screen->rootless ?
(window->drawable.class == InputOutput &&
window->parent == window->drawable.pScreen->root) :
!window->parent) {
if (!register_damage(window))
return FALSE;
}
return ensure_surface_for_window(window);
}
static Bool static Bool
xwl_unrealize_window(WindowPtr window) xwl_unrealize_window(WindowPtr window)
{ {