Merge lp:~brandontschaefer/unity/lp.966030-fix into lp:unity

[Brandon Schaefer]

Show desktop now only works for individual workspaces. Also if any new windows are opened, or one is restored on that workspace then the next Show desktop will minimize those. The only time windows are restored are when no new windows have been mapped, and no windows have been restored for that workspace only.

Changes to the show desktop icon:

- Only minimizes windows on current workspace.
- Will only restore windows if and only if:
  -- No new windows have been mapped (opened).
  -- No new windows have been unminimized.
  -- The user has not moved workspaces.
- When we are restoring windows from Show desktop, all of them are unminimzed on all workspaces.

Testing this might be hard, but im looking into it :).

Video does not show the new restore fix, but still good to show what it does now.
Video: http://ubuntuone.com/2G483y5nLc0OBkhHWww1gm

So overall things to manually test:
- Only windows in current workspace get minimized.
- Windows on the same workspace only get restored IFF, no new windows have been opened,
no windows have been restore from that workspace.
- All windows must be restored if returning to a workspace that is empty.
- If any new window, or a window is restore, then the next time a ShowDesktop is activated for that workspace all the windows are minimized (for that workspace only).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3380
http://jenkins.qa.ubuntu.com/job/unity-ci/146/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/34

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/146/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3381
http://jenkins.qa.ubuntu.com/job/unity-ci/147/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/35

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/147/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3382
http://jenkins.qa.ubuntu.com/job/unity-ci/148/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/36

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/148/rebuild

review: Approve (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Works fine here.

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-06-18 18:48:31 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-06-20 19:47:26 +0000
@@ -857,9 +857,11 @@
 {
   for (CompWindow *w : screen->windows ())
   {
+    CompPoint const& viewport = w->defaultViewport();
     UnityWindow *uw = UnityWindow::get (w);
 
-    if (ShowdesktopHandler::ShouldHide (static_cast <ShowdesktopHandlerWindowInterface *> (uw)))
+    if (viewport == uScreen->screen->vp() &&
+        ShowdesktopHandler::ShouldHide (static_cast <ShowdesktopHandlerWindowInterface *> (uw)))
     {
       UnityWindow::get (w)->enterShowDesktop ();
       // the animation plugin does strange things here ...
@@ -900,7 +902,10 @@
   {
     for (CompWindow *cw : screen->windows ())
     {
-      if (cw->inShowDesktopMode ())
+      CompPoint const& viewport = cw->defaultViewport();
+
+      if (viewport == uScreen->screen->vp() &&
+          cw->inShowDesktopMode ())
       {
         UnityWindow::get (cw)->leaveShowDesktop ();
         // the animation plugin does strange things here ...
@@ -911,7 +916,17 @@
 
     PluginAdapter::Default().OnLeaveDesktop();
 
-    screen->leaveShowDesktopMode (w);
+    if (w)
+    {
+      CompPoint const& viewport = w->defaultViewport();
+
+      if (viewport == uScreen->screen->vp())
+        screen->leaveShowDesktopMode (w);
+    }
+    else
+    {
+      screen->focusDefaultWindow();
+    }
   }
   else
   {
@@ -977,6 +992,8 @@
   ShowdesktopHandler::InhibitLeaveShowdesktopMode (window->id ());
   window->activate ();
   ShowdesktopHandler::AllowLeaveShowdesktopMode (window->id ());
+
+  PluginAdapter::Default().OnLeaveDesktop();
 }
 
 void UnityWindow::DoEnableFocus ()
@@ -2781,6 +2798,8 @@
         window->unminimizeSetEnabled (this, false);
         window->minimizedSetEnabled (this, false);
       }
+
+      PluginAdapter::Default().UpdateShowDesktopState();
         break;
       case CompWindowNotifyBeforeDestroy:
         being_destroyed.emit();
@@ -3395,6 +3414,8 @@
   GLWindowInterface::setHandler(gWindow);
   ScaleWindowInterface::setHandler (ScaleWindow::get (window));
 
+  PluginAdapter::Default().OnLeaveDesktop();
+
   /* This needs to happen before we set our wrapable functions, since we
    * need to ask core (and not ourselves) whether or not the window is
    * minimized */

=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2013-05-17 22:53:57 +0000
+++ unity-shared/PluginAdapter.cpp	2013-06-20 19:47:26 +0000
@@ -217,6 +217,8 @@
   }
   else if (g_strcmp0(event, "end_viewport_switch") == 0)
   {
+    UpdateShowDesktopState();
+
     _vp_switch_started = false;
     screen_viewport_switch_ended.emit();
   }
@@ -610,6 +612,20 @@
   return 0;
 }
 
+bool PluginAdapter::IsCurrentViewportEmpty() const
+{
+  Window win = GetTopMostValidWindowInViewport();
+
+  if (win)
+  {
+    CompWindow* cwin = m_Screen->findWindow(win);
+    if (!(cwin->type() & NO_FOCUS_MASK))
+      return false;
+  }
+
+  return true;
+}
+
 Window PluginAdapter::GetTopWindowAbove(Window xid) const
 {
   CompWindow* window;
@@ -930,6 +946,14 @@
   _in_show_desktop = false;
 }
 
+void PluginAdapter::UpdateShowDesktopState()
+{
+  if (!IsCurrentViewportEmpty())
+    OnLeaveDesktop();
+  else
+    OnShowDesktop();
+}
+
 int PluginAdapter::GetWindowMonitor(Window window_id) const
 {
   // FIXME, we should use window->outputDevice() but this is not UScreen friendly

=== modified file 'unity-shared/PluginAdapter.h'
--- unity-shared/PluginAdapter.h	2013-05-17 22:53:57 +0000
+++ unity-shared/PluginAdapter.h	2013-06-20 19:47:26 +0000
@@ -97,6 +97,7 @@
 
   void OnShowDesktop ();
   void OnLeaveDesktop ();
+  void UpdateShowDesktopState();
 
   void TerminateScale();
   bool IsScaleActive() const;
@@ -206,6 +207,7 @@
   unsigned long GetMwnDecorations(Window xid) const;
 
   Window GetTopMostValidWindowInViewport() const;
+  bool IsCurrentViewportEmpty() const;
 
   std::string GetTextProperty(Window xid, Atom atom) const;
   std::string GetUtf8Property(Window xid, Atom atom) const;