Merge lp:~3v1n0/unity/shield-notify-grabs into lp:unity

[Marco Trevisan (Treviño)]

LockScreenController: wait the primary shield to get the grab before setting the session locked

If that fails (and if the grab has never been gained during this locking session),
it's up to the Controller to decide whether the lock request has to be ignored.
So, if the primary shield fails to grab, before that the screen has ever been locked,
then we have to give up. Otherwise if it fails (but we were already locked), it's safe
to assume that this failure is due to the menus that are currently controlling the grab.

Also setup the primary shield signal connections in a shared place and use a
connection::Manager to keep track of them.

Correctly handle the resolution changes when a menu is open in lockscreen

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3880
http://jenkins.qa.ubuntu.com/job/unity-ci/1085/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/172/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/172/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/172/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3881
http://jenkins.qa.ubuntu.com/job/unity-ci/1086/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/173/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/173/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/173/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3882
http://jenkins.qa.ubuntu.com/job/unity-ci/1087/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/174

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

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

=== modified file 'UnityCore/DBusIndicators.cpp'
--- UnityCore/DBusIndicators.cpp	2014-03-05 17:19:50 +0000
+++ UnityCore/DBusIndicators.cpp	2014-09-20 02:04:20 +0000
@@ -55,6 +55,7 @@
   void Sync(GVariant* args, glib::Error const&);
   void SyncGeometries(std::string const& name, EntryLocationMap const& locations);
   void ShowEntriesDropdown(Indicator::Entries const&, Entry::Ptr const&, unsigned xid, int x, int y);
+  void CloseActiveEntry();
 
   void OnConnected();
   void OnDisconnected();
@@ -313,6 +314,11 @@
   gproxy_.Call("ScrollEntry", g_variant_new("(si)", entry_id.c_str(), delta));
 }
 
+void DBusIndicators::Impl::CloseActiveEntry()
+{
+  gproxy_.Call("CloseActiveEntry");
+}
+
 void DBusIndicators::Impl::Sync(GVariant* args, glib::Error const& error)
 {
   if (!args || error)
@@ -489,6 +495,11 @@
   pimpl->ShowEntriesDropdown(entries, selected, xid, x, y);
 }
 
+void DBusIndicators::CloseActiveEntry()
+{
+  pimpl->CloseActiveEntry();
+}
+
 void DBusIndicators::OnEntryScroll(std::string const& entry_id, int delta)
 {
   pimpl->OnEntryScroll(entry_id, delta);
 
=== modified file 'UnityCore/DBusIndicators.h'
--- UnityCore/DBusIndicators.h	2014-03-04 13:14:12 +0000
+++ UnityCore/DBusIndicators.h	2014-09-20 02:04:20 +0000
@@ -40,6 +40,7 @@
   std::vector<std::string> const& IconPaths() const;
   void ShowEntriesDropdown(Indicator::Entries const&, Entry::Ptr const&, unsigned xid, int x, int y);
   void SyncGeometries(std::string const& name, EntryLocationMap const& locations);
+  void CloseActiveEntry();
 
 protected:
   virtual void OnEntryScroll(std::string const& entry_id, int delta);
 
=== modified file 'UnityCore/Indicators.h'
--- UnityCore/Indicators.h	2014-02-28 05:16:10 +0000
+++ UnityCore/Indicators.h	2014-09-20 02:04:20 +0000
@@ -44,6 +44,7 @@
 
   virtual void SyncGeometries(std::string const& panel, EntryLocationMap const&) = 0;
   virtual void ShowEntriesDropdown(Indicator::Entries const&, Entry::Ptr const&, unsigned xid, int x, int y) = 0;
+  virtual void CloseActiveEntry() = 0;
 
   // Signals
   sigc::signal<void, Indicator::Ptr const&> on_object_added;
 
=== modified file 'lockscreen/LockScreenAbstractShield.h'
--- lockscreen/LockScreenAbstractShield.h	2014-07-24 18:51:56 +0000
+++ lockscreen/LockScreenAbstractShield.h	2014-09-20 02:04:20 +0000
@@ -57,9 +57,12 @@
   nux::Property<double> scale;
 
   using MockableBaseWindow::RemoveLayout;
+  virtual bool HasGrab() const = 0;
   virtual bool IsIndicatorOpen() const = 0;
   virtual void ActivatePanel() = 0;
 
+  sigc::signal<void> grabbed;
+  sigc::signal<void> grab_failed;
   sigc::signal<void, int, int> grab_motion;
   sigc::signal<void, unsigned long, unsigned long> grab_key;
 
 
=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp	2014-08-27 22:12:56 +0000
+++ lockscreen/LockScreenController.cpp	2014-09-20 02:04:20 +0000
@@ -100,8 +100,7 @@
   fade_animator_.finished.connect([this] {
     if (animation::GetDirection(fade_animator_) == animation::Direction::BACKWARD)
     {
-      motion_connection_->disconnect();
-      key_connection_->disconnect();
+      primary_shield_connections_.Clear();
       uscreen_connection_->block();
       hidden_window_connection_->block();
       session_manager_->is_locked = false;
@@ -173,10 +172,7 @@
       primary_shield_ = shield;
       shield->primary = true;
       nux::GetWindowCompositor().SetAlwaysOnFrontWindow(primary_shield_.GetPointer());
-      auto move_cb = sigc::mem_fun(this, &Controller::OnPrimaryShieldMotion);
-      motion_connection_ = shield->grab_motion.connect(move_cb);
-      auto key_cb = sigc::hide(sigc::hide(sigc::mem_fun(this, &Controller::ResetPostLockScreenSaver)));
-      key_connection_ = shield->grab_key.connect(key_cb);
+      SetupPrimaryShieldConnections();
       break;
     }
   }
@@ -184,6 +180,35 @@
   ResetPostLockScreenSaver();
 }
 
+void Controller::SetupPrimaryShieldConnections()
+{
+  if (!primary_shield_.IsValid())
+    return;
+
+  primary_shield_connections_.Clear();
+
+  auto move_cb = sigc::mem_fun(this, &Controller::OnPrimaryShieldMotion);
+  primary_shield_connections_.Add(primary_shield_->grab_motion.connect(move_cb));
+
+  auto key_cb = sigc::hide(sigc::hide(sigc::mem_fun(this, &Controller::ResetPostLockScreenSaver)));
+  primary_shield_connections_.Add(primary_shield_->grab_key.connect(key_cb));
+
+  if (!session_manager_->is_locked())
+  {
+    primary_shield_connections_.Add(primary_shield_->grabbed.connect([this] {
+      session_manager_->is_locked = true;
+    }));
+
+    primary_shield_connections_.Add(primary_shield_->grab_failed.connect([this] {
+      if (!session_manager_->is_locked())
+      {
+        LOG_ERROR(logger) << "Impossible to get the grab to lock the screen";
+        session_manager_->unlock_requested.emit();
+      }
+    }));
+  }
+}
+
 void Controller::EnsureShields(std::vector<nux::Geometry> const& monitors)
 {
   int num_monitors = monitors.size();
@@ -233,10 +258,7 @@
 
   primary_shield_ = shields_[primary];
   primary_shield_->primary = true;
-  auto move_cb = sigc::mem_fun(this, &Controller::OnPrimaryShieldMotion);
-  motion_connection_ = primary_shield_->grab_motion.connect(move_cb);
-  auto key_cb = sigc::hide(sigc::hide(sigc::mem_fun(this, &Controller::ResetPostLockScreenSaver)));
-  key_connection_ = primary_shield_->grab_key.connect(key_cb);
+  SetupPrimaryShieldConnections();
 }
 
 void Controller::EnsureBlankWindow()
@@ -358,7 +380,6 @@
       HideBlankWindow();
 
     LockScreen();
-    session_manager_->is_locked = true;
 
     if (prompt_activation_)
     {
@@ -444,6 +465,7 @@
     shield->PushToFront();
   });
 
+  session_manager_->is_locked = primary_shield_->HasGrab();
   nux::GetWindowCompositor().SetAlwaysOnFrontWindow(primary_shield_.GetPointer());
   animation::StartOrReverse(fade_animator_, animation::Direction::FORWARD);
 }
 
=== modified file 'lockscreen/LockScreenController.h'
--- lockscreen/LockScreenController.h	2014-08-25 20:46:31 +0000
+++ lockscreen/LockScreenController.h	2014-09-20 02:04:20 +0000
@@ -66,6 +66,7 @@
   void BlankWindowGrabEnable(bool grab);
   void SimulateActivity();
   void ResetPostLockScreenSaver();
+  void SetupPrimaryShieldConnections();
   void ActivatePanel();
 
   void OnLockRequested(bool prompt);
@@ -96,8 +97,7 @@
   connection::Wrapper uscreen_connection_;
   connection::Wrapper suspend_connection_;
   connection::Wrapper hidden_window_connection_;
-  connection::Wrapper motion_connection_;
-  connection::Wrapper key_connection_;
+  connection::Manager primary_shield_connections_;
 
   glib::Source::UniquePtr lockscreen_timeout_;
   glib::Source::UniquePtr lockscreen_delay_timeout_;
 
=== modified file 'lockscreen/LockScreenPanel.cpp'
--- lockscreen/LockScreenPanel.cpp	2014-07-22 01:05:07 +0000
+++ lockscreen/LockScreenPanel.cpp	2014-09-20 02:04:20 +0000
@@ -110,12 +110,39 @@
     return;
 
   indicators_view_->AddIndicator(indicator);
+
+  if (!active)
+  {
+    for (auto const& entry : indicator->GetEntries())
+    {
+      if (entry->active())
+      {
+        active = true;
+        indicators_view_->ActivateEntry(entry->id());
+        OnEntryActivated(GetPanelName(), entry->id(), entry->geometry());
+        break;
+      }
+    }
+  }
+
   QueueRelayout();
   QueueDraw();
 }
 
 void Panel::RemoveIndicator(indicator::Indicator::Ptr const& indicator)
 {
+  if (active)
+  {
+    for (auto const& entry : indicator->GetEntries())
+    {
+      if (entry->active())
+      {
+        active = false;
+        break;
+      }
+    }
+  }
+
   indicators_view_->RemoveIndicator(indicator);
   QueueRelayout();
   QueueDraw();
@@ -123,7 +150,7 @@
 
 std::string Panel::GetPanelName() const
 {
-  return "LockScreenPanel" + std::to_string(monitor);
+  return "LockScreenPanel";
 }
 
 void Panel::OnIndicatorViewUpdated()
 
=== modified file 'lockscreen/LockScreenShield.cpp'
--- lockscreen/LockScreenShield.cpp	2014-08-27 22:12:56 +0000
+++ lockscreen/LockScreenShield.cpp	2014-09-20 02:04:20 +0000
@@ -19,7 +19,6 @@
 
 #include "LockScreenShield.h"
 
-#include <NuxCore/Logger.h>
 #include <Nux/VLayout.h>
 #include <Nux/HLayout.h>
 #include <Nux/PaintLayer.h>
@@ -39,8 +38,7 @@
 {
 namespace
 {
-DECLARE_LOGGER(logger, "unity.lockscreen.shield");
-const unsigned MAX_GRAB_WAIT = 50;
+const unsigned MAX_GRAB_WAIT = 100;
 }
 
 Shield::Shield(session::Manager::Ptr const& session_manager,
@@ -123,6 +121,7 @@
   {
     regrab_conn_->disconnect();
     regrab_timeout_.reset();
+    grabbed.emit();
   }
   else
   {
@@ -132,14 +131,19 @@
     if (cancel_on_failure)
     {
       regrab_timeout_.reset(new glib::Timeout(MAX_GRAB_WAIT, [this] {
-        LOG_ERROR(logger) << "Impossible to get the grab to lock the screen";
-        session_manager_->unlock_requested.emit();
+        grab_failed.emit();
         return false;
       }));
     }
   }
 }
 
+bool Shield::HasGrab() const
+{
+  auto& wc = nux::GetWindowCompositor();
+  return (wc.GetPointerGrabArea() == this && wc.GetKeyboardGrabArea() == this);
+}
+
 void Shield::ShowPrimaryView()
 {
   if (primary_layout_)
 
=== modified file 'lockscreen/LockScreenShield.h'
--- lockscreen/LockScreenShield.h	2014-08-27 22:12:56 +0000
+++ lockscreen/LockScreenShield.h	2014-09-20 02:04:20 +0000
@@ -44,6 +44,7 @@
          nux::ObjectPtr<UserPromptView> const&,
          int monitor, bool is_primary);
 
+  bool HasGrab() const override;
   bool IsIndicatorOpen() const override;
   void ActivatePanel() override;
 
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-09-04 22:12:01 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-09-20 02:04:20 +0000
@@ -3784,6 +3784,7 @@
   if (hud_controller_->IsVisible())
     hud_controller_->HideHud();
 
+  menus_->Indicators()->CloseActiveEntry();
   launcher_controller_->ClearTooltips();
 
   if (launcher_controller_->KeyNavIsActive())
 
=== modified file 'services/panel-main.c'
--- services/panel-main.c	2014-03-05 17:19:50 +0000
+++ services/panel-main.c	2014-09-20 02:04:20 +0000
@@ -82,6 +82,9 @@
   "      <arg type='i' name='delta' direction='in'/>"
   "    </method>"
   ""
+  ""
+  "    <method name='CloseActiveEntry' />"
+  ""
   "    <signal name='EntryActivated'>"
   "     <arg type='s' name='panel_id' />"
   "     <arg type='s' name='entry_id' />"
@@ -254,6 +257,11 @@
       g_dbus_method_invocation_return_value (invocation, NULL);
       g_free(entry_id);
     }
+  else if (g_strcmp0 (method_name, "CloseActiveEntry") == 0)
+    {
+      panel_service_close_active_entry (service);
+      g_dbus_method_invocation_return_value (invocation, NULL);
+    }
 }
 
 static void
 
=== modified file 'services/panel-service.c'
--- services/panel-service.c	2014-08-11 12:29:07 +0000
+++ services/panel-service.c	2014-09-20 02:04:20 +0000
@@ -2421,6 +2421,8 @@
   IndicatorObject      *object;
   IndicatorObjectEntry *entry;
 
+  g_return_if_fail (PANEL_IS_SERVICE (self));
+
   entry = get_indicator_entry_by_id (self, entry_id);
   g_return_if_fail (entry);
 
@@ -2437,6 +2439,8 @@
   IndicatorObject      *object;
   IndicatorObjectEntry *entry;
 
+  g_return_if_fail (PANEL_IS_SERVICE (self));
+
   entry = get_indicator_entry_by_id (self, entry_id);
   g_return_if_fail (entry);
 
@@ -2465,3 +2469,14 @@
                             entry, 1, direction);
     }
 }
+
+void
+panel_service_close_active_entry (PanelService *self)
+{
+  g_return_if_fail (PANEL_IS_SERVICE (self));
+
+  if (GTK_IS_MENU (self->priv->last_menu))
+    {
+      gtk_menu_popdown (GTK_MENU (self->priv->last_menu));
+    }
+}
 
=== modified file 'services/panel-service.h'
--- services/panel-service.h	2014-02-06 12:02:48 +0000
+++ services/panel-service.h	2014-09-20 02:04:20 +0000
@@ -122,6 +122,8 @@
                                                 const gchar  *entry_id,
                                                 gint32       delta);
 
+void              panel_service_close_active_entry (PanelService *self);
+
 G_END_DECLS
 
 #endif /* _PANEL_SERVICE_H_ */
 
=== modified file 'tests/mock_indicators.h'
--- tests/mock_indicators.h	2014-02-28 05:16:10 +0000
+++ tests/mock_indicators.h	2014-09-20 02:04:20 +0000
@@ -36,6 +36,7 @@
   // Implementing Indicators virtual functions
   MOCK_METHOD2(SyncGeometries, void(std::string const&, EntryLocationMap const&));
   MOCK_METHOD5(ShowEntriesDropdown, void(Indicator::Entries const&, Entry::Ptr const&, unsigned xid, int x, int y));
+  MOCK_METHOD0(CloseActiveEntry, void());
   MOCK_CONST_METHOD0(IconPaths, std::vector<std::string> const&());
   MOCK_METHOD2(OnEntryScroll, void(std::string const&, int delta));
   MOCK_METHOD5(OnEntryShowMenu, void(std::string const&, unsigned xid, int x, int y, unsigned button));
 
=== modified file 'tests/test_lockscreen_controller.cpp'
--- tests/test_lockscreen_controller.cpp	2014-07-11 17:45:39 +0000
+++ tests/test_lockscreen_controller.cpp	2014-09-20 02:04:20 +0000
@@ -59,6 +59,7 @@
 
   MOCK_CONST_METHOD0(IsIndicatorOpen, bool());
   MOCK_METHOD0(ActivatePanel, void());
+  MOCK_CONST_METHOD0(HasGrab, bool());
 };
 
 struct ShieldFactoryMock : ShieldFactoryInterface