SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix minor timestamp lossage in mieq.

Browse Source 
Replace miSprite implementation with Damage-based one. Otherwise damage and
    misprite conflict causing looping.
Change pScreen usage around a bit to eliminate warnings
This commit is contained in:
Keith Packard
2004-08-07 01:23:07 +00:00
parent 45fde3b041
commit 1e694d2b51
4 changed files with 169 additions and 1654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
miext/damage/damage.c
View File

@@ -98,9 +98,9 @@ static void
damageDamageRegion (DrawablePtr pDrawable, RegionPtr pRegion, Bool clip)
#endif
{
damageScrPriv(pDrawable->pScreen);
drawableDamage(pDrawable);
ScreenPtr pScreen = pDrawable->pScreen;
damageScrPriv(pScreen);
drawableDamage(pDrawable);
DamagePtr pNext;
RegionPtr pClip;
RegionRec clippedRec;
@@ -1835,9 +1835,8 @@ DamageSubtract (DamagePtr pDamage,
RegionPtr pClip;
RegionRec pixmapClip;
DrawablePtr pDrawable = pDamage->pDrawable;
ScreenPtr pScreen = pDrawable->pScreen;
REGION_SUBTRACT (pScreen, &pDamage->damage, &pDamage->damage, pRegion);
REGION_SUBTRACT (pDrawable->pScreen, &pDamage->damage, &pDamage->damage, pRegion);
if (pDrawable)
{
if (pDrawable->type == DRAWABLE_WINDOW)
@@ -1850,14 +1849,14 @@ DamageSubtract (DamagePtr pDamage,
box.y1 = pDrawable->y;
box.x2 = pDrawable->x + pDrawable->width;
box.y2 = pDrawable->y + pDrawable->height;
REGION_INIT (pScreen, &pixmapClip, &box, 1);
REGION_INIT (pDrawable->pScreen, &pixmapClip, &box, 1);
pClip = &pixmapClip;
}
REGION_TRANSLATE (pScreen, &pDamage->damage, pDrawable->x, pDrawable->y);
REGION_INTERSECT (pScreen, &pDamage->damage, &pDamage->damage, pClip);
REGION_TRANSLATE (pScreen, &pDamage->damage, -pDrawable->x, -pDrawable->y);
REGION_TRANSLATE (pDrawable->pScreen, &pDamage->damage, pDrawable->x, pDrawable->y);
REGION_INTERSECT (pDrawable->pScreen, &pDamage->damage, &pDamage->damage, pClip);
REGION_TRANSLATE (pDrawable->pScreen, &pDamage->damage, -pDrawable->x, -pDrawable->y);
}
return REGION_NOTEMPTY (pScreen, &pDamage->damage);
return REGION_NOTEMPTY (pDrawable->pScreen, &pDamage->damage);
}
void