brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xwayland: Split a helper out

Browse Source 
This will make the next commit, which ports to the new ClientMessage
API, more understandable.
This commit is contained in:
Jasper St. Pierre 2014-04-02 10:19:39 -04:00
parent e07bd15fc2
commit 9653b79a35
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/wayland/meta-xwayland.c
View File

@ -37,6 +37,25 @@
#include "meta-window-actor-private.h" #include "meta-window-actor-private.h"
#include "xserver-server-protocol.h" #include "xserver-server-protocol.h"
static void
associate_window_with_surface (MetaWindow *window,
MetaWaylandSurface *surface)
{
MetaDisplay *display = window->display;
/* If the window has an existing surface, like if we're
* undecorating or decorating the window, then we need
* to detach the window from its old surface.
*/
if (window->surface)
window->surface->window = NULL;
meta_wayland_surface_set_window (surface, window);
window->surface = surface;
meta_compositor_window_surface_changed (display->compositor, window);
}
static void static void
xserver_set_window_id (struct wl_client *client, xserver_set_window_id (struct wl_client *client,
struct wl_resource *compositor_resource, struct wl_resource *compositor_resource,
@ -51,17 +70,7 @@ xserver_set_window_id (struct wl_client *client,
if (!window) if (!window)
return; return;
/* If the window has an existing surface, like if we're associate_window_with_surface (window, surface);
* undecorating or decorating the window, then we need
* to detach the window from its old surface.
*/
if (window->surface)
window->surface->window = NULL;
meta_wayland_surface_set_window (surface, window);
window->surface = surface;
meta_compositor_window_surface_changed (display->compositor, window);
} }
static const struct xserver_interface xserver_implementation = { static const struct xserver_interface xserver_implementation = {