diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-02-27 15:49:10 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-02-27 16:19:46 -0800 |
| commit | de32d4dcf57c10fc100c1b33630127947a8c8460 (patch) | |
| tree | d510f874e74c361f2a509492a1979842785d4143 | |
| parent | 8cf3348e90846f5b04236479042228fb98ac8f70 (diff) | |
Revert "rootless: Remove ROOTLESS_WORKAROUND"
Christof Wolf has reported a regression that seems to be caused by
this change, so reverting the change in the 1.9 branch. We'll
investigate a proper fix in master for 1.10.
This reverts commit c89f0521044083a11d538ebfeaabee6fc7fb9a03.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | miext/damage/damage.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 85d5c980e..0a063918e 100644 --- a/configure.ac +++ b/configure.ac @@ -1923,7 +1923,7 @@ if test "x$XQUARTZ" = xyes; then AC_CHECK_LIB([Xplugin],[xp_init],[:]) - CFLAGS="${CFLAGS} -DROOTLESS_SAFEALPHA -DNO_ALLOCA" + CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DROOTLESS_SAFEALPHA -DNO_ALLOCA" PKG_CHECK_MODULES(XPBPROXY, $APPLEWMPROTO $LIBAPPLEWM xfixes x11) diff --git a/miext/damage/damage.c b/miext/damage/damage.c index 566995c41..0fe1fb603 100644 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -89,7 +89,11 @@ getDrawableDamageRef (DrawablePtr pDrawable) ScreenPtr pScreen = pDrawable->pScreen; pPixmap = 0; - if (pScreen->GetWindowPixmap) + if (pScreen->GetWindowPixmap +#ifdef ROOTLESS_WORKAROUND + && ((WindowPtr)pDrawable)->viewable +#endif + ) pPixmap = (*pScreen->GetWindowPixmap) ((WindowPtr)pDrawable); if (!pPixmap) |