summaryrefslogtreecommitdiff
path: root/miext/damage
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2004-09-03 16:18:23 +0000
committerKevin E Martin <kem@kem.org>2004-09-03 16:18:23 +0000
commitb2135e589baeb2ea26da50b9167feaea23bcce3c (patch)
treece77d2e7229acb89e06c38e755706e15a420c3f3 /miext/damage
parentd7fef52254126aa5897a5c58faeda1f61d5b13d8 (diff)
First set of documentation updates.
Include more correct fix for rootless interaction with damage (Bug #1168, Keith Packard).
Diffstat (limited to 'miext/damage')
-rwxr-xr-xmiext/damage/damage.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index f87adb7a5..963780f70 100755
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -78,16 +78,12 @@ getDrawableDamageRef (DrawablePtr pDrawable)
{
ScreenPtr pScreen = pDrawable->pScreen;
+ pPixmap = 0;
+ if (pScreen->GetWindowPixmap
#ifdef ROOTLESS_WORKAROUND
- if (!((WindowPtr)pDrawable)->viewable)
- {
- static DamagePtr nullDamage = 0;
- return &nullDamage;
- }
+ && ((WindowPtr)pDrawable)->viewable
#endif
-
- pPixmap = 0;
- if (pScreen->GetWindowPixmap)
+ )
pPixmap = (*pScreen->GetWindowPixmap) ((WindowPtr)pDrawable);
if (!pPixmap)