[mutter/wayland] xwayland: Remove outdated code



commit fd8cc9b7a8dfdb7715e91564b0978f6beb4a0f91
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Dec 9 13:48:58 2013 -0500

    xwayland: Remove outdated code
    
    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.

 src/wayland/meta-xwayland.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index cf78a59..02c5b7b 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -39,25 +39,15 @@ xserver_set_window_id (struct wl_client *client,
                        struct wl_resource *surface_resource,
                        guint32 xid)
 {
-  MetaWaylandCompositor *compositor =
-    wl_resource_get_user_data (compositor_resource);
   MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
   MetaDisplay *display = meta_get_display ();
   MetaWindow *window;
 
-  window  = meta_display_lookup_x_window (display, xid);
+  window = meta_display_lookup_x_window (display, xid);
   if (window)
     {
       surface->window = window;
       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);
-
     }
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]