Re-add paint-smartness to composite.cpp

1 files changed, 14 insertions, 0 deletions

diff --git a/plugins/composite/src/screen.cpp b/plugins/composite/src/screen.cpp
index 7cdf1c3..8c5f509 100644
--- a/plugins/composite/src/screen.cpp
+++ b/plugins/composite/src/screen.cpp
@@ -458,6 +458,9 @@ CompositeScreen::compositingActive ()
 void
 CompositeScreen::damageScreen ()
 {
+    if (priv->damageMask == 0)
+	priv->paintTimer.setTimes (priv->paintTimer.minLeft ());
+
     priv->damageMask |= COMPOSITE_SCREEN_DAMAGE_ALL_MASK;
     priv->damageMask &= ~COMPOSITE_SCREEN_DAMAGE_REGION_MASK;
 }
@@ -468,6 +471,9 @@ CompositeScreen::damageRegion (const CompRegion &region)
     if (priv->damageMask & COMPOSITE_SCREEN_DAMAGE_ALL_MASK)
 	return;
 
+    if (priv->damageMask == 0)
+	priv->paintTimer.setTimes (priv->paintTimer.minLeft ());
+
     priv->damage += region;
     priv->damageMask |= COMPOSITE_SCREEN_DAMAGE_REGION_MASK;
 
@@ -483,6 +489,9 @@ CompositeScreen::damageRegion (const CompRegion &region)
 void
 CompositeScreen::damagePending ()
 {
+    if (priv->damageMask == 0)
+	priv->paintTimer.setTimes (priv->paintTimer.minLeft ());
+
     priv->damageMask |= COMPOSITE_SCREEN_DAMAGE_PENDING_MASK;
 }
 
@@ -883,6 +892,11 @@ CompositeScreen::handlePaintTimeout ()
     else
 	timeToNextRedraw = priv->getTimeToNextRedraw (&tv);
 
+    if (priv->idle)
+	priv->paintTimer.setTimes (timeToNextRedraw, MAXSHORT);
+    else
+	priv->paintTimer.setTimes (timeToNextRedraw);
+
     return true;
 }