Merge lp:~smspillaz/compiz-animation-plugin/compiz-animation-plugin.fix_976469 into lp:compiz-animation-plugin

[Sam Spilsbury]

== Problem ==

The animation plugin was setting PAINT_WINDOW_TRANSFORMED_MASK even when it didn't need it, which would confuse other plugins

== Solution ==

Added a vfunc to determine whether or not we actually need to do that

Fixes LP#976469

[Daniel van Vugt (vanvugt)]

First observation: requiresTransformedWindow() should be const.

[Daniel van Vugt (vanvugt)]

Tests OK. No obvious regressions, though I also don't see any shadows being clipped at all.

review: Approve

[Daniel van Vugt (vanvugt)]

Hmm, I will approve this again, but first please:

1. Remove " // TODO: should only happen for distorting effects"
2. Consider making requiresTransformedWindow() const.

review: Needs Fixing

[lp:~smspillaz/compiz-animation-plugin/compiz-animation-plugin.fix_976469]

397. By Sam Spilsbury on 2012-04-10

Cleanup, remove unused variable

Unmerged revisions

=== modified file 'include/animation/animeffect.h'
--- include/animation/animeffect.h	2010-08-17 21:19:04 +0000
+++ include/animation/animeffect.h	2012-04-10 06:17:19 +0000
@@ -172,6 +172,8 @@
 	return gWindow->glPaint (attrib, transform, region, mask);
     }
 
+    virtual bool requiresTransformedWindow () const { return true; }
+
     /// Gets info about the (extension) plugin that implements this animation.
     /// Should be overriden by a base animation class in every extension plugin.
     virtual ExtensionPluginInfo *getExtensionPluginInfo ();

=== modified file 'include/animation/fade.h'
--- include/animation/fade.h	2010-08-17 21:19:04 +0000
+++ include/animation/fade.h	2012-04-10 06:17:19 +0000
@@ -14,6 +14,7 @@
      void updateBB (CompOutput &output);
      bool updateBBUsed () { return true; }
      void updateAttrib (GLWindowPaintAttrib &wAttrib);
+     virtual bool requiresTransformedWindow () const { return false; }
      virtual float getFadeProgress () { return progressLinear (); }
 };
 #endif

=== modified file 'include/animation/grid.h'
--- include/animation/grid.h	2010-08-24 22:32:07 +0000
+++ include/animation/grid.h	2012-04-10 06:17:19 +0000
@@ -82,6 +82,8 @@
 
     virtual bool using3D () { return false; }
 
+    virtual bool requiresTransformedWindow () const { return true; }
+
     virtual void initGrid ();	///< Initializes grid width/height.
     				///< Default grid size is 2x2.
 				///< Override for custom grid size.

=== modified file 'include/animation/gridtransform.h'
--- include/animation/gridtransform.h	2010-08-24 22:32:07 +0000
+++ include/animation/gridtransform.h	2012-04-10 06:17:19 +0000
@@ -15,6 +15,7 @@
     void updateTransform (GLMatrix &wTransform);
     void updateBB (CompOutput &output);
     bool updateBBUsed () { return true; }
+    bool requiresTransformedWindow () const { return true; }
     
 protected:
     bool mUsingTransform; ///< whether transform matrix is used (default: true)

=== modified file 'include/animation/transform.h'
--- include/animation/transform.h	2010-08-17 21:19:04 +0000
+++ include/animation/transform.h	2012-04-10 06:17:19 +0000
@@ -29,6 +29,7 @@
     virtual void adjustDuration () {}
     virtual void applyTransform () {}
     virtual Point getCenter ();
+    virtual bool requiresTransformedWindow () const { return true; }
     
 };
 #endif

=== modified file 'include/animation/zoom.h'
--- include/animation/zoom.h	2010-08-17 21:19:04 +0000
+++ include/animation/zoom.h	2012-04-10 06:17:19 +0000
@@ -34,6 +34,7 @@
      void getZoomProgress (float *moveProgress,
 			   float *scaleProgress,
 			   bool neverSpringy);
+     bool requiresTransformedWindow () const { return true; }
 
      static const float kDurationFactor;
      static const float kSpringyDurationFactor;
@@ -66,5 +67,6 @@
     float getSpringiness () { return 0; }
     bool scaleAroundIcon () { return false; }
     void adjustDuration ();
+    bool requiresTransformedWindow () const { return true; }
 };
 #endif

=== modified file 'src/animation.cpp'
--- src/animation.cpp	2012-03-20 10:36:39 +0000
+++ src/animation.cpp	2012-04-10 06:17:19 +0000
@@ -1265,8 +1265,6 @@
 	mLastRedrawTime = curTime; // Store current time for next time
 	mLastRedrawTimeFresh = true;
 
-	bool animStillInProgress = false;
-
 	/* Paint list includes destroyed windows */
 	for (CompWindowList::const_reverse_iterator rit = pl.rbegin ();
 	     rit != pl.rend (); rit++)
@@ -1281,8 +1279,7 @@
 		if (!curAnim->initialized ())
 		    curAnim->init ();
 
-		if (curAnim->prePreparePaint (msSinceLastPaint))
-		    animStillInProgress = true;
+		curAnim->prePreparePaint (msSinceLastPaint);
 
 		/* TODO optimize grid model by reusing one GridModel
 		if (aw->com.mModel &&
@@ -1345,8 +1342,6 @@
 		bool finished = (curAnim->remainingTime () <= 0);
 		if (finished) // Animation is done
 		    windowsFinishedAnimations.push_back (w);
-		else
-		    animStillInProgress = true;
 	    }
 	}
 
@@ -1597,8 +1592,8 @@
 
     //w->indexCount = 0; // TODO check if this is still necessary
 
-    // TODO: should only happen for distorting effects
-    mask |= PAINT_WINDOW_TRANSFORMED_MASK;
+    if (mCurAnimation->requiresTransformedWindow ())
+	mask |= PAINT_WINDOW_TRANSFORMED_MASK;
 
     wAttrib.xScale = 1.0f;
     wAttrib.yScale = 1.0f;

=== modified file 'src/private.h'
--- src/private.h	2011-09-19 05:59:09 +0000
+++ src/private.h	2012-04-10 06:17:19 +0000
@@ -502,6 +502,7 @@
     inline bool hasExtraTransform () { return true; }
     void applyExtraTransform (float progress);
     inline bool shouldAvoidParallelogramLook () { return true; }
+    bool requiresTransformedWindow () const { return true; }
 };
 
 class WaveAnim :
@@ -518,6 +519,7 @@
     void initGrid ();
     inline bool using3D () { return true; }
     void step ();
+    bool requiresTransformedWindow () const { return true; }
 
     static const float kMinDuration;
 };
@@ -540,6 +542,7 @@
     bool zoomToIcon ();
     void applyTransform ();
     float getFadeProgress ();
+    bool requiresTransformedWindow () const { return true; }
 
     float getProgress ();
     virtual void getParams (float *finalDistFac,
@@ -759,6 +762,7 @@
     void adjustDuration ();
     float getFadeProgress ();
     bool zoomToIcon ();
+    bool requiresTransformedWindow () const { return true; }
 
     static const float kDurationFactor;
 };
@@ -776,6 +780,7 @@
     inline bool using3D () { return true; }
     float getFadeProgress ();
     void updateWindowAttrib (GLWindowPaintAttrib &attrib);
+    bool requiresTransformedWindow () const { return true; }
 };
 
 class CurvedFoldAnim :
@@ -797,6 +802,7 @@
 		      float sinForProg,
 		      float relDistToCenter,
 		      float curveMaxAmp);
+    bool requiresTransformedWindow () const { return true; }
 };
 
 class HorizontalFoldsAnim :
@@ -817,4 +823,5 @@
 		      float sinForProg,
 		      float relDistToFoldCenter,
 		      float foldMaxAmp);
+    bool requiresTransformedWindow () const { return true; }
 };