Merge lp:~azzar1/unity/lockscreen-grab-fixes into lp:unity

[Andrea Azzarone]

Wait for the grab before showing the lockscreen.

[Brandon Schaefer (brandontschaefer)]

LGTM! Nice!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3728
http://jenkins.qa.ubuntu.com/job/unity-ci/809/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/345
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/341
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/343

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

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

This has conflicts when merged into current trunk. Please resynch to trunk.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3729
http://jenkins.qa.ubuntu.com/job/unity-ci/813/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/349/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/345/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/347/console

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

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

Conflicts fixed.

[Stephen M. Webb (bregma)]

OK

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3730
http://jenkins.qa.ubuntu.com/job/unity-ci/814/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/350/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/346
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/348/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp	2014-03-10 16:43:51 +0000
+++ lockscreen/LockScreenController.cpp	2014-03-20 15:15:09 +0000
@@ -20,6 +20,8 @@
 #include "LockScreenController.h"
 
 #include <UnityCore/DBusIndicators.h>
+#include <NuxCore/Logger.h>
+
 #include "LockScreenShield.h"
 #include "LockScreenSettings.h"
 #include "unity-shared/AnimationUtils.h"
@@ -40,6 +42,8 @@
 const std::string DBUS_NAME = "com.canonical.Unity.Test.DisplayManager";
 }
 
+DECLARE_LOGGER(logger, "unity.locksreen");
+
 Controller::Controller(session::Manager::Ptr const& session_manager,
                        UpstartWrapper::Ptr const& upstart_wrapper,
                        ShieldFactoryInterface::Ptr const& shield_factory,
@@ -145,26 +149,39 @@
 void Controller::OnLockRequested()
 {
   if (IsLocked())
-    return;
-
-  auto lockscreen_type = Settings::Instance().lockscreen_type();
-
-  if (lockscreen_type == Type::NONE)
-  {
-    session_manager_->unlocked.emit();
-    return;
-  }
-
-  if (lockscreen_type == Type::LIGHTDM)
-  {
-    LockScreenUsingDisplayManager();
-  }
-  else if (lockscreen_type == Type::UNITY)
-  {
-    LockScreenUsingUnity();
-  }
-
-  session_manager_->locked.emit();
+  {
+    LOG_DEBUG(logger) << "Failed to lock screen: the screen is already locked.";
+    return;
+  }
+
+  lockscreen_timeout_.reset(new glib::Timeout(10, [this](){
+    if (WindowManager::Default().IsScreenGrabbed())
+    {
+      LOG_DEBUG(logger) << "Failed to lock the screen: the screen is already grabbed.";
+      return true; // keep trying
+    }
+
+    auto lockscreen_type = Settings::Instance().lockscreen_type();
+
+    if (lockscreen_type == Type::NONE)
+    {
+      session_manager_->unlocked.emit();
+      return false;
+    }
+
+    if (lockscreen_type == Type::LIGHTDM)
+    {
+      LockScreenUsingDisplayManager();
+    }
+    else if (lockscreen_type == Type::UNITY)
+    {
+      LockScreenUsingUnity();
+    }
+
+    session_manager_->locked.emit();
+
+    return false;
+  }));
 }
 
 void Controller::LockScreenUsingDisplayManager()
 
=== modified file 'lockscreen/LockScreenController.h'
--- lockscreen/LockScreenController.h	2014-03-07 19:17:35 +0000
+++ lockscreen/LockScreenController.h	2014-03-20 15:15:09 +0000
@@ -22,6 +22,7 @@
 
 #include <NuxCore/Animation.h>
 #include <UnityCore/ConnectionManager.h>
+#include <UnityCore/GLibSource.h>
 
 #include "LockScreenShieldFactory.h"
 #include "unity-shared/BackgroundEffectHelper.h"
@@ -68,6 +69,8 @@
   connection::Wrapper motion_connection_;
   bool test_mode_;
   BlurType old_blur_type_;
+
+  glib::Source::UniquePtr lockscreen_timeout_;
 };
 
 }
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-03-18 23:53:41 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-03-20 15:15:09 +0000
@@ -3736,6 +3736,10 @@
 
   launcher_controller_->ClearTooltips();
 
+  auto& adapter = PluginAdapter::Default();
+  if (adapter.IsScaleActive())
+    adapter.TerminateScale();
+
   RaiseOSK();
 }
 
 
=== modified file 'tests/test_lockscreen_controller.cpp'
--- tests/test_lockscreen_controller.cpp	2014-03-07 19:17:35 +0000
+++ tests/test_lockscreen_controller.cpp	2014-03-20 15:15:09 +0000
@@ -180,8 +180,8 @@
   lockscreen_settings.lockscreen_type = Type::LIGHTDM;
   session_manager->lock_requested.emit();
 
-  ASSERT_EQ(1, controller.shields_.size());
-  EXPECT_FALSE(controller.shields_.at(0)->primary());
+  Utils::WaitUntilMSec([this]{ return controller.shields_.size() == 1; });
+  Utils::WaitUntilMSec([this]{ return controller.shields_.at(0)->primary() == false; });
   Utils::WaitUntilMSec(lock_called);
 }
 
@@ -202,10 +202,10 @@
   uscreen.SetupFakeMultiMonitor(/*primary*/ 0, /*emit_change*/ true);
   session_manager->lock_requested.emit();
 
-  ASSERT_EQ(monitors::MAX, controller.shields_.size());
+  Utils::WaitUntilMSec([this]{ return controller.shields_.size() == monitors::MAX; });
 
   for (unsigned int i=0; i < monitors::MAX; ++i)
-    EXPECT_FALSE(controller.shields_.at(i)->primary());
+    Utils::WaitUntilMSec([this, i]{ return controller.shields_.at(i)->primary() == false; });
 
   Utils::WaitUntilMSec(lock_called);
 }
@@ -226,7 +226,7 @@
   lockscreen_settings.lockscreen_type = Type::LIGHTDM;
   session_manager->lock_requested.emit();
 
-  ASSERT_EQ(1, controller.shields_.size());
+  Utils::WaitUntilMSec([this]{ return controller.shields_.size() == 1; });
   Utils::WaitUntilMSec(lock_called);
 
   session_manager->unlock_requested.emit();
@@ -252,7 +252,7 @@
   uscreen.SetupFakeMultiMonitor(/*primary*/ 0, /*emit_change*/ true);
   session_manager->lock_requested.emit();
 
-  ASSERT_EQ(monitors::MAX, controller.shields_.size());
+  Utils::WaitUntilMSec([this]{ return controller.shields_.size() == monitors::MAX; });
   Utils::WaitUntilMSec(lock_called);
 
   session_manager->unlock_requested.emit();
@@ -265,8 +265,8 @@
 {
   session_manager->lock_requested.emit();
 
-  ASSERT_EQ(1, controller.shields_.size());
-  EXPECT_EQ(uscreen.GetMonitors().at(0), controller.shields_.at(0)->GetGeometry());
+  Utils::WaitUntilMSec([this]{ return controller.shields_.size() == 1; });
+  Utils::WaitUntilMSec([this]{ return uscreen.GetMonitors().at(0) == controller.shields_.at(0)->GetGeometry(); });
 }
 
 TEST_F(TestLockScreenController, LockScreenOnMultiMonitor)
@@ -274,28 +274,33 @@
   uscreen.SetupFakeMultiMonitor();
 
   session_manager->lock_requested.emit();
+
+  Utils::WaitUntilMSec([this]{ return controller.shields_.size() == monitors::MAX; });
   ASSERT_EQ(monitors::MAX, controller.shields_.size());
 
   for (unsigned int i=0; i < monitors::MAX; ++i)
+  {
+    Utils::WaitUntilMSec([this, i]{ return uscreen.GetMonitors().at(i) == controller.shields_.at(i)->GetGeometry(); });
     EXPECT_EQ(uscreen.GetMonitors().at(i), controller.shields_.at(i)->GetAbsoluteGeometry());
+  }
 }
 
 TEST_F(TestLockScreenController, SwitchToMultiMonitor)
 {
   session_manager->lock_requested.emit();
-  tick_source.tick(ANIMATION_DURATION);
 
+  Utils::WaitUntilMSec([this]{ return controller.shields_.size() == 1; });
   ASSERT_EQ(1, controller.shields_.size());
+
+  Utils::WaitUntilMSec([this]{ return uscreen.GetMonitors().at(0) == controller.shields_.at(0)->GetGeometry(); });
   EXPECT_EQ(uscreen.GetMonitors().at(0), controller.shields_.at(0)->GetGeometry());
 
   uscreen.SetupFakeMultiMonitor(/* primary */ 0, /* emit_change */ true);
-
   ASSERT_EQ(monitors::MAX, controller.shields_.size());
 
   for (unsigned int i=0; i < monitors::MAX; ++i)
   {
     ASSERT_EQ(uscreen.GetMonitors().at(i), controller.shields_.at(i)->GetAbsoluteGeometry());
-    ASSERT_TRUE(controller.shields_.at(i)->IsVisible());
   }
 }
 
@@ -304,10 +309,14 @@
   uscreen.SetupFakeMultiMonitor(/* primary */ 0, /* emit_change */ true);
   session_manager->lock_requested.emit();
 
+  Utils::WaitUntilMSec([this]{ return controller.shields_.size() == monitors::MAX; });
   ASSERT_EQ(monitors::MAX, controller.shields_.size());
 
   for (unsigned int i=0; i < monitors::MAX; ++i)
+  {
+    Utils::WaitUntilMSec([this, i]{ return uscreen.GetMonitors().at(i) == controller.shields_.at(i)->GetGeometry(); });
     ASSERT_EQ(uscreen.GetMonitors().at(i), controller.shields_.at(i)->GetAbsoluteGeometry());
+  }
 
   uscreen.Reset(/* emit_change */ true);
 
@@ -319,6 +328,7 @@
 {
   session_manager->lock_requested.emit();
 
+  Utils::WaitUntilMSec([this]{ return controller.shields_.size() == 1; });
   ASSERT_EQ(1, controller.shields_.size());
 
   session_manager->unlock_requested.emit();
@@ -332,6 +342,7 @@
   uscreen.SetupFakeMultiMonitor(/* primary */ 0, /* emit_change */ true);
   session_manager->lock_requested.emit();
 
+  Utils::WaitUntilMSec([this]{ return controller.shields_.size() == monitors::MAX; });
   ASSERT_EQ(monitors::MAX, controller.shields_.size());
 
   session_manager->unlock_requested.emit();