Merge lp:~vanvugt/compiz/fix-1081425 into lp:compiz/0.9.9

[Daniel van Vugt]

Move the actual setting of window opacity/brightness/saturation from
glDraw into glDrawTexture so that it is no longer sensitive to the plugin
load (wrapping) order. This fixes problems with decorations not fading out
in expo mode (LP: #1081425)

[Daniel van Vugt (vanvugt)]

Jenkins will complain because this breaks 100_expo_layout.patch. However I would like to get general approval for the change before modifying 100_expo_layout.patch to be compatible.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3483
http://jenkins.qa.ubuntu.com/job/compiz-ci/258/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/258/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/258//rebuild/?

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

23 + // Scaling factors to be applied to attrib later in glDrawTexture
24 + opacity = 1.0f;

Might be best to rename that to opacityScaleFactor

123 + private:
124 + float opacity;

Yeah definitely rename it, having a member called "opacity" really runs the risk of it being shadowed later.

74 + GLWindowPaintAttrib a (attrib);

wAttrib is the convention (though this is glDraw/Texture/ so maybe tAttrib?)

In any case "a" is far too undescriptive for a variable of function-scope.

Probably better to refresh the patch - we can just ignore the noise it creates. Its better to know if the tests continue passing, since that's what we care about.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3484
http://jenkins.qa.ubuntu.com/job/compiz-ci/259/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/259/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/259//rebuild/?

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

I'm fed up with this. 100_expo_layout.patch is breaking constantly. I'm going to merge it with the main code (partially) before allowing more expo changes like this. It's totally unmaintainable to have a patch this large.

[Sam Spilsbury (smspillaz)]

Okay - probably best to merge the changes that don't actually change
any upstream behaviour.

On Fri, Nov 23, 2012 at 2:49 PM, Daniel van Vugt
<email address hidden> wrote:
> I'm fed up with this. 100_expo_layout.patch is breaking constantly. I'm going to merge it with the main code (partially) before allowing more expo changes like this. It's totally unmaintainable to have a patch this large.
> --
> https://code.launchpad.net/~vanvugt/compiz/fix-1081425/+merge/135616
> Your team Compiz Maintainers is requested to review the proposed merge of lp:~vanvugt/compiz/fix-1081425 into lp:compiz.

--
Sam Spilsbury

[Daniel van Vugt (vanvugt)]

OK, conflicting patches have been eliminated. Jenkins should be happy now.

[Sam Spilsbury (smspillaz)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3487
http://jenkins.qa.ubuntu.com/job/compiz-ci/267/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/267/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/267//rebuild/?

review: Approve (continuous-integration)

=== modified file 'plugins/expo/src/expo.cpp'
--- plugins/expo/src/expo.cpp	2012-11-23 09:07:48 +0000
+++ plugins/expo/src/expo.cpp	2012-11-26 07:39:21 +0000
@@ -1209,6 +1209,11 @@
     if (expoCam > 0)
 	mask |= PAINT_SCREEN_CLEAR_MASK;
 
+    if (optionGetExpoAnimation () == ExpoScreen::ExpoAnimationZoom)
+	vpBrightness = 0.0f;
+    else
+	vpBrightness = (1.0f - sigmoidProgress (expoCam));
+
     if (expoCam <= 0 || (expoCam > 0.0 && expoCam < 1.0 &&
 			 optionGetExpoAnimation () != ExpoAnimationZoom))
     {
@@ -1241,15 +1246,17 @@
     if (eScreen->expoCam == 0.0f)
 	return gWindow->glDraw (transform, attrib, region, mask);
 
-    GLWindowPaintAttrib eAttrib (attrib);
     int                expoAnimation;
 
+    // Scaling factors to be applied to attrib later in glDrawTexture
+    expoOpacity = 1.0f;
+
     expoAnimation = eScreen->optionGetExpoAnimation ();
 
     if (eScreen->expoActive)
     {
 	if (expoAnimation != ExpoScreen::ExpoAnimationZoom)
-	    eAttrib.opacity = attrib.opacity * eScreen->expoCam;
+	    expoOpacity = eScreen->expoCam;
 
 	if (window->wmType () & CompWindowTypeDockMask &&
 	    eScreen->optionGetHideDocks ())
@@ -1257,28 +1264,16 @@
 	    if (expoAnimation == ExpoScreen::ExpoAnimationZoom &&
 		eScreen->paintingVp == eScreen->selectedVp)
 	    {
-		eAttrib.opacity = attrib.opacity *
-		                      (1 - sigmoidProgress (eScreen->expoCam));
+		expoOpacity = (1.0f - sigmoidProgress (eScreen->expoCam));
 	    }
 	    else
 	    {
-		eAttrib.opacity = 0;
+		expoOpacity = 0.0f;
 	    }
 	}
-
-	eAttrib.brightness = attrib.brightness * eScreen->vpBrightness;
-	eAttrib.saturation = attrib.saturation * eScreen->vpSaturation;
-    }
-    else
-    {
-	if (expoAnimation == ExpoScreen::ExpoAnimationZoom)
-	    eAttrib.brightness = 0;
-	else
-	    eAttrib.brightness = attrib.brightness *
-	                              (1 - sigmoidProgress (eScreen->expoCam));
-    }
-
-    bool status = gWindow->glDraw (transform, eAttrib, region, mask);
+    }
+
+    bool status = gWindow->glDraw (transform, attrib, region, mask);
 
     if (window->type () & CompWindowTypeDesktopMask &&
         eScreen->optionGetSelectedColor ()[3] &&  // colour is visible
@@ -1368,6 +1363,15 @@
                            const GLWindowPaintAttrib &attrib,
 			   unsigned int        mask)
 {
+    GLWindowPaintAttrib wAttrib (attrib);
+
+    if (eScreen->expoCam > 0.0)
+    {
+	wAttrib.opacity *= expoOpacity;
+	wAttrib.brightness *= eScreen->vpBrightness;
+	wAttrib.saturation *= eScreen->vpSaturation;
+    }
+
     if (eScreen->expoCam > 0.0                                 &&
 	eScreen->optionGetDeform () == ExpoScreen::DeformCurve &&
 	eScreen->gScreen->lighting ()                          &&
@@ -1411,7 +1415,7 @@
 #ifndef USE_GLES
 	glEnable (GL_NORMALIZE);
 #endif
-	gWindow->glDrawTexture (texture, transform, attrib, mask);
+	gWindow->glDrawTexture (texture, transform, wAttrib, mask);
 #ifndef USE_GLES
 	glDisable (GL_NORMALIZE);
 #endif
@@ -1419,7 +1423,7 @@
     else
     {
 //	glEnable (GL_NORMALIZE);
-	gWindow->glDrawTexture (texture, transform, attrib, mask);
+	gWindow->glDrawTexture (texture, transform, wAttrib, mask);
 //	glDisable (GL_NORMALIZE);
     }
 }
@@ -1542,7 +1546,8 @@
     cWindow (CompositeWindow::get (w)),
     gWindow (GLWindow::get (w)),
     eScreen (ExpoScreen::get (screen)),
-    mGlowQuads (NULL)
+    mGlowQuads (NULL),
+    expoOpacity (1.0f)
 {
     CompositeWindowInterface::setHandler (cWindow, false);
     GLWindowInterface::setHandler (gWindow, false);
 
=== modified file 'plugins/expo/src/expo.h'
--- plugins/expo/src/expo.h	2012-11-23 08:20:42 +0000
+++ plugins/expo/src/expo.h	2012-11-26 07:39:21 +0000
@@ -171,7 +171,9 @@
 	GLWindow        *gWindow;
 	ExpoScreen      *eScreen;
 
+    private:
 	GlowQuad *mGlowQuads;
+	float expoOpacity;
 };
 
 class ExpoPluginVTable :