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

[MC Return]

Workspacenames Plug-in:
Call cScreen->damageScreen () in void WSNamesScreen::donePaint () not only if timer is true.
This fixes the flickering during display.
Other minor code refactoring.

(LP: #1075578)

Note:
Sophisticated damage rectangle calculation and thus the FIXME is still missing.

[Daniel van Vugt (vanvugt)]

I think we should fix the FIXME. damageScreen is too expensive in some cases, and always when unityshell is loaded.

Please try using damageRegion instead. Similar to:
https://code.launchpad.net/~vanvugt/compiz/fix-1068518/+merge/131552

review: Needs Fixing

[MC Return (mc-return)]

> I think we should fix the FIXME. damageScreen is too expensive in some cases,
> and always when unityshell is loaded.
>

I agree. Using the show repaint plug-in even shows that visually. This should be improved indeed.

> Please try using damageRegion instead. Similar to:
> https://code.launchpad.net/~vanvugt/compiz/fix-1068518/+merge/131552

I will try to do it.

[MC Return (mc-return)]

Somebody (Sam ? ;)) needs to help me with the implementation of the damage rectangle handling as I have no idea how to correctly implement it.

Nevertheless I would suggest to merge this branch for now as it fixes the flickering during display of the workspacename reliably.
Sophisticated damage handling can be implemented at a later stage as well, fixing the bug, every user of workspace naming experiences currently, should have priority.

[lp:~mc-return/compiz/compiz.merge-fix-1075578-workspacenames-flickering-during-display]

3467. By Sam Spilsbury on 2013-03-30

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.

3468. By MC Return on 2013-03-30

Merged latest lp:compiz

3469. By MC Return on 2013-03-30

Reduced TEXT_BORDER from 10.0f to 2 and changed
it's type from const float to const unsigned short

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-02-26 19:45:28 +0000
@@ -27,18 +27,14 @@
 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 +47,10 @@
 WSNamesScreen::renderNameText ()
 {
     CompText::Attrib attrib;
-    CompString	     name;
 
     textData.clear ();
 
-    name = getCurrentWSName ();
+    CompString name = getCurrentWSName ();
 
     if (name.empty ())
 	return;
@@ -135,9 +130,7 @@
 			      CompOutput		*output,
 			      unsigned int		mask)
 {
-    bool status;
-
-    status = gScreen->glPaintOutput (attrib, transform, region, output, mask);
+    bool status = gScreen->glPaintOutput (attrib, transform, region, output, mask);
 
     if (textData.getWidth () && textData.getHeight ())
     {
@@ -170,8 +163,7 @@
 WSNamesScreen::donePaint ()
 {
     /* FIXME: better only damage paint region */
-    if (timer)
-	cScreen->damageScreen ();
+    cScreen->damageScreen ();
 
     cScreen->donePaint ();
 }