wayland: fix a #warning

Remove window_surfaces, as the FIXME asks for. We don't need it
because we can obtain the surface from the MetaWindow, and
follow the wayland compositor path for both types of clients.

https://bugzilla.gnome.org/show_bug.cgi?id=705818
This commit is contained in:
Giovanni Campagna
2013-08-12 10:16:20 +02:00
parent ef9ef87d91
commit 03f55b9485
4 changed files with 4 additions and 27 deletions

View File

@@ -1138,8 +1138,6 @@ xserver_set_window_id (struct wl_client *client,
surface->xid = xid;
g_hash_table_insert (compositor->window_surfaces, &xid, surface);
window = meta_display_lookup_x_window (display, xid);
if (window)
{
@@ -1166,13 +1164,6 @@ xserver_set_window_id (struct wl_client *client,
meta_wayland_compositor_set_input_focus (compositor, window);
}
#warning "FIXME: Handle surface destroy and remove window_surfaces mapping"
}
MetaWaylandSurface *
meta_wayland_lookup_surface_for_xid (guint32 xid)
{
return g_hash_table_lookup (_meta_wayland_compositor.window_surfaces, &xid);
}
static const struct xserver_interface xserver_implementation = {
@@ -1543,9 +1534,6 @@ meta_wayland_init (void)
&xserver_interface, 1,
compositor, bind_xserver);
/* We need a mapping from xids to wayland surfaces... */
compositor->window_surfaces = g_hash_table_new (g_int_hash, g_int_equal);
/* XXX: It's important that we only try and start xwayland after we
* have initialized EGL because EGL implements the "wl_drm"
* interface which xwayland requires to determine what drm device