xserver: Branch 'xwayland' - 3 commits

[Kristian Høgsberg]

 composite/compalloc.c                 |   11 -------
 composite/compositeext.h              |    4 --
 hw/xfree86/common/xf86AutoConfig.c    |    6 ++--
 hw/xfree86/xwayland/xwayland-window.c |   51 ----------------------------------
 4 files changed, 3 insertions(+), 69 deletions(-)

New commits:
commit a327beb0a80b7b7c92d9dc50bafb059d35aed673
Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Fri Oct 11 16:40:39 2013 -0700

    Revert "Export CompositeRedirectSubwindows and CompositeUnRedirectSubwindows"
    
    This reverts commit 15a7e62a9848f2089180c49b02887565d29bb896.
    
    Now that we don't redirect windows on behalf of the wm, we don't need this.

diff --git a/composite/compalloc.c b/composite/compalloc.c
index edee499..cc69c68 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -46,7 +46,6 @@
 #endif
 
 #include "compint.h"
-#include "compositeext.h"
 
 static void
 compScreenUpdate(ScreenPtr pScreen)
@@ -412,11 +411,6 @@ compRedirectSubwindows(ClientPtr pClient, WindowPtr pWin, int update)
     return Success;
 }
 
-int CompositeRedirectSubwindows (WindowPtr pWin, int update)
-{
-    return compRedirectSubwindows (serverClient, pWin, update);
-}
-
 /*
  * Free one of the per-client per-subwindows resources,
  * which frees one redirect per subwindow
@@ -488,11 +482,6 @@ compUnredirectSubwindows(ClientPtr pClient, WindowPtr pWin, int update)
     return BadValue;
 }
 
-int CompositeUnRedirectSubwindows (WindowPtr pWin, int update)
-{
-    return compUnredirectSubwindows (serverClient, pWin, update);
-}
-
 /*
  * Add redirection information for one subwindow (during reparent)
  */
diff --git a/composite/compositeext.h b/composite/compositeext.h
index a072966..0b148f0 100644
--- a/composite/compositeext.h
+++ b/composite/compositeext.h
@@ -34,10 +34,6 @@
 extern _X_EXPORT Bool CompositeRegisterAlternateVisuals(ScreenPtr pScreen,
                                                         VisualID * vids,
                                                         int nVisuals);
-extern _X_EXPORT int CompositeRedirectSubwindows(WindowPtr pWin,
-						 int update);
-extern _X_EXPORT int CompositeUnRedirectSubwindows (WindowPtr pWin,
-						    int update);
 
 extern _X_EXPORT RESTYPE CompositeClientWindowType;
 
commit 4625297f55a03a688c07cefc221a792f55e9e2a7
Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Fri Oct 11 15:41:59 2013 -0700

    xwayland: Don't redirect windows, leave it to the wm

diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
index 5045e65..c03855c 100644
--- a/hw/xfree86/xwayland/xwayland-window.c
+++ b/hw/xfree86/xwayland/xwayland-window.c
@@ -31,11 +31,9 @@
 #include <errno.h>
 #include <sys/mman.h>
 #include <wayland-client.h>
-#include <X11/extensions/compositeproto.h>
 
 #include <xf86Crtc.h>
 #include <selection.h>
-#include <compositeext.h>
 #include <exevents.h>
 
 #include "xwayland.h"
@@ -86,49 +84,6 @@ xwl_window_attach(struct xwl_window *xwl_window, PixmapPtr pixmap)
     pixmap->refcnt++;
 }
 
-static Bool
-xwl_create_window(WindowPtr window)
-{
-    ScreenPtr screen = window->drawable.pScreen;
-    struct xwl_screen *xwl_screen;
-    Bool ret;
-
-    xwl_screen = xwl_screen_get(screen);
-
-    screen->CreateWindow = xwl_screen->CreateWindow;
-    ret = (*screen->CreateWindow)(window);
-    xwl_screen->CreateWindow = screen->CreateWindow;
-    screen->CreateWindow = xwl_create_window;
-
-    if (!(xwl_screen->flags & XWL_FLAGS_ROOTLESS) ||
-	window->parent != NULL)
-	return ret;
-
-    CompositeRedirectSubwindows(window, CompositeRedirectManual);
-
-    return ret;
-}
-
-static int
-xwl_destroy_window (WindowPtr window)
-{
-    ScreenPtr screen = window->drawable.pScreen;
-    struct xwl_screen *xwl_screen;
-    Bool ret;
-
-    if (window->parent == NULL)
-	CompositeUnRedirectSubwindows (window, CompositeRedirectManual);
-
-    xwl_screen = xwl_screen_get(screen);
-
-    screen->DestroyWindow = xwl_screen->DestroyWindow;
-    ret = (*screen->DestroyWindow)(window);
-    xwl_screen->DestroyWindow = screen->DestroyWindow;
-    screen->DestroyWindow = xwl_destroy_window;
-
-    return ret;
-}
-
 static void
 damage_report(DamagePtr pDamage, RegionPtr pRegion, void *data)
 {
@@ -290,12 +245,6 @@ xwl_screen_init_window(struct xwl_screen *xwl_screen, ScreenPtr screen)
     if (!dixRegisterPrivateKey(&xwl_window_private_key, PRIVATE_WINDOW, 0))
 	return BadAlloc;
 
-    xwl_screen->CreateWindow = screen->CreateWindow;
-    screen->CreateWindow = xwl_create_window;
-
-    xwl_screen->DestroyWindow = screen->DestroyWindow;
-    screen->DestroyWindow = xwl_destroy_window;
-
     xwl_screen->RealizeWindow = screen->RealizeWindow;
     screen->RealizeWindow = xwl_realize_window;
 
commit be04f9c1167ad289227f23e235b9230fc9631a50
Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Fri Oct 11 16:29:02 2013 -0700

    xwayland: Add wlglamor the right way
    
    Defeated by #ifdefs.

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 9576b86..cc6dcce 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -282,12 +282,12 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
 
 #if !defined(sun)
     /* Fallback to platform default frame buffer driver */
-    if (i < (nmatches - 1)) {
+    if (i < (nmatches - 2)) {
 #ifdef XORG_WAYLAND
-        if (xorgWayland)
+        if (xorgWayland) {
             matches[i++] = xnfstrdup("wlglamor");
             matches[i++] = xnfstrdup("wayland");
-        else
+        } else
 #endif
 #if !defined(__linux__) && defined(__sparc__)
             matches[i++] = xnfstrdup("wsfb");