Merge lp:~brandontschaefer/unity/show-desktop-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.

Same as the old branch that was reverted, but now when we move to an empty desktop instead of assuming we are in show desktop mode we have to find a window that is in show desktop mode first, if so then we are in show desktop mode.

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

Seems fine to me

review: Approve

[Brandon Schaefer (brandontschaefer)]

Im running this through AP tests before a global approval, don't want to cause AP problems!

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

These tests are failing on trunk for me, so it is not the cause of my branch... they should get fixed up at somepoint though :)

http://paste.ubuntu.com/5862442/

[Brandon Schaefer (brandontschaefer)]

Plus those AP tests are testing the compiz show deskop which this branch does not touch ...

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

We globally approved this because after much investigation, we determined that this commit could not be the cause of the AP test failures that led to the reversion of the original commit.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/144/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/790
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/97
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/97/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/97

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Shh Jenkins, Shh. Try again!

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/145/
Executed test runs:
    None: http://s-jenkins:8080/job/generic-cleanup-mbs/791/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/98
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/98/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/98

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Try this again, Jenkins.

Seems a dbus test is failing on arm which may be due to the a recent merge of dbus tests. It's not related to this MP, but it's strange that the test is failing when it passed on the dbus merge.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-07-02 03:18:27 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-07-10 18:28:28 +0000
@@ -858,9 +858,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 ...
@@ -901,7 +903,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 ...
@@ -912,7 +917,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
   {
@@ -997,6 +1012,8 @@
   ShowdesktopHandler::InhibitLeaveShowdesktopMode (window->id ());
   window->activate ();
   ShowdesktopHandler::AllowLeaveShowdesktopMode (window->id ());
+
+  PluginAdapter::Default().OnLeaveDesktop();
 }
 
 void UnityWindow::DoEnableFocus ()
@@ -2825,6 +2842,8 @@
         window->unminimizeSetEnabled (this, false);
         window->minimizedSetEnabled (this, false);
       }
+
+      PluginAdapter::Default().UpdateShowDesktopState();
         break;
       case CompWindowNotifyBeforeDestroy:
         being_destroyed.emit();
@@ -3439,6 +3458,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-06-27 10:16:04 +0000
+++ unity-shared/PluginAdapter.cpp	2013-07-10 18:28:28 +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;
@@ -920,16 +936,39 @@
 
 void PluginAdapter::OnShowDesktop()
 {
-  LOG_DEBUG(logger) << "Now in show desktop mode.";
   _in_show_desktop = true;
 }
 
 void PluginAdapter::OnLeaveDesktop()
 {
-  LOG_DEBUG(logger) << "No longer in show desktop mode.";
   _in_show_desktop = false;
 }
 
+void PluginAdapter::UpdateShowDesktopState()
+{
+  if (!IsCurrentViewportEmpty())
+  {
+    OnLeaveDesktop();
+  }
+  else
+  {
+    CompWindow* window;
+    CompPoint screen_vp = m_Screen->vp();
+
+    auto const& windows = m_Screen->windows();
+    for (auto it = windows.rbegin(); it != windows.rend(); ++it)
+    {
+      window = *it;
+      if (window->defaultViewport() == screen_vp &&
+          window->inShowDesktopMode())
+      {
+        OnShowDesktop();
+        break;
+      }
+    }
+  }
+}
+
 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-06-27 10:16:04 +0000
+++ unity-shared/PluginAdapter.h	2013-07-10 18:28:28 +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;