2 files changed, 23 insertions, 40 deletions

diff --git a/lockscreen/LockScreenPanel.cpp b/lockscreen/LockScreenPanel.cpp
index d2fbc8d39..19185b8be 100644
--- a/lockscreen/LockScreenPanel.cpp
+++ b/lockscreen/LockScreenPanel.cpp
@@ -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 lockscreen
 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 @@ Panel::Panel(int monitor_, Indicators::Ptr const& indicators, session::Manager::
 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 @@ Panel::Panel(int monitor_, Indicators::Ptr const& indicators, session::Manager::
 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,30 +186,27 @@ void Panel::OnEntryActivated(std::string const& panel, std::string const& entry_
 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;
- }
+ auto& im = input::Monitor::Get();
+ auto const& event_cb = sigc::mem_fun(this, &Panel::OnEntryEvent);
 
- return true;
- });
+ if (active)
+ {
+ if (im.RegisterClient(input::Events::POINTER, event_cb))
+ indicators_view_->ActivateEntry(entry_id);
 }
- else if (!active)
+ else
 {
- track_menu_pointer_timeout_.reset();
- tracked_pointer_pos_ = {-1, -1};
- this->active = false;
+ 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)
 {
 auto const& geo = GetGeometry();
@@ -227,12 +218,7 @@ void Panel::Draw(nux::GraphicsEngine& graphics_engine, bool force_draw)
 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();
diff --git a/lockscreen/LockScreenPanel.h b/lockscreen/LockScreenPanel.h
index 664eccf50..3d1b0edc7 100644
--- a/lockscreen/LockScreenPanel.h
+++ b/lockscreen/LockScreenPanel.h
@@ -58,17 +58,14 @@ private:
 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