[PATCH weston 06/10] xserver: remove unused code for the activate listener

[Kristian Høgsberg]

On Fri, May 18, 2012 at 06:47:13PM +0300, Tiago Vignatti wrote:
> activate will always come with a valid surface, so this path never runs.

Yes, but not all surfaces correspond to X windows.  If the surface
getting activated is a native wayland client, window is NULL and we
(the X wm) need to take away focus from the currently focused X
window.

Kristian

> Signed-off-by: Tiago Vignatti <tiago.vignatti at intel.com>
> ---
>  src/xserver-launcher.c |    5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/src/xserver-launcher.c b/src/xserver-launcher.c
> index 838530d..f785508 100644
> --- a/src/xserver-launcher.c
> +++ b/src/xserver-launcher.c
> @@ -696,11 +696,6 @@ weston_xserver_surface_activate(struct wl_listener *listener, void *data)
>  
>  	if (window)
>  		weston_wm_activate(wxs->wm, window, XCB_TIME_CURRENT_TIME);
> -	else
> -		xcb_set_input_focus (wxs->wm->conn,
> -				     XCB_INPUT_FOCUS_POINTER_ROOT,
> -				     XCB_NONE,
> -				     XCB_TIME_CURRENT_TIME);
>  
>  	if (wxs->wm->focus_window)
>  		weston_wm_window_schedule_repaint(wxs->wm->focus_window);
> -- 
> 1.7.9.5
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel