|
 |
70130e |
From 52668595cb7e52612944a77276eb71f29d037738 Mon Sep 17 00:00:00 2001
|
|
|
70130e |
From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
|
|
|
70130e |
Date: Fri, 11 Oct 2013 15:41:59 -0700
|
|
|
70130e |
Subject: [PATCH 34/39] xwayland: Don't redirect windows, leave it to the wm
|
|
|
70130e |
|
|
|
70130e |
---
|
|
|
70130e |
hw/xfree86/xwayland/xwayland-window.c | 51 -----------------------------------
|
|
|
70130e |
1 file changed, 51 deletions(-)
|
|
|
70130e |
|
|
|
70130e |
diff --git a/hw/xfree86/xwayland/xwayland-window.c b/hw/xfree86/xwayland/xwayland-window.c
|
|
|
70130e |
index fb9c64a..0cb4f28 100644
|
|
|
70130e |
--- a/hw/xfree86/xwayland/xwayland-window.c
|
|
|
70130e |
+++ b/hw/xfree86/xwayland/xwayland-window.c
|
|
|
70130e |
@@ -31,11 +31,9 @@
|
|
|
70130e |
#include <errno.h>
|
|
|
70130e |
#include <sys/mman.h>
|
|
|
70130e |
#include <wayland-client.h>
|
|
|
70130e |
-#include <X11/extensions/compositeproto.h>
|
|
|
70130e |
|
|
|
70130e |
#include <xf86Crtc.h>
|
|
|
70130e |
#include <selection.h>
|
|
|
70130e |
-#include <compositeext.h>
|
|
|
70130e |
#include <exevents.h>
|
|
|
70130e |
|
|
|
70130e |
#include "xwayland.h"
|
|
|
70130e |
@@ -86,49 +84,6 @@ xwl_window_attach(struct xwl_window *xwl_window, PixmapPtr pixmap)
|
|
|
70130e |
pixmap->refcnt++;
|
|
|
70130e |
}
|
|
|
70130e |
|
|
|
70130e |
-static Bool
|
|
|
70130e |
-xwl_create_window(WindowPtr window)
|
|
|
70130e |
-{
|
|
|
70130e |
- ScreenPtr screen = window->drawable.pScreen;
|
|
|
70130e |
- struct xwl_screen *xwl_screen;
|
|
|
70130e |
- Bool ret;
|
|
|
70130e |
-
|
|
|
70130e |
- xwl_screen = xwl_screen_get(screen);
|
|
|
70130e |
-
|
|
|
70130e |
- screen->CreateWindow = xwl_screen->CreateWindow;
|
|
|
70130e |
- ret = (*screen->CreateWindow)(window);
|
|
|
70130e |
- xwl_screen->CreateWindow = screen->CreateWindow;
|
|
|
70130e |
- screen->CreateWindow = xwl_create_window;
|
|
|
70130e |
-
|
|
|
70130e |
- if (!(xwl_screen->flags & XWL_FLAGS_ROOTLESS) ||
|
|
|
70130e |
- window->parent != NULL)
|
|
|
70130e |
- return ret;
|
|
|
70130e |
-
|
|
|
70130e |
- CompositeRedirectSubwindows(window, CompositeRedirectManual);
|
|
|
70130e |
-
|
|
|
70130e |
- return ret;
|
|
|
70130e |
-}
|
|
|
70130e |
-
|
|
|
70130e |
-static int
|
|
|
70130e |
-xwl_destroy_window (WindowPtr window)
|
|
|
70130e |
-{
|
|
|
70130e |
- ScreenPtr screen = window->drawable.pScreen;
|
|
|
70130e |
- struct xwl_screen *xwl_screen;
|
|
|
70130e |
- Bool ret;
|
|
|
70130e |
-
|
|
|
70130e |
- if (window->parent == NULL)
|
|
|
70130e |
- CompositeUnRedirectSubwindows (window, CompositeRedirectManual);
|
|
|
70130e |
-
|
|
|
70130e |
- xwl_screen = xwl_screen_get(screen);
|
|
|
70130e |
-
|
|
|
70130e |
- screen->DestroyWindow = xwl_screen->DestroyWindow;
|
|
|
70130e |
- ret = (*screen->DestroyWindow)(window);
|
|
|
70130e |
- xwl_screen->DestroyWindow = screen->DestroyWindow;
|
|
|
70130e |
- screen->DestroyWindow = xwl_destroy_window;
|
|
|
70130e |
-
|
|
|
70130e |
- return ret;
|
|
|
70130e |
-}
|
|
|
70130e |
-
|
|
|
70130e |
static void
|
|
|
70130e |
damage_report(DamagePtr pDamage, RegionPtr pRegion, void *data)
|
|
|
70130e |
{
|
|
|
70130e |
@@ -289,12 +244,6 @@ xwl_screen_init_window(struct xwl_screen *xwl_screen, ScreenPtr screen)
|
|
|
70130e |
if (!dixRegisterPrivateKey(&xwl_window_private_key, PRIVATE_WINDOW, 0))
|
|
|
70130e |
return BadAlloc;
|
|
|
70130e |
|
|
|
70130e |
- xwl_screen->CreateWindow = screen->CreateWindow;
|
|
|
70130e |
- screen->CreateWindow = xwl_create_window;
|
|
|
70130e |
-
|
|
|
70130e |
- xwl_screen->DestroyWindow = screen->DestroyWindow;
|
|
|
70130e |
- screen->DestroyWindow = xwl_destroy_window;
|
|
|
70130e |
-
|
|
|
70130e |
xwl_screen->RealizeWindow = screen->RealizeWindow;
|
|
|
70130e |
screen->RealizeWindow = xwl_realize_window;
|
|
|
70130e |
|
|
|
70130e |
--
|
|
|
70130e |
1.8.3.1
|
|
|
70130e |
|