[PATCH] XWayland: do not set wm->focus_window to a window with no frame

[Kristian Høgsberg]

On Fri, Nov 15, 2013 at 02:04:38PM +0100, Axel Davy wrote:
> An unmapped window shouldn't be the input focus.
> This solves some remaining Weston crashes with XWayland,
> because we assume wm->focus_window has a frame.

No, the original patch from Dima is fine, not having a frame doesn't
mean you can't have keyboard focus.

> Signed-off-by: Axel Davy <axel.davy at ens.fr>
> ---
>  src/xwayland/window-manager.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/src/xwayland/window-manager.c b/src/xwayland/window-manager.c
> index 7783d2c..70244ab 100644
> --- a/src/xwayland/window-manager.c
> +++ b/src/xwayland/window-manager.c
> @@ -671,6 +671,8 @@ weston_wm_window_activate(struct wl_listener *listener, void *data)
>  
>  	if (surface) {
>  		window = get_wm_window(surface);
> +		if (window && !window->frame)
> +			window = NULL;
>  	}
>  
>  	if (window) {
> -- 
> 1.8.1.2
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel