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

[Marco Trevisan (Treviño)]

LockScreenPanel: use InputMonitor events instead of mouse polling for menu scrubbing

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'lockscreen/LockScreenPanel.cpp'
--- lockscreen/LockScreenPanel.cpp	2015-11-05 14:55:54 +0000
+++ lockscreen/LockScreenPanel.cpp	2016-08-24 12:32:53 +0000
@@ -24,7 +24,7 @@
 
 #include "LockScreenSettings.h"
 #include "panel/PanelIndicatorsView.h"
-#include "unity-shared/CairoTexture.h"
+#include "unity-shared/InputMonitor.h"
 #include "unity-shared/StaticCairoText.h"
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/RawPixel.h"
@@ -38,6 +38,7 @@
 namespace
 {
 const RawPixel PADDING = 5_em;
+const nux::Color BG_COLOR(0.1, 0.1, 0.1, 0.4);
 }
 
 using namespace indicator;
@@ -54,8 +55,7 @@
   auto* layout = new nux::HLayout();
   layout->SetLeftAndRightPadding(PADDING.CP(scale), 0);
   SetLayout(layout);
-
-  BuildTexture();
+  UpdateSize();
 
   // Add setting
   auto *hostname = new StaticCairoText(session_manager->HostName());
@@ -86,20 +86,14 @@
     hostname->SetScale(scale);
     static_cast<nux::HLayout*>(GetLayout())->SetLeftAndRightPadding(PADDING.CP(scale), 0);
     indicators_view_->SetMonitor(monitor);
-    BuildTexture();
+    UpdateSize();
     QueueRelayout();
   });
 }
 
-void Panel::BuildTexture()
+void Panel::UpdateSize()
 {
   int height = panel::Style::Instance().PanelHeight(monitor);
-  nux::CairoGraphics context(CAIRO_FORMAT_ARGB32, 1, height);
-  auto* cr = context.GetInternalContext();
-  cairo_set_source_rgb(cr, 0.1, 0.1, 0.1);
-  cairo_paint_with_alpha(cr, 0.4);
-  bg_texture_ = texture_ptr_from_cairo_graphics(context);
-
   view_layout_->SetMinimumHeight(height);
   view_layout_->SetMaximumHeight(height);
 }
@@ -192,28 +186,25 @@
     nux::GetWindowCompositor().GrabKeyboardAdd(static_cast<nux::BaseWindow*>(GetTopLevelViewWindow()));
   }
 
-  if (active && !track_menu_pointer_timeout_)
-  {
-    track_menu_pointer_timeout_.reset(new glib::Timeout(16));
-    track_menu_pointer_timeout_->Run([this] {
-      nux::Point const& mouse = nux::GetGraphicsDisplay()->GetMouseScreenCoord();
-      if (tracked_pointer_pos_ != mouse)
-      {
-        if (GetAbsoluteGeometry().IsPointInside(mouse.x, mouse.y))
-          indicators_view_->ActivateEntryAt(mouse.x, mouse.y);
-
-        tracked_pointer_pos_ = mouse;
-      }
-
-      return true;
-    });
-  }
-  else if (!active)
-  {
-    track_menu_pointer_timeout_.reset();
-    tracked_pointer_pos_ = {-1, -1};
-    this->active = false;
-  }
+  auto& im = input::Monitor::Get();
+  auto const& event_cb = sigc::mem_fun(this, &Panel::OnEntryEvent);
+
+  if (active)
+  {
+    if (im.RegisterClient(input::Events::POINTER, event_cb))
+      indicators_view_->ActivateEntry(entry_id);
+  }
+  else
+  {
+    im.UnregisterClient(event_cb);
+    this->active = active;
+  }
+}
+
+void Panel::OnEntryEvent(XEvent const& e)
+{
+  if (e.type == MotionNotify && GetAbsoluteGeometry().IsPointInside(e.xmotion.x, e.xmotion.y))
+    indicators_view_->ActivateEntryAt(e.xmotion.x, e.xmotion.y);
 }
 
 void Panel::Draw(nux::GraphicsEngine& graphics_engine, bool force_draw)
@@ -227,12 +218,7 @@
   graphics_engine.PushClippingRectangle(geo);
   nux::GetPainter().PaintBackground(graphics_engine, geo);
 
-  nux::TexCoordXForm texxform;
-  texxform.SetWrap(nux::TEXWRAP_REPEAT, nux::TEXWRAP_CLAMP);
-  graphics_engine.QRP_1Tex(geo.x, geo.y, geo.width, geo.height,
-                           bg_texture_->GetDeviceTexture(), texxform,
-                           nux::color::White);
-
+  graphics_engine.QRP_Color(geo.x, geo.y, geo.width, geo.height, BG_COLOR);
   view_layout_->ProcessDraw(graphics_engine, force_draw);
 
   graphics_engine.PopClippingRectangle();

=== modified file 'lockscreen/LockScreenPanel.h'
--- lockscreen/LockScreenPanel.h	2016-03-31 09:51:33 +0000
+++ lockscreen/LockScreenPanel.h	2016-08-24 12:32:53 +0000
@@ -58,17 +58,14 @@
   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);
   void OnEntryActivateRequest(std::string const& entry_id);
+  void OnEntryEvent(XEvent const&);
 
-  void BuildTexture();
+  void UpdateSize();
   std::string GetPanelName() const;
 
   indicator::Indicators::Ptr indicators_;
   panel::PanelIndicatorsView* indicators_view_;
-  nux::ObjectPtr<nux::BaseTexture> bg_texture_;
-
   bool needs_geo_sync_;
-  nux::Point tracked_pointer_pos_;
-  glib::Source::UniquePtr track_menu_pointer_timeout_;
 };
 
 } // lockscreen namespace