84 lines
2.2 KiB
Diff
84 lines
2.2 KiB
Diff
|
Author: Michael Vogt <michael.vogt@ubuntu.com>
|
||
|
|
Description: Workaround for problems with damage extension and refresh
|
||
|
|
Add workaround patch by Aaron Plattner to fix problems with the damage
|
||
|
|
extension and refresh (LP: #269904)
|
||
|
|
Origin: vendor, ubuntu (1:0.7.8-0ubuntu4)
|
||
|
|
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/269904
|
||
|
|
--- a/src/event.c
|
||
|
|
+++ b/src/event.c
|
||
|
|
@@ -2315,32 +2315,50 @@ handleEvent (CompDisplay *d,
|
||
|
|
|
||
|
|
if (w)
|
||
|
|
{
|
||
|
|
+ XserverRegion parts = XFixesCreateRegion(de->display, NULL, 0);
|
||
|
|
+ XRectangle *rects;
|
||
|
|
+ int nRects;
|
||
|
|
+
|
||
|
|
w->texture->oldMipmaps = TRUE;
|
||
|
|
|
||
|
|
+ // Get the damage region
|
||
|
|
+ XDamageSubtract(de->display, de->damage, None, parts);
|
||
|
|
+ rects = XFixesFetchRegion(de->display, parts, &nRects);
|
||
|
|
+ XFixesDestroyRegion(de->display, parts);
|
||
|
|
+
|
||
|
|
if (w->syncWait)
|
||
|
|
{
|
||
|
|
- if (w->nDamage == w->sizeDamage)
|
||
|
|
+ int i;
|
||
|
|
+
|
||
|
|
+ if (w->nDamage + nRects - 1 >= w->sizeDamage)
|
||
|
|
{
|
||
|
|
w->damageRects = realloc (w->damageRects,
|
||
|
|
- (w->sizeDamage + 1) *
|
||
|
|
+ (w->sizeDamage + nRects) *
|
||
|
|
sizeof (XRectangle));
|
||
|
|
- w->sizeDamage += 1;
|
||
|
|
+ w->sizeDamage += nRects;
|
||
|
|
}
|
||
|
|
|
||
|
|
- w->damageRects[w->nDamage].x = de->area.x;
|
||
|
|
- w->damageRects[w->nDamage].y = de->area.y;
|
||
|
|
- w->damageRects[w->nDamage].width = de->area.width;
|
||
|
|
- w->damageRects[w->nDamage].height = de->area.height;
|
||
|
|
- w->nDamage++;
|
||
|
|
+ for (i = 0; i < nRects; i++)
|
||
|
|
+ {
|
||
|
|
+ w->damageRects[w->nDamage] = rects[i];
|
||
|
|
+ w->nDamage++;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
else
|
||
|
|
{
|
||
|
|
- handleWindowDamageRect (w,
|
||
|
|
- de->area.x,
|
||
|
|
- de->area.y,
|
||
|
|
- de->area.width,
|
||
|
|
- de->area.height);
|
||
|
|
+ int i;
|
||
|
|
+
|
||
|
|
+ for (i = 0; i < nRects; i++)
|
||
|
|
+ {
|
||
|
|
+ handleWindowDamageRect (w,
|
||
|
|
+ rects[i].x,
|
||
|
|
+ rects[i].y,
|
||
|
|
+ rects[i].width,
|
||
|
|
+ rects[i].height);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ XFree(rects);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
else if (d->shapeExtension &&
|
||
|
|
--- a/src/window.c
|
||
|
|
+++ b/src/window.c
|
||
|
|
@@ -2207,7 +2207,7 @@ addWindow (CompScreen *screen,
|
||
|
|
XUnionRegion (&rect, w->region, w->region);
|
||
|
|
|
||
|
|
w->damage = XDamageCreate (d->display, id,
|
||
|
|
- XDamageReportRawRectangles);
|
||
|
|
+ XDamageReportNonEmpty);
|
||
|
|
|
||
|
|
/* need to check for DisplayModal state on all windows */
|
||
|
|
w->state = getWindowState (d, w->id);
|