[PATCH 2/6] xwayland: remove rootless flag

[Kristian Høgsberg]

Rootless tells the X server to show each toplevel window as a wayland
surface.  The default behavior is rooted, which just makes the root
window a wayland surface.  Both modes are useful.

Kristian

On Mon, Apr 16, 2012 at 10:31 AM, Tiago Vignatti
<tiago.vignatti at intel.com> wrote:
> I can start a stand-alone xserver for debugging and also spawn it directly via
> weston. I don't see an usage for this flags; is there any?
>
> Signed-off-by: Tiago Vignatti <tiago.vignatti at intel.com>
> ---
>  hw/xfree86/xwayland/xwayland-window.c |   12 +++---------
>  hw/xfree86/xwayland/xwayland.c        |    3 ---
>  hw/xfree86/xwayland/xwayland.h        |    2 --
>  3 files changed, 3 insertions(+), 14 deletions(-)
>
> diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
> index e58350f..0f2a26f 100644
> --- a/hw/xfree86/xwayland/xwayland-window.c
> +++ b/hw/xfree86/xwayland/xwayland-window.c
> @@ -105,8 +105,7 @@ xwl_create_window(WindowPtr window)
>     xwl_screen->CreateWindow = screen->CreateWindow;
>     screen->CreateWindow = xwl_create_window;
>
> -    if (!(xwl_screen->flags & XWL_FLAGS_ROOTLESS) ||
> -       window->parent != NULL)
> +    if (window->parent != NULL)
>        return ret;
>
>     len = snprintf(buffer, sizeof buffer, "_NET_WM_CM_S%d", screen->myNum);
> @@ -174,13 +173,8 @@ xwl_realize_window(WindowPtr window)
>     xwl_screen->RealizeWindow = xwl_screen->RealizeWindow;
>     screen->RealizeWindow = xwl_realize_window;
>
> -    if (xwl_screen->flags & XWL_FLAGS_ROOTLESS) {
> -       if (window->redirectDraw != RedirectDrawManual)
> -           return ret;
> -    } else {
> -       if (window->parent)
> -           return ret;
> -    }
> +    if (window->redirectDraw != RedirectDrawManual)
> +       return ret;
>
>     xwl_window = calloc(sizeof *xwl_window, 1);
>     xwl_window->xwl_screen = xwl_screen;
> diff --git a/hw/xfree86/xwayland/xwayland.c b/hw/xfree86/xwayland/xwayland.c
> index 829b4c2..a35f665 100644
> --- a/hw/xfree86/xwayland/xwayland.c
> +++ b/hw/xfree86/xwayland/xwayland.c
> @@ -237,9 +237,6 @@ xwl_screen_pre_init(ScrnInfoPtr scrninfo,
>     xwl_screen->driver = driver;
>     xwl_screen->flags = flags;
>
> -    if (xorgRootless)
> -       xwl_screen->flags |= XWL_FLAGS_ROOTLESS;
> -
>     xwl_screen->display = wl_display_connect(NULL);
>     if (xwl_screen->display == NULL) {
>        ErrorF("wl_display_create failed\n");
> diff --git a/hw/xfree86/xwayland/xwayland.h b/hw/xfree86/xwayland/xwayland.h
> index 5eba934..87601df 100644
> --- a/hw/xfree86/xwayland/xwayland.h
> +++ b/hw/xfree86/xwayland/xwayland.h
> @@ -38,8 +38,6 @@ struct xwl_driver {
>                                 PixmapPtr pixmap);
>  };
>
> -#define XWL_FLAGS_ROOTLESS 0x01
> -
>  extern _X_EXPORT int
>  xwl_version(void);
>
> --
> 1.7.5.4
>
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel