[PATCH v2] xwayland: Do set root clip with rootless

Julien Cristau jcristau at debian.org
Sat Nov 21 06:04:27 PST 2015


On Sat, Nov 21, 2015 at 14:43:47 +0100, Olivier Fourdan wrote:

> diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
> index ebaf05a..16d1ab9 100644
> --- a/hw/xwayland/xwayland-glamor.c
> +++ b/hw/xwayland/xwayland-glamor.c
> @@ -233,9 +233,11 @@ xwl_glamor_create_screen_resources(ScreenPtr screen)
>      if (!ret)
>          return ret;
>  
> -    if (xwl_screen->rootless)
> +    if (xwl_screen->rootless) {
>          screen->devPrivate =
>              fbCreatePixmap(screen, 0, 0, screen->rootDepth, 0);
> +            SetRootClip(screen, FALSE);

indentation looks wrong here here...

> +    }
>      else {
>          screen->devPrivate =
>              xwl_glamor_create_pixmap(screen, screen->width, screen->height,
[...]
> diff --git a/hw/xwayland/xwayland-shm.c b/hw/xwayland/xwayland-shm.c
> index 1022c0d..3c42456 100644
> --- a/hw/xwayland/xwayland-shm.c
> +++ b/hw/xwayland/xwayland-shm.c
> @@ -279,9 +279,11 @@ xwl_shm_create_screen_resources(ScreenPtr screen)
>      if (!ret)
>          return ret;
>  
> -    if (xwl_screen->rootless)
> +    if (xwl_screen->rootless) {
>          screen->devPrivate =
>              fbCreatePixmap(screen, 0, 0, screen->rootDepth, 0);
> +            SetRootClip(screen, FALSE);

and here.

Cheers,
Julien

> +    }
>      else
>          screen->devPrivate =
>              xwl_shm_create_pixmap(screen, screen->width, screen->height,
> -- 
> 2.5.0
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel


More information about the xorg-devel mailing list