Merge lp:~sil2100/unity/revert_r3380_showdesktop into lp:unity

[Łukasz Zemczak]

Revert revision 3380. This caused regression of all autopilot tests as show_desktop was invalidly detected every time there are no visible windows on screen

- Problem:

Autopilot tests are failing because of unity invalidly informing about show_desktop mode.

- Fix:

Revert revision 3380. Those changes broke the show_desktop info mechanism. I think that the fix in overall is a bit hm, broken.

- Tests:

N/A

[Andrea Azzarone (azzar1)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3386
http://jenkins.qa.ubuntu.com/job/unity-ci/158/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/46/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/46

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

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-06-22 02:15:40 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-06-27 12:04:40 +0000
@@ -858,11 +858,9 @@
 {
   for (CompWindow *w : screen->windows ())
   {
-    CompPoint const& viewport = w->defaultViewport();
     UnityWindow *uw = UnityWindow::get (w);
 
-    if (viewport == uScreen->screen->vp() &&
-        ShowdesktopHandler::ShouldHide (static_cast <ShowdesktopHandlerWindowInterface *> (uw)))
+    if (ShowdesktopHandler::ShouldHide (static_cast <ShowdesktopHandlerWindowInterface *> (uw)))
     {
       UnityWindow::get (w)->enterShowDesktop ();
       // the animation plugin does strange things here ...
@@ -903,10 +901,7 @@
   {
     for (CompWindow *cw : screen->windows ())
     {
-      CompPoint const& viewport = cw->defaultViewport();
-
-      if (viewport == uScreen->screen->vp() &&
-          cw->inShowDesktopMode ())
+      if (cw->inShowDesktopMode ())
       {
         UnityWindow::get (cw)->leaveShowDesktop ();
         // the animation plugin does strange things here ...
@@ -917,17 +912,7 @@
 
     PluginAdapter::Default().OnLeaveDesktop();
 
-    if (w)
-    {
-      CompPoint const& viewport = w->defaultViewport();
-
-      if (viewport == uScreen->screen->vp())
-        screen->leaveShowDesktopMode (w);
-    }
-    else
-    {
-      screen->focusDefaultWindow();
-    }
+    screen->leaveShowDesktopMode (w);
   }
   else
   {
@@ -1008,8 +993,6 @@
   ShowdesktopHandler::InhibitLeaveShowdesktopMode (window->id ());
   window->activate ();
   ShowdesktopHandler::AllowLeaveShowdesktopMode (window->id ());
-
-  PluginAdapter::Default().OnLeaveDesktop();
 }
 
 void UnityWindow::DoEnableFocus ()
@@ -2831,8 +2814,6 @@
         window->unminimizeSetEnabled (this, false);
         window->minimizedSetEnabled (this, false);
       }
-
-      PluginAdapter::Default().UpdateShowDesktopState();
         break;
       case CompWindowNotifyBeforeDestroy:
         being_destroyed.emit();
@@ -3447,8 +3428,6 @@
   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-20 19:44:33 +0000
+++ unity-shared/PluginAdapter.cpp	2013-06-27 12:04:40 +0000
@@ -217,8 +217,6 @@
   }
   else if (g_strcmp0(event, "end_viewport_switch") == 0)
   {
-    UpdateShowDesktopState();
-
     _vp_switch_started = false;
     screen_viewport_switch_ended.emit();
   }
@@ -612,20 +610,6 @@
   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;
@@ -946,14 +930,6 @@
   _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-06-20 19:44:33 +0000
+++ unity-shared/PluginAdapter.h	2013-06-27 12:04:40 +0000
@@ -97,7 +97,6 @@
 
   void OnShowDesktop ();
   void OnLeaveDesktop ();
-  void UpdateShowDesktopState();
 
   void TerminateScale();
   bool IsScaleActive() const;
@@ -207,7 +206,6 @@
   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;