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

[Sam Spilsbury]

Turns out that compiz-plugins-extra uses the Animation class, so we can't add virtual functions to it. Backs out the change that added virtual functions and uses a dptr method instead to determine whether or not we need to set the transformed window mask.

[Daniel van Vugt (vanvugt)]

smspillaz just said this fix is no longer required. They're going to just rebuild compiz-plugins-extra.

[Daniel van Vugt (vanvugt)]

Also, this branch appears to cause a weird regression: When minimizing/restoring nautilus or thunderbird windows I get strange flickering. And during the animation/flickering the original rectangular window itself flickers too.

That's with the default animation settings (magic lamp?)

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

No longer required

review: Disapprove

Unmerged revisions

398. By Sam Spilsbury on 2012-04-15

Fix 976469 without breaking the ABI

=== modified file 'include/animation/animeffect.h'
--- include/animation/animeffect.h	2012-04-10 06:13:37 +0000
+++ include/animation/animeffect.h	2012-04-15 02:34:19 +0000
@@ -1,5 +1,6 @@
 #ifndef ANIMATION_ANIMEFFECT_H
 #define ANIMATION_ANIMEFFECT_H
+#include <map>
 #include "animation.h"
 
 typedef Animation *(*CreateAnimFunc) (CompWindow *w,
@@ -94,7 +95,10 @@
     inline CompString optValS (unsigned int optionId) { return optVal (optionId).s (); }
     inline unsigned short *optValC (unsigned int optionId) { return optVal (optionId).c (); }
     
+
 public:
+
+    static std::map <Animation *, bool> dRequiredTransformedWindowForAnim;
     
     Animation (CompWindow *w,
 	       WindowEvent curWindowEvent,
@@ -172,8 +176,6 @@
 	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	2012-04-10 06:13:37 +0000
+++ include/animation/fade.h	2012-04-15 02:34:19 +0000
@@ -14,7 +14,6 @@
      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	2012-04-10 06:13:37 +0000
+++ include/animation/grid.h	2012-04-15 02:34:19 +0000
@@ -82,8 +82,6 @@
 
     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	2012-04-10 06:13:37 +0000
+++ include/animation/gridtransform.h	2012-04-15 02:34:19 +0000
@@ -15,7 +15,6 @@
     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	2012-04-10 06:13:37 +0000
+++ include/animation/transform.h	2012-04-15 02:34:19 +0000
@@ -29,7 +29,6 @@
     virtual void adjustDuration () {}
     virtual void applyTransform () {}
     virtual Point getCenter ();
-    virtual bool requiresTransformedWindow () const { return true; }
     
 };
 #endif
 
=== modified file 'src/animation.cpp'
--- src/animation.cpp	2012-04-10 07:50:26 +0000
+++ src/animation.cpp	2012-04-15 02:34:19 +0000
@@ -86,6 +86,8 @@
 #include <assert.h>
 #include "private.h"
 
+std::map <Animation *, bool> Animation::dRequiredTransformedWindowForAnim;
+
 using namespace compiz::core;
 
 class AnimPluginVTable :
@@ -455,10 +457,14 @@
     PrivateAnimScreen *as = mAWindow->priv->paScreen ();
 
     mTimestep = as->optionGetTimeStep ();
+
+    dRequiredTransformedWindowForAnim[this] = false;
 }
 
 Animation::~Animation ()
 {
+    dRequiredTransformedWindowForAnim.erase (this);
+
     delete texturesCache;
 }
 
@@ -1592,7 +1598,7 @@
 
     //w->indexCount = 0; // TODO check if this is still necessary
 
-    if (mCurAnimation->requiresTransformedWindow ())
+    if (Animation::dRequiredTransformedWindowForAnim [mCurAnimation])
 	mask |= PAINT_WINDOW_TRANSFORMED_MASK;
 
     wAttrib.xScale = 1.0f;
 
=== modified file 'src/fade.cpp'
--- src/fade.cpp	2009-07-15 16:05:10 +0000
+++ src/fade.cpp	2012-04-15 02:34:19 +0000
@@ -45,6 +45,7 @@
 		    const CompRect &icon) :
     Animation::Animation (w, curWindowEvent, duration, info, icon)
 {
+    Animation::dRequiredTransformedWindowForAnim[this] = false;
 }
 
 void
 
=== modified file 'src/private.h'
--- src/private.h	2012-04-10 06:13:37 +0000
+++ src/private.h	2012-04-15 02:34:19 +0000
@@ -502,7 +502,6 @@
     inline bool hasExtraTransform () { return true; }
     void applyExtraTransform (float progress);
     inline bool shouldAvoidParallelogramLook () { return true; }
-    bool requiresTransformedWindow () const { return true; }
 };
 
 class WaveAnim :
@@ -519,7 +518,6 @@
     void initGrid ();
     inline bool using3D () { return true; }
     void step ();
-    bool requiresTransformedWindow () const { return true; }
 
     static const float kMinDuration;
 };
@@ -542,7 +540,6 @@
     bool zoomToIcon ();
     void applyTransform ();
     float getFadeProgress ();
-    bool requiresTransformedWindow () const { return true; }
 
     float getProgress ();
     virtual void getParams (float *finalDistFac,
@@ -762,7 +759,6 @@
     void adjustDuration ();
     float getFadeProgress ();
     bool zoomToIcon ();
-    bool requiresTransformedWindow () const { return true; }
 
     static const float kDurationFactor;
 };
@@ -780,7 +776,6 @@
     inline bool using3D () { return true; }
     float getFadeProgress ();
     void updateWindowAttrib (GLWindowPaintAttrib &attrib);
-    bool requiresTransformedWindow () const { return true; }
 };
 
 class CurvedFoldAnim :
@@ -802,7 +797,6 @@
 		      float sinForProg,
 		      float relDistToCenter,
 		      float curveMaxAmp);
-    bool requiresTransformedWindow () const { return true; }
 };
 
 class HorizontalFoldsAnim :
@@ -823,5 +817,4 @@
 		      float sinForProg,
 		      float relDistToFoldCenter,
 		      float foldMaxAmp);
-    bool requiresTransformedWindow () const { return true; }
 };
 
=== modified file 'src/zoomside.cpp'
--- src/zoomside.cpp	2011-03-14 15:35:30 +0000
+++ src/zoomside.cpp	2012-04-15 02:34:19 +0000
@@ -60,6 +60,8 @@
 	mIcon.setX (outRect.x () + outRect.width () / 2 - mIcon.width () / 2);
 	mIcon.setY (outRect.y () + outRect.height () / 2 - mIcon.height () / 2);
     }
+
+    Animation::dRequiredTransformedWindowForAnim[this] = true;
 }
 
 SidekickAnim::SidekickAnim (CompWindow *w,