Merge lp:~3v1n0/unity/input-monitor-lockscreen-controller into lp:unity

[Marco Trevisan (Treviño)]

LockScreenController: use input monitor to get the events to switch monitor

In this way we can safely switch the monitor also on button click (after closing a menu)
or when moving over the panel (that wasn't properly handled before).

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'lockscreen/KylinLockScreenShield.cpp'
--- lockscreen/KylinLockScreenShield.cpp	2016-08-30 17:46:37 +0000
+++ lockscreen/KylinLockScreenShield.cpp	2016-08-30 17:46:38 +0000
@@ -77,23 +77,5 @@
   main_layout->AddSpace(0, 10);
 }
 
-nux::Area* KylinShield::FindKeyFocusArea(unsigned etype, unsigned long keysym, unsigned long modifiers)
-{
-  if (primary)
-  {
-    grab_key.emit(modifiers, keysym);
-
-    if (prompt_view_)
-    {
-      auto* focus_view = prompt_view_->focus_view();
-
-      if (focus_view && focus_view->GetInputEventSensitivity())
-        return focus_view;
-    }
-  }
-
-  return nullptr;
-}
-
 }
 }
 
=== modified file 'lockscreen/KylinLockScreenShield.h'
--- lockscreen/KylinLockScreenShield.h	2015-12-07 03:09:28 +0000
+++ lockscreen/KylinLockScreenShield.h	2016-08-30 17:46:38 +0000
@@ -41,9 +41,6 @@
          nux::ObjectPtr<AbstractUserPromptView> const&,
          int monitor, bool is_primary);
 
-protected:
-  nux::Area* FindKeyFocusArea(unsigned int, unsigned long, unsigned long) override;
-
 private:
   void ShowPrimaryView() override;
 };
 
=== modified file 'lockscreen/LockScreenBaseShield.cpp'
--- lockscreen/LockScreenBaseShield.cpp	2016-08-30 17:46:37 +0000
+++ lockscreen/LockScreenBaseShield.cpp	2016-08-30 17:46:38 +0000
@@ -81,11 +81,6 @@
     background_layer_.reset();
     UpdateBackgroundTexture();
   });
-
-  mouse_move.connect([this] (int x, int y, int, int, unsigned long, unsigned long) {
-    auto const& abs_geo = GetAbsoluteGeometry();
-    grab_motion.emit(abs_geo.x + x, abs_geo.y + y);
-  });
 }
 
 bool BaseShield::HasGrab() const
@@ -94,6 +89,19 @@
   return (wc.GetPointerGrabArea() == this && wc.GetKeyboardGrabArea() == this);
 }
 
+nux::Area* BaseShield::FindKeyFocusArea(unsigned etype, unsigned long keysym, unsigned long modifiers)
+{
+  if (primary && prompt_view_)
+  {
+    auto* focus_view = prompt_view_->focus_view();
+
+    if (focus_view && focus_view->GetInputEventSensitivity())
+      return focus_view;
+  }
+
+  return nullptr;
+}
+
 nux::Area* BaseShield::FindAreaUnderMouse(nux::Point const& mouse, nux::NuxEventType event_type)
 {
   nux::Area* area = BaseWindow::FindAreaUnderMouse(mouse, event_type);
 
=== modified file 'lockscreen/LockScreenBaseShield.h'
--- lockscreen/LockScreenBaseShield.h	2016-08-30 17:46:37 +0000
+++ lockscreen/LockScreenBaseShield.h	2016-08-30 17:46:38 +0000
@@ -54,14 +54,13 @@
 
   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;
 
 protected:
   virtual bool AcceptKeyNavFocus() { return false; }
   virtual void ShowPrimaryView() = 0;
   virtual void ShowSecondaryView();
 
+  nux::Area* FindKeyFocusArea(unsigned int, unsigned long, unsigned long) override;
   nux::Area* FindAreaUnderMouse(nux::Point const& mouse, nux::NuxEventType event_type) override;
 
   void GrabScreen(bool cancel_on_failure);
 
=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp	2016-08-30 17:46:37 +0000
+++ lockscreen/LockScreenController.cpp	2016-08-30 17:46:38 +0000
@@ -120,6 +120,8 @@
 
     if (animation::GetDirection(fade_animator_) == animation::Direction::BACKWARD)
     {
+      auto events_cb = sigc::track_obj(sigc::mem_fun(this, &Controller::OnLockScreenInputEvent), *primary_shield_);
+      input::Monitor::Get().UnregisterClient(events_cb);
       primary_shield_connections_.Clear();
       uscreen_connection_->block();
       hidden_window_connection_->block();
@@ -199,6 +201,20 @@
       break;
     }
   }
+}
+
+void Controller::OnLockScreenInputEvent(XEvent const& event)
+{
+  switch (event.type)
+  {
+    case MotionNotify:
+    case ButtonPress:
+      if (primary_shield_->IsIndicatorOpen())
+        break;
+    case ButtonRelease:
+      OnPrimaryShieldMotion(event.xmotion.x_root, event.xmotion.y_root);
+      break;
+  }
 
   ResetPostLockScreenSaver();
 }
@@ -210,11 +226,8 @@
 
   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));
+  auto events_cb = sigc::track_obj(sigc::mem_fun(this, &Controller::OnLockScreenInputEvent), *primary_shield_);
+  input::Monitor::Get().RegisterClient(input::Events::INPUT, events_cb);
 
   if (!session_manager_->is_locked())
   {
 
=== modified file 'lockscreen/LockScreenController.h'
--- lockscreen/LockScreenController.h	2016-08-30 17:46:37 +0000
+++ lockscreen/LockScreenController.h	2016-08-30 17:46:38 +0000
@@ -78,6 +78,7 @@
   void OnPresenceStatusChanged(bool idle);
   void OnScreenSaverActivationRequest(bool activate);
   void OnPrimaryShieldMotion(int x, int y);
+  void OnLockScreenInputEvent(XEvent const&);
   void OnBlankWindowInputEvent(XEvent const&);
 
   std::vector<nux::ObjectPtr<BaseShield>> shields_;
 
=== modified file 'lockscreen/LockScreenShield.cpp'
--- lockscreen/LockScreenShield.cpp	2016-08-30 17:46:37 +0000
+++ lockscreen/LockScreenShield.cpp	2016-08-30 17:46:38 +0000
@@ -119,8 +119,6 @@
 {
   if (primary)
   {
-    grab_key.emit(modifiers, keysym);
-
     if (accelerators_)
     {
       if (etype == nux::EVENT_KEY_DOWN)
@@ -134,17 +132,9 @@
           return panel_view_;
       }
     }
-
-    if (prompt_view_)
-    {
-      auto* focus_view = prompt_view_->focus_view();
-
-      if (focus_view && focus_view->GetInputEventSensitivity())
-        return focus_view;
-    }
   }
 
-  return nullptr;
+  return BaseShield::FindKeyFocusArea(etype, keysym, modifiers);
 }
 
 bool Shield::IsIndicatorOpen() const