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

[Marco Trevisan (Treviño)]

move: damage all the border area in outline mode and ignore transparent colors

Also we don't really need to damage at every X event. It's just about doing it
right the firs time, by including the exceeding space.
Also optimize damanging in outline-mode, by only touching such regions

Plus add some optimizations when not blending, as we don't care about the alpha channel

[lp:~3v1n0/compiz/move-lowgfx-fixes]

4129. By Marco Trevisan (Treviño) on 2017-06-29

move: properly use the blending if enabled

[Andrea Azzarone (azzar1)]

LGTM

review: Approve

=== modified file 'debian/unity-lowgfx.ini'
--- debian/unity-lowgfx.ini	2017-01-09 15:08:47 +0000
+++ debian/unity-lowgfx.ini	2017-06-29 01:58:44 +0000
@@ -50,3 +50,4 @@
 [move]
 s0_mode = 1
 s0_blend = false
+s0_lazy_positioning = true

=== modified file 'plugins/move/src/move.cpp'
--- plugins/move/src/move.cpp	2017-04-20 08:03:29 +0000
+++ plugins/move/src/move.cpp	2017-06-29 01:58:44 +0000
@@ -34,9 +34,6 @@
 
 COMPIZ_PLUGIN_20090315 (move, MovePluginVTable)
 
-static float pos_x, pos_y;
-static bool paint_rectangle;
-
 static bool
 moveInitiate (CompAction         *action,
 	      CompAction::State  state,
@@ -49,13 +46,9 @@
     if (ms->optionGetMode () != MoveOptions::ModeNormal)
     {
 	ms->gScreen->glPaintOutputSetEnabled (ms, true);
-	paint_rectangle = true;
-	pos_x = pos_y = 0;
-    }
-    else
-    {
-	ms->gScreen->glPaintOutputSetEnabled (ms, false);
-	paint_rectangle = false;
+	ms->paintRect = true;
+	ms->rectX = 0;
+	ms->rectY = 0;
     }
 
     Window xid = CompOption::getIntOptionNamed (options, "window");
@@ -188,26 +181,15 @@
 {
     MOVE_SCREEN (screen);
 
-    if (ms->optionGetMode () != MoveOptions::ModeNormal)
-    {
-	ms->gScreen->glPaintOutputSetEnabled (ms, true);
-	paint_rectangle = true;
-    }
-    else
-    {
-	ms->gScreen->glPaintOutputSetEnabled (ms, false);
-	paint_rectangle = false;
-    }
-
     if (ms->w)
     {
 	MOVE_WINDOW (ms->w);
 
-	if (ms->optionGetMode () != MoveOptions::ModeNormal) {
+	if (ms->paintRect)
+	{
+	    ms->paintRect = false;
 	    ms->gScreen->glPaintOutputSetEnabled (ms, false);
-	    paint_rectangle = false;
-
-	    mw->window->move (pos_x, pos_y, true);
+	    mw->window->move (ms->rectX, ms->rectY, true);
 	}
 
 	if (state & CompAction::StateCancel)
@@ -564,8 +546,8 @@
 	    }
 	    else
 	    {
-		pos_x += wX + dx - w->geometry ().x ();
-		pos_y += wY + dy - w->geometry ().y ();
+		ms->rectX += wX + dx - w->geometry ().x ();
+		ms->rectY += wY + dy - w->geometry ().y ();
 	    }
 
 	    ms->x -= dx;
@@ -577,10 +559,6 @@
 void
 MoveScreen::handleEvent (XEvent *event)
 {
-    Box box;
-    if (getMovingRectangle (&box))
-	damageMovingRectangle (&box);
-
     switch (event->type)
     {
 	case ButtonPress:
@@ -757,6 +735,9 @@
     status (RectangleOut),
     releaseButton (0),
     grab (NULL),
+    paintRect(false),
+    rectX(0),
+    rectY(0),
     hasCompositing (false),
     yConstrained (false)
 {
@@ -784,16 +765,7 @@
     ScreenInterface::setHandler (screen);
     GLScreenInterface::setHandler (gScreen);
 
-    if (optionGetMode () != MoveOptions::ModeNormal)
-    {
-	paint_rectangle = true;
-	gScreen->glPaintOutputSetEnabled (this, true);
-    }
-    else
-    {
-	paint_rectangle = false;
-	gScreen->glPaintOutputSetEnabled (this, false);
-    }
+    gScreen->glPaintOutputSetEnabled (this, false);
 }
 
 MoveScreen::~MoveScreen ()
@@ -805,12 +777,7 @@
 bool
 MoveScreen::getMovingRectangle (BoxPtr pBox)
 {
-    if (optionGetMode () == MoveOptions::ModeNormal)
-	return false;
-
     MOVE_SCREEN (screen);
-    if (!ms)
-	return false;
 
     CompWindow *w = ms->w;
     if (!w)
@@ -821,8 +788,8 @@
     int wWidth  = w->geometry ().widthIncBorders () + w->border ().left + w->border ().right;
     int wHeight = w->geometry ().heightIncBorders () + w->border ().top + w->border ().bottom;
 
-    pBox->x1 = wX + pos_x;
-    pBox->y1 = wY + pos_y;
+    pBox->x1 = wX + ms->rectX;
+    pBox->y1 = wY + ms->rectY;
 
     pBox->x2 = pBox->x1 + wWidth;
     pBox->y2 = pBox->y1 + wHeight;
@@ -838,30 +805,20 @@
 {
     bool status = gScreen->glPaintOutput (attrib, transform, region, output, mask);
 
-    if (status && paint_rectangle)
+    if (status && paintRect)
     {
 	unsigned short *borderColor = optionGetBorderColor ();
-	unsigned short *fillColor = optionGetFillColor ();
-
-	return glPaintMovingRectangle (transform, output, borderColor, (optionGetMode() == MoveOptions::ModeRectangle) ? fillColor : NULL);
+	unsigned short *fillColor = NULL;
+
+	if (optionGetMode() == MoveOptions::ModeRectangle)
+	    fillColor = optionGetFillColor ();
+
+	return glPaintMovingRectangle (transform, output, borderColor, fillColor);
     }
+
     return status;
 }
 
-void
-MoveScreen::damageMovingRectangle (BoxPtr pBox)
-{
-    int x1, x2, y1, y2;
-
-    x1 = pBox->x1 - 1;
-    y1 = pBox->y1 - 1;
-    x2 = pBox->x2 + 1;
-    y2 = pBox->y2 + 1;
-
-    if (cScreen)
-	cScreen->damageRegion (CompRect (x1, y1, x2 - x1, y2 - y1));
-}
-
 bool
 MoveScreen::glPaintMovingRectangle (const GLMatrix &transform,
 				    CompOutput *output,
@@ -872,6 +829,8 @@
     if (!getMovingRectangle(&box))
 	return false;
 
+    const unsigned short MaxUShort = std::numeric_limits <unsigned short>::max ();
+    const float MaxUShortFloat = MaxUShort;
     GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
     GLMatrix sTransform (transform);
 
@@ -881,6 +840,13 @@
     GLint origSrc, origDst;
 
     bool blend = optionGetBlend ();
+
+    if (blend && borderColor[3] == MaxUShort)
+    {
+	if (optionGetMode () == MoveOptions::ModeOutline || fillColor[3] == MaxUShort)
+	    blend = false;
+    }
+
     if (blend)
     {
 #ifdef USE_GLES
@@ -895,12 +861,10 @@
 #endif
     }
 
-    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];
-    if (!blend)
-	bc[3] = 1;
+    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];
 
     vertexData[0] = box.x1;
     vertexData[1] = box.y1;
@@ -951,12 +915,10 @@
     /* 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;
-	if (!blend)
-	    fc[3] = 1;
+	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);
@@ -977,18 +939,52 @@
 
     if (blend)
     {
-	glEnable (GL_BLEND);
-	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+	glDisable (GL_BLEND);
+#ifdef USE_GLES
+	glBlendFuncSeparate (origSrc, origDst,
+			     origSrcAlpha, origDstAlpha);
+#else
+	glBlendFunc (origSrc, origDst);
+#endif
     }
 
-    CompositeScreen *cScreen = CompositeScreen::get (screen);
     if (cScreen)
     {
-	CompRect damage (box.x1 - borderWidth,
-			 box.y1 - borderWidth,
-			 box.x2 - box.x1 + 2,
-			 box.y2 - box.y1 + 2);
-	cScreen->damageRegion (damage);
+    	CompRegion damageRegion;
+
+    	if (optionGetMode () == MoveOptions::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);
     }
 
     return true;

=== modified file 'plugins/move/src/move.h'
--- plugins/move/src/move.h	2016-09-01 13:59:44 +0000
+++ plugins/move/src/move.h	2017-06-29 01:58:44 +0000
@@ -95,6 +95,10 @@
 
 	unsigned int origState;
 
+	bool    paintRect;
+	int     rectX;
+	int     rectY;
+
 	int	snapOffX;
 	int	snapBackX;