[fusion-commits] compiz mirror: Changes to 'master' (fa2a3e2f9dde9dfbacfe7c380a9fa59a4acbef06)

[compiz at server.beryl-project.org]

New commits:
commit fa2a3e2f9dde9dfbacfe7c380a9fa59a4acbef06
Author: Dennis Kasprzyk <onestone at opencompositing.org>
Date:   Thu Jul 19 01:03:34 2007 +0200

    Name function correctly: clonePaintScreen -> clonePaintOutput

commit 17906d6688bb8e6e201f9da145147dbe83c49847
Author: Dennis Kasprzyk <onestone at opencompositing.org>
Date:   Thu Jul 19 01:00:18 2007 +0200

    Work correctly with fullscreeOutput CompOutput.


 plugins/clone.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)


Modified: compiz/plugins/clone.c
===================================================================
--- compiz/plugins/clone.c
+++ compiz/plugins/clone.c
@@ -284,7 +284,7 @@ cloneDonePaintScreen (CompScreen *s)
 }
 
 static Bool
-clonePaintScreen (CompScreen		  *s,
+clonePaintOutput (CompScreen		  *s,
 		  const ScreenPaintAttrib *sAttrib,
 		  const CompTransform	  *transform,
 		  Region		  region,
@@ -296,11 +296,7 @@ clonePaintScreen (CompScreen		  *s,
 
     CLONE_SCREEN (s);
 
-    for (i = 0; i < s->nOutputDev; i++)
-	if (!memcmp (outputPtr, &s->outputDev[i], sizeof (CompOutput)))
-	    output = i;
-
-    dst = output;
+    dst = output = (outputPtr->id != ~0) ? outputPtr->id : 0;
 
     if (!cs->grab || cs->grabbedOutput != output)
     {
@@ -323,9 +319,13 @@ clonePaintScreen (CompScreen		  *s,
     }
 
     UNWRAP (cs, s, paintOutput);
-    status = (*s->paintOutput) (s, sAttrib, transform, region,
-				&s->outputDev[dst], mask);
-    WRAP (cs, s, paintOutput, clonePaintScreen);
+    if (outputPtr->id != ~0)
+	status = (*s->paintOutput) (s, sAttrib, transform, region,
+				    &s->outputDev[dst], mask);
+    else
+	status = (*s->paintOutput) (s, sAttrib, transform, region,
+				    outputPtr, mask);
+    WRAP (cs, s, paintOutput, clonePaintOutput);
 
     if (cs->grab)
     {
@@ -794,7 +794,7 @@ cloneInitScreen (CompPlugin *p,
 
     WRAP (cs, s, preparePaintScreen, clonePreparePaintScreen);
     WRAP (cs, s, donePaintScreen, cloneDonePaintScreen);
-    WRAP (cs, s, paintOutput, clonePaintScreen);
+    WRAP (cs, s, paintOutput, clonePaintOutput);
     WRAP (cs, s, paintWindow, clonePaintWindow);
     WRAP (cs, s, outputChangeNotify, cloneOutputChangeNotify);