Merge lp:~smspillaz/compiz/compiz..merge-fix-1075578-workspacenames-flickering-during-display.damage_correctly into lp:compiz/0.9.9

[Sam Spilsbury]

Damage the text area correctly. Extract the method used to determine where the text area was into a separate function and use that to determine where our damage area should be. Also fix a few errors that happened on the last frame of animation.

Damage the text area correctly. Extract the method used to determine where the text area was into a separate function and use that to determine where our damage area should be. Also fix a few errors that happened on the last frame of animation.

Unmerged revisions

=== modified file 'plugins/workspacenames/src/workspacenames.cpp'
--- plugins/workspacenames/src/workspacenames.cpp	2012-12-04 15:06:12 +0000
+++ plugins/workspacenames/src/workspacenames.cpp	2013-03-30 14:34:25 +0000
@@ -24,21 +24,23 @@
 
 #include "workspacenames.h"
 
+namespace
+{
+    const float TEXT_BORDER = 10.0f;
+}
+
+
 CompString
 WSNamesScreen::getCurrentWSName ()
 {
-    int		currentVp;
-    int		listSize;
     CompString	ret;
-    CompOption::Value::Vector names;
-    CompOption::Value::Vector vpNumbers;
-
-    vpNumbers = optionGetViewports ();
-    names     = optionGetNames ();
-
-    currentVp = screen->vp ().y () * screen->vpSize ().width () +
+
+    CompOption::Value::Vector vpNumbers = optionGetViewports ();
+    CompOption::Value::Vector names     = optionGetNames ();
+
+    int currentVp = screen->vp ().y () * screen->vpSize ().width () +
 		screen->vp ().x () + 1;
-    listSize  = MIN (vpNumbers.size (), names.size ());
+    int listSize  = MIN (vpNumbers.size (), names.size ());
 
     for (int i = 0; i < listSize; i++)
 	if (vpNumbers[i].i () == currentVp)
@@ -51,11 +53,10 @@
 WSNamesScreen::renderNameText ()
 {
     CompText::Attrib attrib;
-    CompString	     name;
 
     textData.clear ();
 
-    name = getCurrentWSName ();
+    CompString name = getCurrentWSName ();
 
     if (name.empty ())
 	return;
@@ -86,16 +87,14 @@
     textData.renderText (name, attrib);
 }
 
-void
-WSNamesScreen::drawText (const GLMatrix &matrix)
+CompPoint
+WSNamesScreen::getTextPlacementPosition ()
 {
-    GLfloat  alpha;
-    float    x, y, border = 10.0f;
     CompRect oe = screen->getCurrentOutputExtents ();
-
-    x = oe.centerX () - textData.getWidth () / 2;
-
-    /* assign y (for the lower corner!) according to the setting */
+    float x = oe.centerX () - textData.getWidth () / 2;
+    float y = 0;
+    const float border = TEXT_BORDER;
+
     switch (optionGetTextPlacement ())
     {
 	case WorkspacenamesOptions::TextPlacementCenteredOnScreen:
@@ -108,7 +107,7 @@
 
 		if (optionGetTextPlacement () ==
 		    WorkspacenamesOptions::TextPlacementTopOfScreen)
-    		    y = oe.y1 () + workArea.y () +
+		    y = oe.y1 () + workArea.y () +
 			(2 * border) + textData.getHeight ();
 		else
 		    y = oe.y1 () + workArea.y () +
@@ -116,16 +115,49 @@
 	    }
 	    break;
 	default:
-	    return;
+	    return CompPoint (floor (x),
+			      oe.centerY () - textData.getHeight () / 2);
 	    break;
     }
 
+    return CompPoint (floor (x), floor (y));
+}
+
+void
+WSNamesScreen::damageTextArea ()
+{
+    const CompPoint pos (getTextPlacementPosition ());
+
+    /* The placement position is from the lower corner, so we
+     * need to move it back up by height */
+    CompRect        area (pos.x () - TEXT_BORDER,
+			  pos.y () - TEXT_BORDER - textData.getHeight () ,
+			  textData.getWidth () + TEXT_BORDER * 2,
+			  textData.getHeight () + TEXT_BORDER * 2);
+
+    cScreen->damageRegion (area);
+}
+
+void
+WSNamesScreen::drawText (const GLMatrix &matrix)
+{
+    GLfloat  alpha = 0.0f;
+
+    /* assign y (for the lower corner!) according to the setting */
+    const CompPoint p = getTextPlacementPosition ();
+
     if (timer)
 	alpha = timer / (optionGetFadeTime () * 1000.0f);
-    else
+    else if (timeoutHandle.active ())
 	alpha = 1.0f;
 
-    textData.draw (matrix, floor (x), floor (y), alpha);
+    textData.draw (matrix, p.x (), p.y (), alpha);
+}
+
+bool
+WSNamesScreen::shouldDrawText ()
+{
+    return textData.getWidth () && textData.getHeight ();
 }
 
 bool
@@ -135,11 +167,9 @@
 			      CompOutput		*output,
 			      unsigned int		mask)
 {
-    bool status;
-
-    status = gScreen->glPaintOutput (attrib, transform, region, output, mask);
-
-    if (textData.getWidth () && textData.getHeight ())
+    bool status = gScreen->glPaintOutput (attrib, transform, region, output, mask);
+
+    if (shouldDrawText ())
     {
 	GLMatrix sTransform (transform);
 
@@ -158,9 +188,6 @@
     {
 	timer -= msSinceLastPaint;
 	timer = MAX (timer, 0);
-
-	if (!timer)
-	    textData.clear ();
     }
 
     cScreen->preparePaint (msSinceLastPaint);
@@ -169,21 +196,27 @@
 void
 WSNamesScreen::donePaint ()
 {
-    /* FIXME: better only damage paint region */
-    if (timer)
-	cScreen->damageScreen ();
+    /* Only damage when the */
+    if (shouldDrawText ())
+	damageTextArea ();
+ 
+     cScreen->donePaint ();
 
-    cScreen->donePaint ();
+    /* Clear text data if done with fadeout */
+    if (!timer && !timeoutHandle.active ())
+	textData.clear ();
 }
 
 bool
 WSNamesScreen::hideTimeout ()
 {
     timer = optionGetFadeTime () * 1000;
+
+    /* Clear immediately if there is no fadeout */
     if (!timer)
 	textData.clear ();
-
-    cScreen->damageScreen ();
+ 
+    damageTextArea ();
 
     timeoutHandle.stop ();
 
@@ -209,7 +242,7 @@
 	renderNameText ();
 	timeoutHandle.start (timeout, timeout + 200);
 
-	cScreen->damageScreen ();
+	damageTextArea ();
     }
 }
 

=== modified file 'plugins/workspacenames/src/workspacenames.h'
--- plugins/workspacenames/src/workspacenames.h	2012-06-22 12:27:42 +0000
+++ plugins/workspacenames/src/workspacenames.h	2013-03-30 14:34:25 +0000
@@ -79,6 +79,16 @@
 
 	void
 	handleEvent (XEvent *);
+
+	CompPoint
+	getTextPlacementPosition ();
+
+	void
+	damageTextArea ();
+
+    private:
+
+	bool shouldDrawText ();
 };
 
 class WorkspacenamesPluginVTable :