Merge lp:~3v1n0/compiz/resize-lowgfx-fixes into lp:compiz/0.9.13

[Marco Trevisan (Treviño)]

resize: add support for disabling transparency and avoid over-damaging in outline mode

[Andrea Azzarone (azzar1)]

LGTM

review: Approve

=== modified file 'debian/unity-lowgfx.ini'
--- debian/unity-lowgfx.ini	2017-06-29 02:14:38 +0000
+++ debian/unity-lowgfx.ini	2017-06-29 02:14:38 +0000
@@ -17,6 +17,7 @@
 
 [resize]
 s0_mode = 2
+s0_disable_blend = true
 
 [opengl]
 s0_texture_filter = 0

=== modified file 'plugins/resize/resize.xml.in'
--- plugins/resize/resize.xml.in	2015-10-26 17:15:43 +0000
+++ plugins/resize/resize.xml.in	2017-06-29 02:14:38 +0000
@@ -78,6 +78,11 @@
 		    <alpha>0x1919</alpha>
 		</default>
 	    </option>
+	    <option name="disable_blend" type="bool">
+		<_short>Disable Transparency</_short>
+		<_long>Disable blending.</_long>
+		<default>false</default>
+	    </option>
 	    <subgroup>
 			<_short>Specific Window Matches</_short>
 			<option name="normal_match" type="match">

=== modified file 'plugins/resize/src/logic/src/resize-logic.cpp'
--- plugins/resize/src/logic/src/resize-logic.cpp	2016-03-03 14:22:25 +0000
+++ plugins/resize/src/logic/src/resize-logic.cpp	2017-06-29 02:14:38 +0000
@@ -487,13 +487,13 @@
 	che = he;
 
 	if (w->constrainNewWindowSize (wi, he, &cwi, &che) &&
-	    mode != ResizeOptions::ModeNormal)
+	    mode != ResizeOptions::ModeNormal &&
+	    mode != ResizeOptions::ModeOutline)
 	{
 	    Box box;
 
 	    /* Also, damage relevant paint rectangles */
-	    if (mode == ResizeOptions::ModeRectangle ||
-	        mode == ResizeOptions::ModeOutline)
+	    if (mode == ResizeOptions::ModeRectangle)
 		getPaintRectangle (&box);
 	    else if (mode == ResizeOptions::ModeStretch)
 		getStretchRectangle (&box);
@@ -518,7 +518,8 @@
 					     xRoot, yRoot,
 					     wX, wY, wWidth, wHeight); /*in*/
 
-	if (mode != ResizeOptions::ModeNormal)
+	if (mode != ResizeOptions::ModeNormal &&
+	    mode != ResizeOptions::ModeOutline)
 	{
 	    if (mode == ResizeOptions::ModeStretch)
 		getStretchRectangle (&box);
@@ -532,7 +533,8 @@
 
 	computeGeometry (wi, he);
 
-	if (mode != ResizeOptions::ModeNormal)
+	if (mode != ResizeOptions::ModeNormal &&
+	    mode != ResizeOptions::ModeOutline)
 	{
 	    if (mode == ResizeOptions::ModeStretch)
 		getStretchRectangle (&box);
@@ -541,7 +543,7 @@
 
 	    damageRectangle (&box);
 	}
-	else
+	else if (mode == ResizeOptions::ModeNormal)
 	{
 	    updateWindowSize ();
 	}

=== modified file 'plugins/resize/src/resize.cpp'
--- plugins/resize/src/resize.cpp	2015-10-20 15:01:58 +0000
+++ plugins/resize/src/resize.cpp	2017-06-29 02:14:38 +0000
@@ -85,30 +85,44 @@
 				unsigned short            *fillColor)
 {
     GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
+    const unsigned short MaxUShort = std::numeric_limits <unsigned short>::max ();
+    const float MaxUShortFloat = MaxUShort;
 
     BoxRec   	   box;
+    CompRegion     damageRegion;
     GLMatrix 	   sTransform (transform);
     GLfloat         vertexData [12];
     GLfloat         vertexData2[24];
     GLint    	   origSrc, origDst;
     GLushort	    fc[4], bc[4];
 
+    bool blend = !optionGetDisableBlend ();
+
+    if (blend && borderColor[3] == MaxUShort)
+    {
+	if (optionGetMode () == ResizeOptions::ModeOutline || fillColor[3] == MaxUShort)
+	    blend = false;
+    }
+
+    if (blend)
+    {
 #ifdef USE_GLES
-    GLint           origSrcAlpha, origDstAlpha;
-    glGetIntegerv (GL_BLEND_SRC_RGB, &origSrc);
-    glGetIntegerv (GL_BLEND_DST_RGB, &origDst);
-    glGetIntegerv (GL_BLEND_SRC_ALPHA, &origSrcAlpha);
-    glGetIntegerv (GL_BLEND_DST_ALPHA, &origDstAlpha);
+	GLint origSrcAlpha, origDstAlpha;
+	glGetIntegerv (GL_BLEND_SRC_RGB, &origSrc);
+	glGetIntegerv (GL_BLEND_DST_RGB, &origDst);
+	glGetIntegerv (GL_BLEND_SRC_ALPHA, &origSrcAlpha);
+	glGetIntegerv (GL_BLEND_DST_ALPHA, &origDstAlpha);
 #else
-    glGetIntegerv (GL_BLEND_SRC, &origSrc);
-    glGetIntegerv (GL_BLEND_DST, &origDst);
+	glGetIntegerv (GL_BLEND_SRC, &origSrc);
+	glGetIntegerv (GL_BLEND_DST, &origDst);
 #endif
+    }
 
     /* Premultiply the alpha values */
-    bc[3] = (float) borderColor[3] / (float) 65535.0f;
-    bc[0] = ((float) borderColor[0] / 65535.0f) * bc[3];
-    bc[1] = ((float) borderColor[1] / 65535.0f) * bc[3];
-    bc[2] = ((float) borderColor[2] / 65535.0f) * bc[3];
+    bc[3] = blend ? ((float) borderColor[3] / MaxUShortFloat) : MaxUShortFloat;
+    bc[0] = ((float) borderColor[0] / MaxUShortFloat) * bc[3];
+    bc[1] = ((float) borderColor[1] / MaxUShortFloat) * bc[3];
+    bc[2] = ((float) borderColor[2] / MaxUShortFloat) * bc[3];
 
     logic.getPaintRectangle (&box);
 
@@ -159,16 +173,19 @@
 
     sTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
 
-    glEnable (GL_BLEND);
-    glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+    if (blend)
+    {
+	glEnable (GL_BLEND);
+	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+    }
 
     /* fill rectangle */
     if (fillColor)
     {
-	fc[3] = fillColor[3];
-	fc[0] = fillColor[0] * (unsigned long)fc[3] / 65535;
-	fc[1] = fillColor[1] * (unsigned long)fc[3] / 65535;
-	fc[2] = fillColor[2] * (unsigned long)fc[3] / 65535;
+	fc[3] = blend ? fillColor[3] : 0.85f * MaxUShortFloat;
+	fc[0] = fillColor[0] * (unsigned long) fc[3] / MaxUShortFloat;
+	fc[1] = fillColor[1] * (unsigned long) fc[3] / MaxUShortFloat;
+	fc[2] = fillColor[2] * (unsigned long) fc[3] / MaxUShortFloat;
 
 	streamingBuffer->begin (GL_TRIANGLE_STRIP);
 	streamingBuffer->addColors (1, fc);
@@ -186,20 +203,52 @@
     streamingBuffer->end ();
     streamingBuffer->render (sTransform);
 
-    glDisable (GL_BLEND);
+    if (blend)
+    {
+	glDisable (GL_BLEND);
 #ifdef USE_GLES
-    glBlendFuncSeparate (origSrc, origDst,
-                         origSrcAlpha, origDstAlpha);
+	glBlendFuncSeparate (origSrc, origDst,
+			     origSrcAlpha, origDstAlpha);
 #else
-    glBlendFunc (origSrc, origDst);
+	glBlendFunc (origSrc, origDst);
 #endif
+    }
 
     CompositeScreen *cScreen = CompositeScreen::get (screen);
-    CompRect damage (box.x1 - borderWidth,
-                     box.y1 - borderWidth,
-                     box.x2 - box.x1 + 2 * borderWidth,
-                     box.y2 - box.y1 + 2 * borderWidth);
-    cScreen->damageRegion (damage);
+
+    if (optionGetMode () == ResizeOptions::ModeOutline)
+    {
+	// Top
+	damageRegion += CompRect (box.x1 - borderWidth,
+				  box.y1 - borderWidth,
+				  box.x2 - box.x1 + borderWidth * 2,
+				  borderWidth + 1);
+	// Right
+	damageRegion += CompRect (box.x2 - borderWidth,
+				  box.y1 - borderWidth,
+				  borderWidth + 1,
+				  box.y2 - box.y1 + borderWidth * 2);
+	// Bottom
+	damageRegion += CompRect (box.x1 - borderWidth,
+				  box.y2 - borderWidth,
+				  box.x2 - box.x1 + borderWidth * 2,
+				  borderWidth + 1);
+	// Left
+	damageRegion += CompRect (box.x1 - borderWidth,
+				  box.y1 - borderWidth,
+				  borderWidth + 1,
+				  box.y2 - box.y1 + borderWidth * 2);
+    }
+    else
+    {
+	CompRect damage (box.x1 - borderWidth,
+			 box.y1 - borderWidth,
+			 box.x2 - box.x1 + borderWidth * 2,
+			 box.y2 - box.y1 + borderWidth * 2);
+	damageRegion += damage;
+    }
+
+    cScreen->damageRegion (damageRegion);
 }
 
 bool