[PATCH 6/7] Add xwm-Redirect-root-window-subwindows.patch from upstream.
Required to work with the latest xwayland patch set.
---
debian/changelog | 1 +
debian/control | 1 +
debian/patches/series | 2 +-
.../xwm-Redirect-root-window-subwindows.patch | 63 ++++++++++++++++++++
4 filer ändrade, 66 tillägg(+), 1 borttagning(-)
create mode 100644 debian/patches/xwm-Redirect-root-window-subwindows.patch
diff --git a/debian/changelog b/debian/changelog
index f469fdba..0d6696f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ weston (1.3.0-2) UNRELEASED; urgency=low
* Enable RDP compositor support.
* Enable X11 compositor support.
* Enable XWayland support.
+ * Add xwm-Redirect-root-window-subwindows.patch from upstream.
-- Jon Severinsson <jon@severinsson.net> Sun, 13 Oct 2013 10:00:00 +0200
diff --git a/debian/control b/debian/control
index ddfc4738..0aa7715f 100644
--- a/debian/control
+++ b/debian/control
@@ -29,6 +29,7 @@ Build-Depends:
libxcb-shm0-dev,
libxcb-xfixes0-dev,
libxcb-dri2-0-dev,
+ libxcb-composite0-dev,
libx11-xcb-dev,
libx11-dev,
libgbm-dev,
diff --git a/debian/patches/series b/debian/patches/series
index a82d1b41..0126eabf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-#placeholder
+xwm-Redirect-root-window-subwindows.patch
diff --git a/debian/patches/xwm-Redirect-root-window-subwindows.patch b/debian/patches/xwm-Redirect-root-window-subwindows.patch
new file mode 100644
index 00000000..6f09a972
--- /dev/null
+++ b/debian/patches/xwm-Redirect-root-window-subwindows.patch
@@ -0,0 +1,63 @@
+From bcfd07b70a96bb21d9b8e5251d6551ef6ad8d1ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
+Date: Fri, 11 Oct 2013 16:48:19 -0700
+Subject: [PATCH] xwm: Redirect root window subwindows
+
+xwayland no longer does this for us, we have to request it now
+---
+ configure.ac | 2 +-
+ src/xwayland/window-manager.c | 5 +++++
+ src/xwayland/xwayland.h | 1 +
+ 3 filer ändrade, 7 tillägg(+), 1 borttagning(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5abf65fb..77279309 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -92,7 +92,7 @@ AC_ARG_ENABLE(xwayland-test, [ --enable-xwayland-test],,
+ AM_CONDITIONAL(ENABLE_XWAYLAND, test x$enable_xwayland = xyes)
+ AM_CONDITIONAL(ENABLE_XWAYLAND_TEST, test x$enable_xwayland = xyes -a x$enable_xwayland_test = xyes)
+ if test x$enable_xwayland = xyes; then
+- PKG_CHECK_MODULES([XWAYLAND], xcb xcb-xfixes xcursor cairo-xcb)
++ PKG_CHECK_MODULES([XWAYLAND], xcb xcb-xfixes xcb-composite xcursor cairo-xcb)
+ AC_DEFINE([BUILD_XWAYLAND], [1], [Build the X server launcher])
+
+ AC_ARG_WITH(xserver-path, AS_HELP_STRING([--with-xserver-path=PATH],
+diff --git a/src/xwayland/window-manager.c b/src/xwayland/window-manager.c
+index ef59e6d2..bdb618e8 100644
+--- a/src/xwayland/window-manager.c
++++ b/src/xwayland/window-manager.c
+@@ -1720,6 +1720,7 @@ weston_wm_get_resources(struct weston_wm *wm)
+ uint32_t i;
+
+ xcb_prefetch_extension_data (wm->conn, &xcb_xfixes_id);
++ xcb_prefetch_extension_data (wm->conn, &xcb_composite_id);
+
+ formats_cookie = xcb_render_query_pict_formats(wm->conn);
+
+@@ -1887,6 +1888,10 @@ weston_wm_create(struct weston_xserver *wxs)
+ XCB_EVENT_MASK_PROPERTY_CHANGE;
+ xcb_change_window_attributes(wm->conn, wm->screen->root,
+ XCB_CW_EVENT_MASK, values);
++
++ xcb_composite_redirect_subwindows(wm->conn, wm->screen->root,
++ XCB_COMPOSITE_REDIRECT_MANUAL);
++
+ wm->theme = theme_create();
+
+ weston_wm_create_wm_window(wm);
+diff --git a/src/xwayland/xwayland.h b/src/xwayland/xwayland.h
+index 39270787..77262e8f 100644
+--- a/src/xwayland/xwayland.h
++++ b/src/xwayland/xwayland.h
+@@ -23,6 +23,7 @@
+ #include <wayland-server.h>
+ #include <xcb/xcb.h>
+ #include <xcb/xfixes.h>
++#include <xcb/composite.h>
+ #include <cairo/cairo-xcb.h>
+
+ #include "../compositor.h"
+--
+1.7.10.4
+
--
1.7.10.4
Reply to: