Merge lp:~smspillaz/unity/unity.fix_851472 into lp:unity

[Sam Spilsbury]

Fix bug 851472

[Robert Carr (robertcarr)]

+1

review: Approve

=== modified file 'plugins/unityshell/src/compizminimizedwindowhandler.h'
--- plugins/unityshell/src/compizminimizedwindowhandler.h	2011-09-20 20:53:38 +0000
+++ plugins/unityshell/src/compizminimizedwindowhandler.h	2011-09-28 16:34:19 +0000
@@ -116,7 +116,6 @@
   MinimizedWindowHandler::setVisibility (visible, priv->mWindow->id ());
 
   CompositeWindow::get (priv->mWindow)->addDamage ();
-  GLWindow::get (priv->mWindow)->glPaintSetEnabled (Window::get (priv->mWindow), !visible);
 }
 
 template <typename Screen, typename Window>

=== modified file 'plugins/unityshell/src/inputremover.cpp'
--- plugins/unityshell/src/inputremover.cpp	2011-09-13 13:32:06 +0000
+++ plugins/unityshell/src/inputremover.cpp	2011-09-28 16:34:19 +0000
@@ -91,8 +91,10 @@
   if (!mRemoved)
   {
     /* FIXME: these roundtrips suck */
-    XGetGeometry (mDpy, mShapeWindow, &rootReturn, &x, &y, &width, &height, &depth, &border);
-    XQueryTree (mDpy, mShapeWindow, &rootReturn, &parentReturn, &children, &nchildren);
+    if (!XGetGeometry (mDpy, mShapeWindow, &rootReturn, &x, &y, &width, &height, &depth, &border))
+      return;
+    if (!XQueryTree (mDpy, mShapeWindow, &rootReturn, &parentReturn, &children, &nchildren))
+      return;
 
     /* We need to translate the co-ordinates of the origin to the
      * client window to its parent to find out the offset of its
@@ -120,7 +122,7 @@
       Region      boundingRegion = XCreateRegion ();
 
       for (int i = 0; i < mNBoundingRects; i++)
-	XUnionRectWithRegion (&(mBoundingRects[i]), boundingRegion, boundingRegion);
+        XUnionRectWithRegion (&(mBoundingRects[i]), boundingRegion, boundingRegion);
 
       xsev.x = boundingRegion->extents.x1 - xOffset;
       xsev.y = boundingRegion->extents.y1 - yOffset;
@@ -152,7 +154,7 @@
       Region      inputRegion = XCreateRegion ();
 
       for (int i = 0; i < mNInputRects; i++)
-	XUnionRectWithRegion (&(mInputRects[i]), inputRegion, inputRegion);
+        XUnionRectWithRegion (&(mInputRects[i]), inputRegion, inputRegion);
 
       xsev.x = inputRegion->extents.x1 - xOffset;
       xsev.y = inputRegion->extents.y1 - yOffset;
@@ -268,7 +270,8 @@
 compiz::WindowInputRemover::remove ()
 {
   if (!mNInputRects)
-    save ();
+    if (!save ())
+      return false;
 
   XShapeSelectInput (mDpy, mShapeWindow, NoEventMask);
 
@@ -289,7 +292,6 @@
 bool
 compiz::WindowInputRemover::restore ()
 {
-
   XShapeSelectInput (mDpy, mShapeWindow, NoEventMask);
 
   if (mRemoved)
@@ -308,7 +310,11 @@
     }
 
     if (mInputRects)
+    {
       XFree (mInputRects);
+      mInputRects = NULL;
+      mNInputRects = 0;
+    }
 
     if (mNBoundingRects)
     {
@@ -323,7 +329,11 @@
     }
 
     if (mBoundingRects)
+    {
       XFree (mBoundingRects);
+      mBoundingRects = NULL;
+      mNBoundingRects = 0;
+    }
   }
 
   XShapeSelectInput (mDpy, mShapeWindow, mShapeMask);
@@ -332,9 +342,5 @@
 
   sendShapeNotify ();
 
-  mNInputRects  = 0;
-  mInputRects = NULL;
-  mNBoundingRects = 0;
-  mBoundingRects = NULL;
   return true;
 }

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-09-28 01:43:32 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-09-28 16:34:19 +0000
@@ -270,9 +270,10 @@
 
      optionSetAltTabLeftInitiate (boost::bind (&UnityScreen::altTabPrevInitiate, this, _1, _2, _3));
      optionSetAltTabRightInitiate (boost::bind (&UnityScreen::altTabForwardInitiate, this, _1, _2, _3));
+     optionSetShowMinimizedWindowsNotify (boost::bind (&UnityScreen::optionChanged, this, _1, _2));
 
      for (unsigned int i = 0; i < G_N_ELEMENTS(_ubus_handles); i++)
-	 _ubus_handles[i] = 0;
+       _ubus_handles[i] = 0;
 
      UBusServer* ubus = ubus_server_get_default();
      _ubus_handles[0] = ubus_server_register_interest(ubus,
@@ -741,7 +742,7 @@
 
   if (w->wmType () & (CompWindowTypeDesktopMask |
                       CompWindowTypeDockMask))
-  return false;
+   return false;
 
   if (w->state () & CompWindowStateSkipPagerMask)
     return false;
@@ -822,7 +823,7 @@
 
 void UnityShowdesktopHandler::paintAttrib (GLWindowPaintAttrib &attrib)
 {
-  attrib.opacity = attrib.opacity * mProgress;
+  attrib.opacity = static_cast <int> (static_cast <float> (attrib.opacity) * mProgress);
 }
 
 unsigned int UnityShowdesktopHandler::getPaintMask ()
@@ -1889,6 +1890,8 @@
       break;
     case UnityshellOptions::ShowMinimizedWindows:
       compiz::CompizMinimizedWindowHandler<UnityScreen, UnityWindow>::setFunctions (optionGetShowMinimizedWindows ());
+      screen->enterShowDesktopModeSetEnabled (this, optionGetShowMinimizedWindows ());
+      screen->leaveShowDesktopModeSetEnabled (this, optionGetShowMinimizedWindows ());
       break;
     default:
       break;