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

[Marco Trevisan (Treviño)]

DecorationsMenuLayout: use input monitor for menu scrubbing

[Andrea Azzarone (azzar1)]

Thanks!

review: Approve

=== modified file 'decorations/DecorationsMenuLayout.cpp'
--- decorations/DecorationsMenuLayout.cpp	2015-02-03 10:04:17 +0000
+++ decorations/DecorationsMenuLayout.cpp	2016-08-18 16:07:55 +0000
@@ -20,6 +20,7 @@
 #include "DecorationsMenuLayout.h"
 #include "DecorationsMenuEntry.h"
 #include "DecorationsMenuDropdown.h"
+#include "InputMonitor.h"
 
 namespace unity
 {
@@ -33,7 +34,6 @@
   , show_now(false)
   , menu_manager_(menu)
   , win_(win)
-  , last_pointer_(-1, -1)
   , dropdown_(std::make_shared<MenuDropdown>(menu_manager_->Indicators(), win))
 {
   visible = false;
@@ -117,16 +117,29 @@
   if (!activated)
     activated = dropdown_->ActivateChild(target);
 
-  if (activated)
-  {
-    // Since this generally happens on keyboard activation we need to avoid that
-    // the mouse position would interfere with this
-    last_pointer_.set(pointerX, pointerY);
-  }
-
   return activated;
 }
 
+bool MenuLayout::ActivateMenu(CompPoint const& pos)
+{
+  if (!Geometry().contains(pos))
+    return false;
+
+  for (auto const& item : items_)
+  {
+    if (!item->visible() || !item->sensitive())
+      continue;
+
+    if (item->Geometry().contains(pos))
+    {
+      std::static_pointer_cast<MenuEntry>(item)->ShowMenu(1);
+      return true;
+    }
+  }
+
+  return false;
+}
+
 void MenuLayout::OnEntryMouseOwnershipChanged(bool owner)
 {
   mouse_owner = owner;
@@ -154,42 +167,23 @@
 {
   active = actived;
 
-  if (active && !pointer_tracker_ && items_.size() > 1)
+  if (active && items_.size() > 1)
   {
-    pointer_tracker_.reset(new glib::Timeout(16));
-    pointer_tracker_->Run([this] {
-      Window win;
-      int i, x, y;
-      unsigned int ui;
-
-      XQueryPointer(screen->dpy(), screen->root(), &win, &win, &x, &y, &i, &i, &ui);
-
-      if (last_pointer_.x() != x || last_pointer_.y() != y)
-      {
-        last_pointer_.set(x, y);
-
-        for (auto const& item : items_)
-        {
-          if (!item->visible() || !item->sensitive())
-            continue;
-
-          if (item->Geometry().contains(last_pointer_))
-          {
-            std::static_pointer_cast<MenuEntry>(item)->ShowMenu(1);
-            break;
-          }
-        }
-      }
-
-      return true;
-    });
+    auto const& event_cb = sigc::mem_fun(this, &MenuLayout::OnEntryInputEvent);
+    input::Monitor::Get().RegisterClient(input::Events::POINTER, event_cb);
   }
   else if (!active)
   {
-    pointer_tracker_.reset();
+    input::Monitor::Get().UnregisterClient(sigc::mem_fun(this, &MenuLayout::OnEntryInputEvent));
   }
 }
 
+void MenuLayout::OnEntryInputEvent(XEvent const& e)
+{
+  if (e.type == MotionNotify)
+    ActivateMenu(CompPoint(e.xmotion.x_root, e.xmotion.y_root));
+}
+
 void MenuLayout::ChildrenGeometries(EntryLocationMap& map) const
 {
   for (auto const& item : items_)
 
=== modified file 'decorations/DecorationsMenuLayout.h'
--- decorations/DecorationsMenuLayout.h	2014-02-13 03:01:30 +0000
+++ decorations/DecorationsMenuLayout.h	2016-08-18 16:07:55 +0000
@@ -42,6 +42,7 @@
 
   void Setup();
   bool ActivateMenu(std::string const& entry_id);
+  bool ActivateMenu(CompPoint const&);
   void ChildrenGeometries(indicator::EntryLocationMap&) const;
 
 protected:
@@ -52,11 +53,10 @@
   void OnEntryMouseOwnershipChanged(bool);
   void OnEntryActiveChanged(bool);
   void OnEntryShowNowChanged(bool);
+  void OnEntryInputEvent(XEvent const&);
 
   menu::Manager::Ptr menu_manager_;
   CompWindow* win_;
-  CompPoint last_pointer_;
-  glib::Source::UniquePtr pointer_tracker_;
   glib::Source::UniquePtr show_now_timeout_;
   std::shared_ptr<MenuDropdown> dropdown_;
 };