[beryl-commits] compiz mirror: Changes to 'master' (4158e1647a7ead4418e7317f27a7a82bfa944ae7)

[compiz at server.beryl-project.org]

New commits:
commit 4158e1647a7ead4418e7317f27a7a82bfa944ae7
Author: Danny Baumann <dannybaumann at web.de>
Date:   Thu Jun 21 17:21:32 2007 +0200

    Hide windows on all outputs if all outputs are used for scaling.


 plugins/scale.c |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)


Modified: compiz/plugins/scale.c
===================================================================
--- compiz/plugins/scale.c
+++ compiz/plugins/scale.c
@@ -347,11 +347,22 @@ scalePaintWindow (CompWindow		  *w,
 		sAttrib.brightness = sAttrib.brightness / 2;
 	    }
 
-	    /* hide windows on this output that are not in scale mode */
-	    if (!isNeverScaleWin (w) &&
-		outputDeviceForWindow (w) == s->currentOutputDev)
+	    /* hide windows on the outputs used for scaling 
+	       that are not in scale mode */
+	    if (!isNeverScaleWin (w))
 	    {
-		sAttrib.opacity = 0;
+		int moMode;
+		moMode = ss->opt[SCALE_SCREEN_OPTION_MULTIOUTPUT_MODE].value.i;
+
+		switch (moMode) {
+		case SCALE_MOMODE_CURRENT:
+		    if (outputDeviceForWindow (w) == s->currentOutputDev)
+			sAttrib.opacity = 0;
+		    break;
+		default:
+		    sAttrib.opacity = 0;
+		    break;
+		}
 	    }
 	}