Merge lp:~smspillaz/compiz-core/compiz-core.fix_882531 into lp:compiz-core/0.9.5

[Sam Spilsbury]

Adds a wrapable damageRegion function

[Jason Smith (jassmith)]

Merge errors in diff

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

ok

review: Approve

=== modified file 'plugins/composite/include/composite/composite.h'
--- plugins/composite/include/composite/composite.h	2012-01-20 09:05:56 +0000
+++ plugins/composite/include/composite/composite.h	2012-01-30 12:02:27 +0000
@@ -30,7 +30,7 @@
 
 #include <X11/extensions/Xcomposite.h>
 
-#define COMPIZ_COMPOSITE_ABI 3
+#define COMPIZ_COMPOSITE_ABI 4
 
 #include "core/pluginclasshandler.h"
 #include "core/timer.h"
@@ -161,11 +161,16 @@
 	 *
 	 */
 	virtual void unregisterPaintHandler ();
+
+	/**
+	 * Hookable function to damage regions directly
+	 */
+	virtual void damageRegion (const CompRegion &r);
 };
 
 
 class CompositeScreen :
-    public WrapableHandler<CompositeScreenInterface, 6>,
+    public WrapableHandler<CompositeScreenInterface, 7>,
     public PluginClassHandler<CompositeScreen, CompScreen, COMPIZ_COMPOSITE_ABI>,
     public CompOption::Class
 {
@@ -189,11 +194,6 @@
 	 */
 	void damageScreen ();
 
-	/**
-	 * Adds a specific region to be redrawn on the next
-	 * event loop
-	 */
-	void damageRegion (const CompRegion &);
 	void damagePending ();
 	
 
@@ -234,6 +234,12 @@
 	WRAPABLE_HND (4, CompositeScreenInterface, bool, registerPaintHandler, compiz::composite::PaintHandler *);
 	WRAPABLE_HND (5, CompositeScreenInterface, void, unregisterPaintHandler);
 
+	/**
+	 * Adds a specific region to be redrawn on the next
+	 * event loop
+	 */
+	WRAPABLE_HND (6, CompositeScreenInterface, void, damageRegion, const CompRegion &);
+
 	friend class PrivateCompositeDisplay;
 
     private:

=== modified file 'plugins/composite/src/screen.cpp'
--- plugins/composite/src/screen.cpp	2012-01-23 18:41:06 +0000
+++ plugins/composite/src/screen.cpp	2012-01-30 12:02:27 +0000
@@ -441,14 +441,27 @@
 void
 CompositeScreen::damageScreen ()
 {
+    bool alreadyDamaged = priv->damageMask & COMPOSITE_SCREEN_DAMAGE_ALL_MASK;
+
     priv->damageMask |= COMPOSITE_SCREEN_DAMAGE_ALL_MASK;
     priv->damageMask &= ~COMPOSITE_SCREEN_DAMAGE_REGION_MASK;
+
     priv->scheduler.schedule ();
+
+    /*
+     * Call through damageRegion since plugins listening for incoming damage
+     * may need to know that the whole screen was redrawn
+     */
+
+    if (!alreadyDamaged)
+	damageRegion (CompRegion (0, 0, screen->width (), screen->height ()));
 }
 
 void
 CompositeScreen::damageRegion (const CompRegion &region)
 {
+    WRAPABLE_HND_FUNCTN (damageRegion, region);
+
     if (priv->damageMask & COMPOSITE_SCREEN_DAMAGE_ALL_MASK)
 	return;
 
@@ -864,6 +877,10 @@
 CompositeScreenInterface::unregisterPaintHandler ()
     WRAPABLE_DEF (unregisterPaintHandler);
 
+void
+CompositeScreenInterface::damageRegion (const CompRegion &r)
+    WRAPABLE_DEF (damageRegion, r);
+
 const CompRegion &
 CompositeScreen::currentDamage () const
 {