Merge lp:~azzar1/unity/fix-1401911 into lp:unity

[Andrea Azzarone]

Disable Pointer Barriers during lockscreen.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3894
http://jenkins.qa.ubuntu.com/job/unity-ci/1125/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/12/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/12/console

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

review: Needs Fixing (continuous-integration)

[Stephen M. Webb (bregma)]

OK

review: Approve

=== modified file 'launcher/EdgeBarrierController.cpp'
--- launcher/EdgeBarrierController.cpp	2014-02-27 05:30:25 +0000
+++ launcher/EdgeBarrierController.cpp	2014-12-12 22:37:30 +0000
@@ -91,8 +91,15 @@
     ResizeBarrierList(layout);
     SetupBarriers(layout);
   }));*/
+
   uscreen->changed.connect(sigc::mem_fun(this, &EdgeBarrierController::Impl::OnUScreenChanged));
 
+  parent_->force_disable.changed.connect([this] (bool) {
+    auto monitors = UScreen::GetDefault()->GetMonitors();
+    ResizeBarrierList(monitors);
+    SetupBarriers(monitors);
+  });
+
   parent_->sticky_edges.SetGetterFunction([this] {
     return parent_->options() ? parent_->options()->edge_resist() : false;
   });
@@ -158,6 +165,13 @@
 
 void EdgeBarrierController::Impl::ResizeBarrierList(std::vector<nux::Geometry> const& layout)
 {
+  if (parent_->force_disable)
+  {
+    vertical_barriers_.clear();
+    horizontal_barriers_.clear();
+    return;
+  }
+
   auto num_monitors = layout.size();
 
   if (vertical_barriers_.size() > num_monitors)
@@ -197,6 +211,9 @@
 
 void EdgeBarrierController::Impl::SetupBarriers(std::vector<nux::Geometry> const& layout)
 {
+  if (parent_->force_disable())
+    return;
+
   bool edge_resist = parent_->sticky_edges();
 
   for (unsigned i = 0; i < layout.size(); i++)
@@ -437,7 +454,8 @@
 }
 
 EdgeBarrierController::EdgeBarrierController()
-  : pimpl(new Impl(this))
+  : force_disable(false)
+  , pimpl(new Impl(this))
 {}
 
 EdgeBarrierController::~EdgeBarrierController()

=== modified file 'launcher/EdgeBarrierController.h'
--- launcher/EdgeBarrierController.h	2013-11-06 11:21:43 +0000
+++ launcher/EdgeBarrierController.h	2014-12-12 22:37:30 +0000
@@ -49,6 +49,7 @@
   ~EdgeBarrierController();
 
   nux::RWProperty<bool> sticky_edges;
+  nux::Property<bool> force_disable;
   nux::Property<launcher::Options::Ptr> options;
 
   void AddHorizontalSubscriber(EdgeBarrierSubscriber* subscriber, unsigned int monitor);

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-11-28 12:55:36 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-12-12 22:37:30 +0000
@@ -47,7 +47,6 @@
 #include "unityshell.h"
 #include "BackgroundEffectHelper.h"
 #include "UnityGestureBroker.h"
-#include "launcher/EdgeBarrierController.h"
 #include "launcher/XdndCollectionWindowImp.h"
 #include "launcher/XdndManagerImp.h"
 #include "launcher/XdndStartStopNotifierImp.h"
@@ -3822,6 +3821,9 @@
 
   showLauncherKeyTerminate(&optionGetShowLauncher(), CompAction::StateTermKey, options);
   showMenuBarTerminate(&optionGetShowMenuBar(), CompAction::StateTermKey, options);
+
+  // We disable the edge barriers, to avoid blocking the mouse pointer during lockscreen
+  edge_barriers_->force_disable = true;
 }
 
 void UnityScreen::OnScreenUnlocked()
@@ -3836,6 +3838,8 @@
 
   for (auto& action : getActions())
     screen->addAction(&action);
+
+  edge_barriers_->force_disable = false;
 }
 
 void UnityScreen::SaveLockStamp(bool save)
@@ -3888,9 +3892,9 @@
   auto xdnd_collection_window = std::make_shared<XdndCollectionWindowImp>();
   auto xdnd_start_stop_notifier = std::make_shared<XdndStartStopNotifierImp>();
   auto xdnd_manager = std::make_shared<XdndManagerImp>(xdnd_start_stop_notifier, xdnd_collection_window);
-  auto edge_barriers = std::make_shared<ui::EdgeBarrierController>();
+  edge_barriers_ = std::make_shared<ui::EdgeBarrierController>();
 
-  launcher_controller_ = std::make_shared<launcher::Controller>(xdnd_manager, edge_barriers);
+  launcher_controller_ = std::make_shared<launcher::Controller>(xdnd_manager, edge_barriers_);
   AddChild(launcher_controller_.get());
 
   switcher_controller_ = std::make_shared<switcher::Controller>();
@@ -3901,7 +3905,7 @@
 
   /* Setup panel */
   timer.Reset();
-  panel_controller_ = std::make_shared<panel::Controller>(menus_, edge_barriers);
+  panel_controller_ = std::make_shared<panel::Controller>(menus_, edge_barriers_);
   AddChild(panel_controller_.get());
   LOG_INFO(logger) << "initLauncher-Panel " << timer.ElapsedSeconds() << "s";
 

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2014-10-07 10:05:01 +0000
+++ plugins/unityshell/src/unityshell.h	2014-12-12 22:37:30 +0000
@@ -54,8 +54,8 @@
 #include "DashController.h"
 #include "UnitySettings.h"
 #include "DashStyle.h"
+#include "EdgeBarrierController.h"
 #include "FavoriteStoreGSettings.h"
-#include "FontSettings.h"
 #include "ShortcutController.h"
 #include "LauncherController.h"
 #include "LockScreenController.h"
@@ -326,7 +326,6 @@
   Settings unity_settings_;
   dash::Style    dash_style_;
   panel::Style   panel_style_;
-  FontSettings   font_settings_;
   internal::FavoriteStoreGSettings favorite_store_;
   ThumbnailGenerator thumbnail_generator_;
   lockscreen::Settings lockscreen_settings_;
@@ -349,6 +348,7 @@
   session::Controller::Ptr  session_controller_;
   lockscreen::DBusManager::Ptr screensaver_dbus_manager_;
   lockscreen::Controller::Ptr lockscreen_controller_;
+  ui::EdgeBarrierController::Ptr edge_barriers_;
   debug::DebugDBusInterface debugger_;
   std::unique_ptr<BGHash>   bghash_;
   spread::Filter::Ptr       spread_filter_;

=== modified file 'tests/test_edge_barrier_controller.cpp'
--- tests/test_edge_barrier_controller.cpp	2013-11-06 11:21:43 +0000
+++ tests/test_edge_barrier_controller.cpp	2014-12-12 22:37:30 +0000
@@ -653,4 +653,19 @@
   ProcessBarrierEvent(&owner, firstEvent);
 }
 
+TEST_F(TestEdgeBarrierController, ForceDisable)
+{
+  ASSERT_FALSE(bc.force_disable);
+
+  bc.force_disable = true;
+
+  ASSERT_TRUE(GetPrivateImpl()->vertical_barriers_.empty());
+  ASSERT_TRUE(GetPrivateImpl()->horizontal_barriers_.empty());
+
+  bc.force_disable = false;
+
+  ASSERT_FALSE(GetPrivateImpl()->vertical_barriers_.empty());
+  ASSERT_FALSE(GetPrivateImpl()->horizontal_barriers_.empty());
+}
+
 }