diff options
author | Kristian Høgsberg <krh@bitplanet.net> | 2013-10-11 15:41:59 -0700 |
---|---|---|
committer | Kristian Høgsberg <krh@bitplanet.net> | 2013-10-11 16:29:59 -0700 |
commit | 4625297f55a03a688c07cefc221a792f55e9e2a7 (patch) | |
tree | 71eb539b24f538332df10491109791a2306b6007 | |
parent | be04f9c1167ad289227f23e235b9230fc9631a50 (diff) |
xwayland: Don't redirect windows, leave it to the wm
-rw-r--r-- | hw/xfree86/xwayland/xwayland-window.c | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c index 5045e65cf..c03855c73 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; |