mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor: Adapt to wl_surface going away

Browse Source 
struct weston_surface is now the only surface type we have (in core, shell.c
has shell_surface, of course).  A lot of code gets simpler and we never
have to try to guess whether an API takes a wl_surface or a weston_surface.
This commit is contained in:
Kristian Høgsberg
2013-05-08 09:54:37 -04:00
parent a4036bbd23
commit fe7aa90ed4
10 changed files with 82 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/xwayland/window-manager.c
+3 -3
View File
@@ -1016,7 +1016,7 @@ weston_wm_window_handle_moveresize(struct weston_wm_window *window,
&wm->server->compositor->shell_interface;
if (seat->pointer->button_count != 1 ||
seat->pointer->focus != &window->surface->surface)
seat->pointer->focus != window->surface)
return;
detail = client_message->data.data32[2];
@@ -1715,7 +1715,7 @@ surface_destroy(struct wl_listener *listener, void *data)
static struct weston_wm_window *
get_wm_window(struct weston_surface *surface)
{
struct wl_resource *resource = &surface->surface.resource;
struct wl_resource *resource = &surface->resource;
struct wl_listener *listener;
listener = wl_signal_get(&resource->destroy_signal, surface_destroy);
@@ -1852,7 +1852,7 @@ xserver_set_window_id(struct wl_client *client, struct wl_resource *resource,
{
struct weston_xserver *wxs = resource->data;
struct weston_wm *wm = wxs->wm;
struct wl_surface *surface = surface_resource->data;
struct weston_surface *surface = surface_resource->data;
struct weston_wm_window *window;
if (client != wxs->client)