isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

xwayland: Remove outdated code

Browse Source 
Now that focus management goes through the central display.c,
we don't need to do this separately. Wayland and X clients
should just behave as one.
This commit is contained in:
Jasper St. Pierre 2013-12-09 13:48:58 -05:00
parent ca5b5e6bc4
commit fd8cc9b7a8
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,25 +39,15 @@ xserver_set_window_id (struct wl_client *client,
struct wl_resource *surface_resource, struct wl_resource *surface_resource,
guint32 xid) guint32 xid)
{ {
MetaWaylandCompositor *compositor =
wl_resource_get_user_data (compositor_resource);
MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource); MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
MetaDisplay *display = meta_get_display (); MetaDisplay *display = meta_get_display ();
MetaWindow *window; MetaWindow *window;
window = meta_display_lookup_x_window (display, xid); window = meta_display_lookup_x_window (display, xid);
if (window) if (window)
{ {
surface->window = window; surface->window = window;
window->surface = surface; window->surface = surface;
/* If the window is already meant to have focus then the
* original attempt to call this in response to the FocusIn
* event will have been lost because there was no surface
* yet. */
if (window->has_focus)
meta_wayland_compositor_set_input_focus (compositor, window);
} }
} }