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

[Marco Trevisan (Treviño)]

PanelView: use InputMonitor to track menu events

In order to get menus properly working with this branch, this one is also needed:
https://code.launchpad.net/~3v1n0/unity/panel-service-menus-deactivation-discard/+merge/303549

[Andrea Azzarone (azzar1)]

Thanks

review: Approve

=== modified file 'panel/PanelView.cpp'
--- panel/PanelView.cpp	2016-08-12 13:57:19 +0000
+++ panel/PanelView.cpp	2016-08-22 13:06:46 +0000
@@ -23,6 +23,7 @@
 
 #include <UnityCore/GLibWrapper.h>
 
+#include "unity-shared/InputMonitor.h"
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/RawPixel.h"
 #include "unity-shared/TextureCache.h"
@@ -42,6 +43,7 @@
 namespace
 {
 const RawPixel TRIANGLE_THRESHOLD = 5_em;
+const double SCRUB_VELOCITY_THRESHOLD = 0.05;
 const int refine_gradient_midpoint = 959;
 }
 
@@ -52,6 +54,7 @@
   : View(NUX_FILE_LINE_PARAM)
   , parent_(parent)
   , remote_(menus->Indicators())
+  , last_pointer_time_(0)
   , is_dirty_(true)
   , opacity_maximized_toggle_(false)
   , needs_geo_sync_(false)
@@ -648,7 +651,9 @@
   }
 }
 
-static bool PointInTriangle(nux::Point const& p, nux::Point const& t0, nux::Point const& t1, nux::Point const& t2)
+namespace
+{
+bool PointInTriangle(nux::Point const& p, nux::Point const& t0, nux::Point const& t1, nux::Point const& t2)
 {
   int s = t0.y * t2.x - t0.x * t2.y + (t2.y - t0.y) * p.x + (t0.x - t2.x) * p.y;
   int t = t0.x * t1.y - t0.y * t1.x + (t0.y - t1.y) * p.x + (t1.x - t0.x) * p.y;
@@ -667,47 +672,43 @@
   return s > 0 && t > 0 && (s + t) < A;
 }
 
-static double GetMouseVelocity(nux::Point const& p0, nux::Point const& p1, util::Timer &timer)
+double GetMouseVelocity(nux::Point const& p0, nux::Point const& p1, Time time_delta)
 {
   int dx, dy;
   double speed;
-  auto millis = timer.ElapsedMicroSeconds();
 
-  if (millis == 0)
+  if (time_delta == 0)
     return 1;
 
   dx = p0.x - p1.x;
   dy = p0.y - p1.y;
 
-  speed = sqrt(dx * dx + dy * dy) / millis * 1000;
+  speed = sqrt(dx * dx + dy * dy) / time_delta;
 
   return speed;
 }
+} // anonymous namespace
 
-bool PanelView::TrackMenuPointer()
+void PanelView::OnActiveEntryEvent(XEvent const& e)
 {
-  nux::Point const& mouse = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
-  double speed = GetMouseVelocity(mouse, tracked_pointer_pos_, mouse_tracker_timer_);
-
-  mouse_tracker_timer_.Reset();
+  if (e.type != MotionNotify)
+    return;
+
+  double scale = Settings::Instance().em(monitor_)->DPIScale();
+  nux::Point mouse(e.xmotion.x_root, e.xmotion.y_root);
+  double speed = GetMouseVelocity(mouse, tracked_pointer_pos_, e.xmotion.time - last_pointer_time_);
+
   tracked_pointer_pos_ = mouse;
-
-  double scale = Settings::Instance().em(monitor_)->DPIScale();
-  if (speed > 0 && PointInTriangle(mouse,
-                                   nux::Point(triangle_top_corner_.x, std::max(triangle_top_corner_.y - TRIANGLE_THRESHOLD.CP(scale), 0)),
-                                   nux::Point(menu_geo_.x, menu_geo_.y),
-                                   nux::Point(menu_geo_.x + menu_geo_.width, menu_geo_.y)))
-  {
-    return true;
-  }
-
-  if (mouse != triangle_top_corner_)
-  {
-    triangle_top_corner_ = mouse;
-    OnMenuPointerMoved(mouse.x, mouse.y);
-  }
-
-  return true;
+  last_pointer_time_ = e.xmotion.time;
+
+  if (speed > SCRUB_VELOCITY_THRESHOLD &&
+      PointInTriangle(mouse, {mouse.x, std::max(mouse.y - TRIANGLE_THRESHOLD.CP(scale), 0)},
+                      menu_geo_.GetPosition(), {menu_geo_.x + menu_geo_.width, menu_geo_.y}))
+  {
+    return;
+  }
+
+  OnMenuPointerMoved(mouse.x, mouse.y);
 }
 
 void PanelView::OnEntryActivated(std::string const& panel, std::string const& entry_id, nux::Rect const& menu_geo)
@@ -715,41 +716,33 @@
   if (!panel.empty() && panel != GetPanelName())
     return;
 
+  bool active = !entry_id.empty();
+  auto const& activation_cb = sigc::mem_fun(this, &PanelView::OnActiveEntryEvent);
   menu_geo_ = menu_geo;
 
-  bool active = !entry_id.empty();
-  if (active && !track_menu_pointer_timeout_)
+  if (active)
   {
-    //
-    // Track menus being scrubbed at 60Hz (about every 16 millisec)
-    // It might sound ugly, but it's far nicer (and more responsive) than the
-    // code it replaces which used to capture motion events in another process
-    // (unity-panel-service) and send them to us over dbus.
-    // NOTE: The reason why we have to use a timer instead of tracking motion
-    // events is because the motion events will never be delivered to this
-    // process. All the motion events will go to unity-panel-service while
-    // scrubbing because the active panel menu has (needs) the pointer grab.
-    //
-    mouse_tracker_timer_.Reset();
-    triangle_top_corner_ = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
-    track_menu_pointer_timeout_.reset(new glib::Timeout(16));
-    track_menu_pointer_timeout_->Run(sigc::mem_fun(this, &PanelView::TrackMenuPointer));
+    auto& im = input::Monitor::Get();
+    if (im.RegisterClient(input::Events::POINTER, activation_cb))
+    {
+      last_pointer_time_ = 0;
+      ActivateEntry(entry_id);
+    }
+
+    if (overlay_is_open_)
+      ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
   }
-  else if (!active)
+  else
   {
-    track_menu_pointer_timeout_.reset();
+    input::Monitor::Get().UnregisterClient(activation_cb);
     menu_view_->NotifyAllMenusClosed();
-    tracked_pointer_pos_ = {-1, -1};
   }
-
-  if (overlay_is_open_)
-    ubus_manager_.SendMessage(UBUS_OVERLAY_CLOSE_REQUEST);
 }
 
 void PanelView::OnEntryShowMenu(std::string const& entry_id, unsigned xid,
                                 int x, int y, unsigned button)
 {
-  if (!track_menu_pointer_timeout_)
+  if (menu_geo_.IsNull())
   {
     // This is ugly... But Nux fault!
     menu_view_->IgnoreLeaveEvents(true);
@@ -768,7 +761,6 @@
   {
     // Since this only happens on keyboard events, we need to prevent that the
     // pointer tracker would select another entry.
-    tracked_pointer_pos_ = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
     return true;
   }
 
@@ -785,7 +777,6 @@
   {
     // Since this only happens on keyboard events, we need to prevent that the
     // pointer tracker would select another entry.
-    tracked_pointer_pos_ = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
     return true;
   }
 

=== modified file 'panel/PanelView.h'
--- panel/PanelView.h	2016-03-30 18:18:07 +0000
+++ panel/PanelView.h	2016-08-22 13:06:46 +0000
@@ -35,7 +35,6 @@
 #include "unity-shared/Introspectable.h"
 #include "unity-shared/MenuManager.h"
 #include "unity-shared/MockableBaseWindow.h"
-#include "unity-shared/Timer.h"
 #include "PanelMenuView.h"
 #include "PanelTray.h"
 #include "PanelIndicatorsView.h"
@@ -88,7 +87,6 @@
   void OnObjectAdded(indicator::Indicator::Ptr const& proxy);
   void OnObjectRemoved(indicator::Indicator::Ptr const& proxy);
   void OnIndicatorViewUpdated();
-  void OnMenuPointerMoved(int x, int y);
   void OnEntryActivated(std::string const& panel, std::string const& entry_id, nux::Rect const& geo);
   void OnEntryShowMenu(std::string const& entry_id, unsigned xid, int x, int y, unsigned button);
 
@@ -100,6 +98,8 @@
   void OnSpreadInitiate();
   void OnSpreadTerminate();
   void OnLowGfxChanged();
+  void OnMenuPointerMoved(int x, int y);
+  void OnActiveEntryEvent(XEvent const&);
   void EnableOverlayMode(bool);
   void LoadTextures();
 
@@ -109,7 +109,6 @@
   bool IsTransparent();
   void UpdateBackground();
   void ForceUpdateBackground();
-  bool TrackMenuPointer();
   void SyncGeometries();
   void AddPanelView(PanelIndicatorsView* child, unsigned int stretchFactor);
 
@@ -134,8 +133,8 @@
   std::unique_ptr<nux::AbstractPaintLayer> bg_refine_single_column_layer_;
 
   std::string active_overlay_;
-  nux::Point  tracked_pointer_pos_, triangle_top_corner_;
-  util::Timer mouse_tracker_timer_;
+  nux::Point  tracked_pointer_pos_;
+  Time last_pointer_time_;
 
   bool is_dirty_;
   bool opacity_maximized_toggle_;
@@ -152,7 +151,6 @@
   BackgroundEffectHelper bg_effect_helper_;
   nux::ObjectPtr<nux::IOpenGLBaseTexture> bg_blur_texture_;
   UBusManager ubus_manager_;
-  glib::Source::UniquePtr track_menu_pointer_timeout_;
 };
 
 } // namespace panel

=== modified file 'tests/test_panel_controller.cpp'
--- tests/test_panel_controller.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_panel_controller.cpp	2016-08-22 13:06:46 +0000
@@ -19,6 +19,7 @@
 
 #include <gmock/gmock.h>
 
+#include "InputMonitor.h"
 #include "PanelController.h"
 #include "PanelStyle.h"
 #include "PanelView.h"
@@ -46,6 +47,7 @@
   menu::MockManager::Ptr menus;
   ui::EdgeBarrierController::Ptr edge_barriers;
   launcher::Options::Ptr options;
+  input::Monitor im;
 };
 
 TEST_F(TestPanelController, Construction)

=== modified file 'tests/test_panel_view.cpp'
--- tests/test_panel_view.cpp	2014-12-12 22:33:24 +0000
+++ tests/test_panel_view.cpp	2016-08-22 13:06:46 +0000
@@ -25,6 +25,7 @@
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/UBusWrapper.h"
+ #include "InputMonitor.h"
 
 #include "mock_menu_manager.h"
 #include "test_standalone_wm.h"
@@ -43,6 +44,7 @@
   nux::ObjectPtr<MockableBaseWindow> window_;
   nux::ObjectPtr<PanelView> panel_view_;
   testwrapper::StandaloneWM WM;
+  input::Monitor im;
 
   TestPanelView()
     : window_(new MockableBaseWindow())