[PATCH weston 5/6] libweston-desktop/xwayland: XWAYLAND surfaces are never 'added'

Quentin Glidic sardemff7+wayland at sardemff7.net
Thu Nov 24 15:02:14 UTC 2016


On 24/11/2016 12:40, Pekka Paalanen wrote:
> From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
>
> Add documentation (asserts) that show that windows of types XWAYLAND are
> never registered with the shell.
>
> Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

Not a big fan of asserts in internal stuff, but if you feel like it’s 
needed:
Reviewed-by: Quentin Glidic <sardemff7+git at sardemff7.net>

Cheers,

> ---
>  libweston-desktop/xwayland.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/libweston-desktop/xwayland.c b/libweston-desktop/xwayland.c
> index f0cd1ed..7b8f6db 100644
> --- a/libweston-desktop/xwayland.c
> +++ b/libweston-desktop/xwayland.c
> @@ -83,6 +83,8 @@ weston_desktop_xwayland_surface_change_state(struct weston_desktop_xwayland_surf
>
>  	if (surface->state != state) {
>  		if (surface->state == XWAYLAND) {
> +			assert(!surface->added);
> +
>  			weston_desktop_surface_unlink_view(surface->view);
>  			weston_view_destroy(surface->view);
>  			surface->view = NULL;
> @@ -100,6 +102,8 @@ weston_desktop_xwayland_surface_change_state(struct weston_desktop_xwayland_surf
>  		}
>
>  		if (state == XWAYLAND) {
> +			assert(!surface->added);
> +
>  			surface->view =
>  				weston_desktop_surface_create_view(surface->surface);
>  			weston_layer_entry_insert(&surface->xwayland->layer.view_list,
>


-- 

Quentin “Sardem FF7” Glidic


More information about the wayland-devel mailing list