[fusion-commits] Compiz mirror: Changes to 'master' (912fe084c5fdf901f556565c9f3df516988a55ac)

[compiz at server.opencompositing.org]

New commits:
commit 912fe084c5fdf901f556565c9f3df516988a55ac
Merge: fe7c30358cb82bb964d9bac1d475a41c03a35a9a b824c7f37a61448d974d622be90155c1e6295bef
Author: Danny Baumann <dannybaumann at web.de>
Date:   Tue Mar 25 14:11:27 2008 +0100

    Merge branch 'master' of git+ssh://maniac@git.freedesktop.org/git/xorg/app/compiz

commit fe7c30358cb82bb964d9bac1d475a41c03a35a9a
Author: Danny Baumann <dannybaumann at web.de>
Date:   Tue Mar 25 14:10:19 2008 +0100

    Fix a number of damage issues.

commit a57c4cffcc8defc473a3c059667701e6a78d098a
Author: Danny Baumann <dannybaumann at web.de>
Date:   Tue Mar 25 14:07:27 2008 +0100

    Remove all clones on unload.


 plugins/clone.c |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)


Modified: compiz/plugins/clone.c
===================================================================
--- compiz/plugins/clone.c
+++ compiz/plugins/clone.c
@@ -222,13 +222,8 @@ clonePreparePaintScreen (CompScreen *s,
 	{
 	    cs->offset += msSinceLastPaint * 0.005f;
 	    if (cs->offset >= 1.0f)
-	    {
 		cs->offset = 1.0f;
-		cloneFinish (s);
-	    }
 	}
-
-	damageScreen (s);
     }
 
     UNWRAP (cs, s, preparePaintScreen);
@@ -275,8 +270,13 @@ cloneDonePaintScreen (CompScreen *s)
 {
     CLONE_SCREEN (s);
 
-    if (cs->grab && cs->offset)
+    if (cs->grab)
+    {
+	if (cs->offset == 1.0f)
+	    cloneFinish (s);
+
 	damageScreen (s);
+    }
 
     UNWRAP (cs, s, donePaintScreen);
     (*s->donePaintScreen) (s);
@@ -809,8 +809,13 @@ static void
 cloneFiniScreen (CompPlugin *p,
 		 CompScreen *s)
 {
+    int i;
+
     CLONE_SCREEN (s);
 
+    for (i = 0; i < cs->nClone; i++)
+	cloneRemove (s, i);
+
     UNWRAP (cs, s, preparePaintScreen);
     UNWRAP (cs, s, donePaintScreen);
     UNWRAP (cs, s, paintOutput);