xwayland: Put getting a xwl_window from a Window in a helper

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Jonas Ådahl 2016-09-13 15:17:05 +08:00 committed by Adam Jackson
parent b4644ce8d3
commit c14a8c6cc0

View File

@ -103,6 +103,12 @@ static DevPrivateKeyRec xwl_window_private_key;
static DevPrivateKeyRec xwl_screen_private_key; static DevPrivateKeyRec xwl_screen_private_key;
static DevPrivateKeyRec xwl_pixmap_private_key; static DevPrivateKeyRec xwl_pixmap_private_key;
static struct xwl_window *
xwl_window_get(WindowPtr window)
{
return dixLookupPrivate(&window->devPrivates, &xwl_window_private_key);
}
struct xwl_screen * struct xwl_screen *
xwl_screen_get(ScreenPtr screen) xwl_screen_get(ScreenPtr screen)
{ {
@ -335,8 +341,7 @@ xwl_unrealize_window(WindowPtr window)
xwl_screen->UnrealizeWindow = screen->UnrealizeWindow; xwl_screen->UnrealizeWindow = screen->UnrealizeWindow;
screen->UnrealizeWindow = xwl_unrealize_window; screen->UnrealizeWindow = xwl_unrealize_window;
xwl_window = xwl_window = xwl_window_get(window);
dixLookupPrivate(&window->devPrivates, &xwl_window_private_key);
if (!xwl_window) if (!xwl_window)
return ret; return ret;