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 c89f052104
.
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
parent
8cf3348e90
commit
de32d4dcf5
|
@ -1923,7 +1923,7 @@ if test "x$XQUARTZ" = xyes; then
|
||||||
|
|
||||||
AC_CHECK_LIB([Xplugin],[xp_init],[:])
|
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)
|
PKG_CHECK_MODULES(XPBPROXY, $APPLEWMPROTO $LIBAPPLEWM xfixes x11)
|
||||||
|
|
||||||
|
|
|
@ -89,7 +89,11 @@ getDrawableDamageRef (DrawablePtr pDrawable)
|
||||||
ScreenPtr pScreen = pDrawable->pScreen;
|
ScreenPtr pScreen = pDrawable->pScreen;
|
||||||
|
|
||||||
pPixmap = 0;
|
pPixmap = 0;
|
||||||
if (pScreen->GetWindowPixmap)
|
if (pScreen->GetWindowPixmap
|
||||||
|
#ifdef ROOTLESS_WORKAROUND
|
||||||
|
&& ((WindowPtr)pDrawable)->viewable
|
||||||
|
#endif
|
||||||
|
)
|
||||||
pPixmap = (*pScreen->GetWindowPixmap) ((WindowPtr)pDrawable);
|
pPixmap = (*pScreen->GetWindowPixmap) ((WindowPtr)pDrawable);
|
||||||
|
|
||||||
if (!pPixmap)
|
if (!pPixmap)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user