Merge lp:~ivenvd/compiz/compiz.fix_1050757 into lp:compiz/0.9.8

[Iven Hsu]

Reset opacity of the passive windows when window focus changed.
(LP: #1050757)

Also fixes the bug that clearPassive() doesn't reset the opacity of the
passive windows.

[Sam Spilsbury (smspillaz)]

Looking good.

review: Approve

[Daniel van Vugt (vanvugt)]

Looks OK and still seems to work.

I can't say I've found the opacify plugin to be particularly reliable, but that's nothing to do with this proposal.

review: Approve

=== modified file 'plugins/opacify/src/opacify.cpp'
--- plugins/opacify/src/opacify.cpp	2012-09-14 06:51:27 +0000
+++ plugins/opacify/src/opacify.cpp	2012-09-24 14:04:27 +0000
@@ -64,7 +64,7 @@
 */
 
 void
-OpacifyScreen::resetOpacity (Window  id)
+OpacifyScreen::resetWindowOpacity (Window  id)
 {
     CompWindow *w;
 
@@ -78,11 +78,39 @@
     ow->cWindow->addDamage ();
 }
 
+/* Resets all the windows on the screen to the original opacity
+ * if necessary. Then reset active.
+*/
+
+void
+OpacifyScreen::resetScreenOpacity ()
+{
+    if (active)
+    {
+	clearPassive();
+	resetWindowOpacity(active);
+	active = 0;
+    }
+}
+
 /* Resets the opacity of windows on the passive list.
 */
 void
 OpacifyScreen::clearPassive ()
 {
+    foreach (Window xid, passive)
+    {
+	CompWindow *win = screen->findWindow (xid);
+
+	if (!win)
+	    continue;
+
+	OPACIFY_WINDOW (win);
+
+	ow->setOpacity (MAX (OPAQUE * optionGetActiveOpacity () / 100,
+			ow->gWindow->paintAttrib ().opacity));
+	resetWindowOpacity (xid);
+    }
     passive.clear ();
 }
 
@@ -116,20 +144,7 @@
     int        i = 0;
 
     /* Clear the list first to prevent memleaks */
-    foreach (Window xid, passive)
-    {
-	CompWindow *win = screen->findWindow (xid);
-
-	if (!win)
-	    continue;
-
-	OPACIFY_WINDOW (win);
-
-	resetOpacity (xid);
-	ow->setOpacity (MAX (OPAQUE * optionGetActiveOpacity () / 100,
-			ow->gWindow->paintAttrib ().opacity));
-    }
-    passive.clear ();
+    clearPassive ();
 
     foreach (CompWindow *w, screen->windows ())
     {
@@ -177,16 +192,14 @@
 	    return;
 	}
 
-	os->clearPassive ();
-	os->resetOpacity (os->active);
-	os->active = 0;
+	os->resetScreenOpacity ();
 	return;
     }
 
     if (!window || os->active != window->id () || os->justMoved)
     {
 	os->justMoved = false;
-	os->resetOpacity (os->active);
+	os->resetWindowOpacity (os->active);
 	os->active = 0;
     }
 
@@ -214,7 +227,7 @@
 OpacifyScreen::handleTimeout ()
 {
     if (newActive)
-        OpacifyWindow::get (newActive)->handleEnter ();
+	OpacifyWindow::get (newActive)->handleEnter ();
 
     return false;
 }
@@ -287,7 +300,7 @@
 	Window id;
 
 	id = event->xcrossing.window;
-	    newActive = screen->findTopLevelWindow (id);
+	newActive = screen->findTopLevelWindow (id);
 
 	if (timeoutHandle.active ())
 	    timeoutHandle.stop ();
@@ -296,7 +309,10 @@
 	    handleTimeout ();
 	else
 	    timeoutHandle.start ();
-     	break;
+	break;
+    case FocusIn:
+	resetScreenOpacity();
+	break;
     case ConfigureNotify:
 
 	if (active != event->xconfigure.window)
@@ -311,7 +327,7 @@
 	    if (w)
 		passiveWindows (w->region ());
 	}
-     	break;
+	break;
     default:
 	break;
     }
@@ -329,12 +345,7 @@
     isToggle = !isToggle;
     if (!isToggle && optionGetToggleReset ())
     {
-	if (active)
-	{
-	    clearPassive ();
-	    resetOpacity (active);
-	    active = 0;
-	}
+	resetScreenOpacity();
     }
 
     setFunctions (isToggle);
@@ -357,12 +368,7 @@
     case OpacifyOptions::InitToggle:
 	isToggle = option->value ().b ();
 	setFunctions (isToggle);
-	if (active)
-	{
-	    clearPassive ();
-	    resetOpacity (active);
-	    active = 0;
-	}
+	resetScreenOpacity();
 	break;
 	case OpacifyOptions::Timeout:
 	timeoutHandle.setTimes (optionGetTimeout (), optionGetTimeout () * 1.2);

=== modified file 'plugins/opacify/src/opacify.h'
--- plugins/opacify/src/opacify.h	2012-09-07 23:29:42 +0000
+++ plugins/opacify/src/opacify.h	2012-09-24 14:04:27 +0000
@@ -61,7 +61,10 @@
 	handleEvent (XEvent *);
 
 	void
-	resetOpacity (Window  id);
+	resetWindowOpacity (Window  id);
+
+	void
+	resetScreenOpacity ();
 
 	void
 	clearPassive ();