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

[Marco Trevisan (Treviño)]

LockScreenPanel: added a light version of PanelView for Lockscreen only, using PanelIndicatorsView

 - Indicators scrubbing using mouse works again
 - Indicators key navigation is supported (Alt+F10 included)
 - Indicators will be correctly visible in light themes as well
 - Show hostname (optionally) on the top left side of the panel
 - LockScreenSettings now bind settings from unity-greeter dconf path

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3743
http://jenkins.qa.ubuntu.com/job/unity-ci/767/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/303/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/299/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/301/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/767/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3744
http://jenkins.qa.ubuntu.com/job/unity-ci/768/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/304/console
    None: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/300/console
    None: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/302/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/768/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3745
http://jenkins.qa.ubuntu.com/job/unity-ci/770/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/306/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/302/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/304/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/770/rebuild

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3749
http://jenkins.qa.ubuntu.com/job/unity-ci/771/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/307/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/303/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/305/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/771/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3750
http://jenkins.qa.ubuntu.com/job/unity-ci/772/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/308/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/304/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/306/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/772/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

Look good to me now.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3751
http://jenkins.qa.ubuntu.com/job/unity-ci/773/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/309/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/305/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/307/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/773/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3756
http://jenkins.qa.ubuntu.com/job/unity-ci/775/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/311/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/307/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/309/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/775/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3757
http://jenkins.qa.ubuntu.com/job/unity-ci/776/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/312/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/308/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/310/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/776/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3758
http://jenkins.qa.ubuntu.com/job/unity-ci/783/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/319/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/315/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/317/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/783/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3759
http://jenkins.qa.ubuntu.com/job/unity-ci/786/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/322/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/318/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/320/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/786/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'UnityCore/SessionManager.h'
--- UnityCore/SessionManager.h	2014-03-11 14:11:14 +0000
+++ UnityCore/SessionManager.h	2014-03-11 14:11:15 +0000
@@ -59,6 +59,8 @@
 
   sigc::signal<void> lock_requested;
   sigc::signal<void> unlock_requested;
+  sigc::signal<void> locked;
+  sigc::signal<void> unlocked;
   sigc::signal<void, bool /* inhibitors */> logout_requested;
   sigc::signal<void, bool /* inhibitors */> reboot_requested;
   sigc::signal<void, bool /* inhibitors */> shutdown_requested;
 
=== modified file 'lockscreen/BackgroundSettings.cpp'
--- lockscreen/BackgroundSettings.cpp	2014-03-11 14:11:14 +0000
+++ lockscreen/BackgroundSettings.cpp	2014-03-11 14:11:15 +0000
@@ -34,12 +34,6 @@
 namespace
 {
 const std::string SETTINGS_NAME = "org.gnome.desktop.background";
-const std::string GREETER_SETTINGS = "com.canonical.unity-greeter";
-const std::string LOGO_KEY = "logo";
-const std::string BACKGROUND_KEY = "background";
-const std::string BACKGROUND_COLOR_KEY = "background-color";
-const std::string USER_BG_KEY = "draw-user-backgrounds";
-const std::string DRAW_GRID_KEY = "draw-grid";
 
 constexpr int GetGridOffset(int size) { return (size % Settings::GRID_SIZE) / 2; }
 }
@@ -57,30 +51,23 @@
 BaseTexturePtr BackgroundSettings::GetBackgroundTexture(int monitor)
 {
   nux::Geometry const& geo = UScreen::GetDefault()->GetMonitorGeometry(monitor);
-  glib::Object<GSettings> greeter_settings(g_settings_new(GREETER_SETTINGS.c_str()));
-  bool user_bg = g_settings_get_boolean(greeter_settings, USER_BG_KEY.c_str()) != FALSE;
-  bool draw_grid = g_settings_get_boolean(greeter_settings, DRAW_GRID_KEY.c_str()) != FALSE;
+  auto& settings = Settings::Instance();
 
   nux::CairoGraphics cairo_graphics(CAIRO_FORMAT_ARGB32, geo.width, geo.height);
   cairo_t* c = cairo_graphics.GetInternalContext();
 
   cairo_surface_t* bg_surface = nullptr;
 
-  if (user_bg)
+  if (settings.use_user_background())
   {
     bg_surface = gnome_bg_create_surface(gnome_bg_, gdk_get_default_root_window(), geo.width, geo.height, FALSE);
   }
-  else
+  else if (!settings.background().empty())
   {
-    glib::String bg_file(g_settings_get_string(greeter_settings, BACKGROUND_KEY.c_str()));
-
-    if (bg_file)
-    {
-      glib::Object<GdkPixbuf> pixbuf(gdk_pixbuf_new_from_file_at_scale(bg_file, geo.width, geo.height, FALSE, NULL));
-
-      if (pixbuf)
-        bg_surface = gdk_cairo_surface_create_from_pixbuf(pixbuf, 0, NULL);
-    }
+    glib::Object<GdkPixbuf> pixbuf(gdk_pixbuf_new_from_file_at_scale(settings.background().c_str(), geo.width, geo.height, FALSE, NULL));
+
+    if (pixbuf)
+      bg_surface = gdk_cairo_surface_create_from_pixbuf(pixbuf, 0, NULL);
   }
 
   if (bg_surface)
@@ -91,43 +78,39 @@
   }
   else
   {
-    nux::Color bg_color(glib::String(g_settings_get_string(greeter_settings, BACKGROUND_COLOR_KEY.c_str())).Str());
+    auto const& bg_color = settings.background_color();
     cairo_set_source_rgb(c, bg_color.red, bg_color.green, bg_color.blue);
     cairo_paint(c);
   }
 
+  if (!settings.logo().empty())
   {
-    glib::String logo(g_settings_get_string(greeter_settings, LOGO_KEY.c_str()));
     int grid_x_offset = GetGridOffset(geo.width);
     int grid_y_offset = GetGridOffset(geo.height);
+    cairo_surface_t* logo_surface = cairo_image_surface_create_from_png(settings.logo().c_str());
 
-    if (logo && !logo.Str().empty())
+    if (logo_surface)
     {
-      cairo_surface_t* logo_surface = cairo_image_surface_create_from_png(logo);
-
-      if (logo_surface)
-      {
-        int height = cairo_image_surface_get_height(logo_surface);
-        int x = grid_x_offset;
-        int y = grid_y_offset + Settings::GRID_SIZE * (geo.height / Settings::GRID_SIZE - 1) - height;
-
-        cairo_save(c);
-        cairo_translate(c, x, y);
-
-        cairo_set_source_surface(c, logo_surface, 0, 0);
-        cairo_paint_with_alpha(c, 0.5);
-        cairo_surface_destroy(logo_surface);
-        cairo_restore(c);
-      }
+      int height = cairo_image_surface_get_height(logo_surface);
+      int x = grid_x_offset;
+      int y = grid_y_offset + Settings::GRID_SIZE * (geo.height / Settings::GRID_SIZE - 1) - height;
+
+      cairo_save(c);
+      cairo_translate(c, x, y);
+
+      cairo_set_source_surface(c, logo_surface, 0, 0);
+      cairo_paint_with_alpha(c, 0.5);
+      cairo_surface_destroy(logo_surface);
+      cairo_restore(c);
     }
   }
 
-  if (draw_grid)
+  if (settings.draw_grid())
   {
     int width = geo.width;
     int height = geo.height;
     int grid_x_offset = GetGridOffset(width);
-    int grid_y_offset = GetGridOffset(height);
+    int grid_y_offset = GetGridOffset(height) + panel::Style().Instance().PanelHeight(monitor);
 
     // overlay grid
     cairo_surface_t* overlay_surface = cairo_surface_create_similar(cairo_graphics.GetSurface(),
 
=== modified file 'lockscreen/CMakeLists.txt'
--- lockscreen/CMakeLists.txt	2014-03-11 14:11:14 +0000
+++ lockscreen/CMakeLists.txt	2014-03-11 14:11:15 +0000
@@ -23,6 +23,7 @@
      LockScreenSettings.cpp
      LockScreenShield.cpp
      LockScreenShieldFactory.cpp
+     LockScreenPanel.cpp
      UserAuthenticatorPam.cpp
      UserPromptView.cpp
      )
 
=== modified file 'lockscreen/LockScreenAbstractShield.h'
--- lockscreen/LockScreenAbstractShield.h	2014-03-11 14:11:14 +0000
+++ lockscreen/LockScreenAbstractShield.h	2014-03-11 14:11:15 +0000
@@ -22,6 +22,7 @@
 
 #include <NuxCore/Property.h>
 #include <UnityCore/SessionManager.h>
+#include <UnityCore/Indicators.h>
 
 #include "unity-shared/MockableBaseWindow.h"
 
@@ -33,20 +34,24 @@
 class AbstractShield : public MockableBaseWindow
 {
 public:
-  AbstractShield(session::Manager::Ptr const& session, int monitor_num, bool is_primary)
+  AbstractShield(session::Manager::Ptr const& session, indicator::Indicators::Ptr const& indicators, int monitor_num, bool is_primary)
     : MockableBaseWindow("Unity Lockscreen")
     , primary(is_primary)
     , monitor(monitor_num)
     , session_manager_(session)
+    , indicators_(indicators)
   {}
 
   nux::Property<bool> primary;
   nux::Property<int> monitor;
 
+  virtual bool IsIndicatorOpen() const = 0;
+
   sigc::signal<void, int, int> grab_motion;
 
 protected:
   session::Manager::Ptr session_manager_;
+  indicator::Indicators::Ptr indicators_;
 };
 
 } // lockscreen
 
=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp	2014-03-11 14:11:14 +0000
+++ lockscreen/LockScreenController.cpp	2014-03-11 14:11:15 +0000
@@ -19,6 +19,7 @@
 
 #include "LockScreenController.h"
 
+#include <UnityCore/DBusIndicators.h>
 #include "LockScreenShield.h"
 #include "LockScreenSettings.h"
 #include "unity-shared/AnimationUtils.h"
@@ -68,10 +69,14 @@
     {
       motion_connection_->disconnect();
       uscreen_connection_->block();
+      session_manager_->unlocked.emit();
       shields_.clear();
 
       if (Settings::Instance().lockscreen_type() == Type::UNITY)
+      {
         upstart_wrapper_->Emit("desktop-unlock");
+        indicators_.reset();
+      }
     }
   });
 }
@@ -111,7 +116,7 @@
 
     if (i >= shields_size)
     {
-      shield = shield_factory_->CreateShield(session_manager_, i, i == primary);
+      shield = shield_factory_->CreateShield(session_manager_, indicators_, i, i == primary);
       is_new = true;
     }
 
@@ -146,17 +151,20 @@
 
   if (lockscreen_type == Type::NONE)
   {
+    session_manager_->unlocked.emit();
     return;
   }
-  else if (lockscreen_type == Type::LIGHTDM)
+
+  if (lockscreen_type == Type::LIGHTDM)
   {
     LockScreenUsingDisplayManager();
   }
   else if (lockscreen_type == Type::UNITY)
   {
-    upstart_wrapper_->Emit("desktop-lock");
     LockScreenUsingUnity();
   }
+
+  session_manager_->locked.emit();
 }
 
 void Controller::LockScreenUsingDisplayManager()
@@ -180,6 +188,9 @@
 
 void Controller::LockScreenUsingUnity()
 {
+  indicators_ = std::make_shared<indicator::LockScreenDBusIndicators>();
+  upstart_wrapper_->Emit("desktop-lock");
+
   ShowShields();
 }
 
@@ -235,9 +246,14 @@
   return !shields_.empty();
 }
 
-bool Controller::IsShielded() const
-{
-  return (fade_animator_.GetCurrentValue() == 1.0f && !shields_.empty());
+double Controller::Opacity() const
+{
+  return fade_animator_.GetCurrentValue();
+}
+
+bool Controller::HasOpenMenu() const
+{
+  return primary_shield_.IsValid() ? primary_shield_->IsIndicatorOpen() : false;
 }
 
 } // lockscreen
 
=== modified file 'lockscreen/LockScreenController.h'
--- lockscreen/LockScreenController.h	2014-03-11 14:11:14 +0000
+++ lockscreen/LockScreenController.h	2014-03-11 14:11:15 +0000
@@ -41,7 +41,8 @@
              bool test_mode = false);
 
   bool IsLocked() const;
-  bool IsShielded() const;
+  bool HasOpenMenu() const;
+  double Opacity() const;
 
 private:
   friend class TestLockScreenController;
@@ -59,6 +60,7 @@
   std::vector<nux::ObjectPtr<AbstractShield>> shields_;
   nux::ObjectWeakPtr<AbstractShield> primary_shield_;
   session::Manager::Ptr session_manager_;
+  indicator::Indicators::Ptr indicators_;
   UpstartWrapper::Ptr upstart_wrapper_;
   ShieldFactoryInterface::Ptr shield_factory_;
   nux::animation::AnimateValue<double> fade_animator_;
 
=== added file 'lockscreen/LockScreenPanel.cpp'
--- lockscreen/LockScreenPanel.cpp	1970-01-01 00:00:00 +0000
+++ lockscreen/LockScreenPanel.cpp	2014-03-11 14:11:15 +0000
@@ -0,0 +1,225 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marco Trevisan <[e-mail]>
+ */
+
+#include "LockScreenPanel.h"
+
+#include <boost/algorithm/string/trim.hpp>
+#include <Nux/HLayout.h>
+
+#include "LockScreenSettings.h"
+#include "panel/PanelIndicatorsView.h"
+#include "unity-shared/CairoTexture.h"
+#include "unity-shared/StaticCairoText.h"
+#include "unity-shared/PanelStyle.h"
+#include "unity-shared/RawPixel.h"
+#include "unity-shared/UnitySettings.h"
+#include "unity-shared/WindowManager.h"
+
+namespace unity
+{
+namespace lockscreen
+{
+namespace
+{
+const RawPixel PADDING = 5_em;
+}
+
+using namespace indicator;
+using namespace panel;
+
+Panel::Panel(int monitor_, Indicators::Ptr const& indicators, session::Manager::Ptr const& session_manager)
+  : nux::View(NUX_TRACKER_LOCATION)
+  , active(false)
+  , monitor(monitor_)
+  , indicators_(indicators)
+  , needs_geo_sync_(true)
+{
+  double scale = unity::Settings::Instance().em(monitor)->DPIScale();
+  auto* layout = new nux::HLayout();
+  layout->SetLeftAndRightPadding(PADDING.CP(scale), 0);
+  SetLayout(layout);
+
+  BuildTexture();
+
+  // Add setting
+  auto *hostname = new StaticCairoText(session_manager->HostName());
+  hostname->SetFont(Settings::Instance().font_name());
+  hostname->SetTextColor(nux::color::White);
+  hostname->SetInputEventSensitivity(false);
+  hostname->SetScale(scale);
+  hostname->SetVisible(Settings::Instance().show_hostname());
+  layout->AddView(hostname, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+
+  indicators_view_ = new PanelIndicatorsView();
+  indicators_view_->SetMonitor(monitor);
+  indicators_view_->OverlayShown();
+  indicators_view_->on_indicator_updated.connect(sigc::mem_fun(this, &Panel::OnIndicatorViewUpdated));
+  layout->AddView(indicators_view_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+
+  for (auto const& indicator : indicators_->GetIndicators())
+    AddIndicator(indicator);
+
+  indicators_->on_object_added.connect(sigc::mem_fun(this, &Panel::AddIndicator));
+  indicators_->on_object_removed.connect(sigc::mem_fun(this, &Panel::RemoveIndicator));
+  indicators_->on_entry_show_menu.connect(sigc::mem_fun(this, &Panel::OnEntryShowMenu));
+  indicators_->on_entry_activated.connect(sigc::mem_fun(this, &Panel::OnEntryActivated));
+  indicators_->on_entry_activate_request.connect(sigc::mem_fun(this, &Panel::OnEntryActivateRequest));
+
+  monitor.changed.connect([this, hostname] (int monitor) {
+    hostname->SetScale(unity::Settings::Instance().em(monitor)->DPIScale());
+    indicators_view_->SetMonitor(monitor);
+    BuildTexture();
+    QueueRelayout();
+  });
+}
+
+void Panel::BuildTexture()
+{
+  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);
+}
+
+void Panel::AddIndicator(Indicator::Ptr const& indicator)
+{
+  if (indicator->IsAppmenu())
+    return;
+
+  indicators_view_->AddIndicator(indicator);
+  QueueRelayout();
+  QueueDraw();
+}
+
+void Panel::RemoveIndicator(indicator::Indicator::Ptr const& indicator)
+{
+  indicators_view_->RemoveIndicator(indicator);
+  QueueRelayout();
+  QueueDraw();
+}
+
+std::string Panel::GetPanelName() const
+{
+  return "LockScreenPanel" + std::to_string(monitor);
+}
+
+void Panel::OnIndicatorViewUpdated()
+{
+  needs_geo_sync_ = true;
+  QueueRelayout();
+  QueueDraw();
+}
+
+void Panel::OnEntryShowMenu(std::string const& entry_id, unsigned xid, int x, int y, unsigned button)
+{
+  if (!GetInputEventSensitivity())
+    return;
+
+  // This is ugly... But Nux fault!
+  WindowManager::Default().UnGrabMousePointer(CurrentTime, button, x, y);
+
+  active = true;
+}
+
+void Panel::OnEntryActivateRequest(std::string const& entry_id)
+{
+  if (GetInputEventSensitivity())
+    indicators_view_->ActivateEntry(entry_id, 0);
+}
+
+void Panel::ActivateFirst()
+{
+  if (GetInputEventSensitivity())
+    indicators_view_->ActivateIfSensitive();
+}
+
+void Panel::OnEntryActivated(std::string const& panel, std::string const& entry_id, nux::Rect const&)
+{
+  if (!GetInputEventSensitivity() || (!panel.empty() && panel != GetPanelName()))
+    return;
+
+  bool active = !entry_id.empty();
+  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;
+  }
+}
+
+void Panel::Draw(nux::GraphicsEngine& graphics_engine, bool force_draw)
+{
+  auto const& geo = GetGeometry();
+
+  unsigned int alpha, src, dest = 0;
+  graphics_engine.GetRenderStates().GetBlend(alpha, src, dest);
+  graphics_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+
+  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);
+
+  view_layout_->ProcessDraw(graphics_engine, force_draw);
+
+  graphics_engine.PopClippingRectangle();
+  graphics_engine.GetRenderStates().SetBlend(alpha, src, dest);
+
+  if (needs_geo_sync_)
+  {
+    EntryLocationMap locations;
+    indicators_view_->GetGeometryForSync(locations);
+    indicators_->SyncGeometries(GetPanelName(), locations);
+    needs_geo_sync_ = false;
+  }
+}
+
+bool Panel::InspectKeyEvent(unsigned int event_type, unsigned int keysym, const char*)
+{
+  ActivateFirst();
+  return true;
+}
+
+}
+}
 
=== added file 'lockscreen/LockScreenPanel.h'
--- lockscreen/LockScreenPanel.h	1970-01-01 00:00:00 +0000
+++ lockscreen/LockScreenPanel.h	2014-03-11 14:11:15 +0000
@@ -0,0 +1,75 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marco Trevisan <[e-mail]>
+ */
+
+#ifndef UNITY_LOCKSCREEN_PANEL
+#define UNITY_LOCKSCREEN_PANEL
+
+#include <Nux/Nux.h>
+#include <Nux/View.h>
+#include <UnityCore/Indicators.h>
+#include <UnityCore/GLibSource.h>
+#include <UnityCore/SessionManager.h>
+
+namespace unity
+{
+namespace panel
+{
+class PanelIndicatorsView;
+}
+
+namespace lockscreen
+{
+
+class Panel : public nux::View
+{
+public:
+  Panel(int monitor, indicator::Indicators::Ptr const&, session::Manager::Ptr const&);
+
+  nux::Property<bool> active;
+  nux::Property<int> monitor;
+
+protected:
+  void Draw(nux::GraphicsEngine& GfxContext, bool force_draw) override;
+  bool InspectKeyEvent(unsigned int event_type, unsigned int keysym, const char*) override;
+
+private:
+  void ActivateFirst();
+  void AddIndicator(indicator::Indicator::Ptr const&);
+  void RemoveIndicator(indicator::Indicator::Ptr const&);
+  void OnIndicatorViewUpdated();
+  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 BuildTexture();
+  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
+} // unity namespace
+
+#endif // UNITY_LOCKSCREEN_PANEL
 
=== modified file 'lockscreen/LockScreenSettings.cpp'
--- lockscreen/LockScreenSettings.cpp	2014-03-11 14:11:14 +0000
+++ lockscreen/LockScreenSettings.cpp	2014-03-11 14:11:15 +0000
@@ -20,6 +20,9 @@
 #include "LockScreenSettings.h"
 
 #include <NuxCore/Logger.h>
+#include <sigc++/adaptors/hide.h>
+#include <UnityCore/GLibSignal.h>
+#include <UnityCore/GLibWrapper.h>
 
 namespace unity
 {
@@ -31,8 +34,42 @@
 namespace
 {
 Settings* settings_instance = nullptr;
+
+const std::string GREETER_SETTINGS = "com.canonical.unity-greeter";
+const std::string LOGO_KEY = "logo";
+const std::string FONT_KEY = "font-name";
+const std::string BACKGROUND_KEY = "background";
+const std::string BACKGROUND_COLOR_KEY = "background-color";
+const std::string USER_BG_KEY = "draw-user-backgrounds";
+const std::string DRAW_GRID_KEY = "draw-grid";
+const std::string SHOW_HOSTNAME_KEY = "show-hostname";
 }
 
+struct Settings::Impl
+{
+  Impl()
+    : greeter_settings_(g_settings_new(GREETER_SETTINGS.c_str()))
+    , signal_(greeter_settings_, "changed", sigc::hide(sigc::hide(sigc::mem_fun(this, &Impl::UpdateSettings))))
+  {
+    UpdateSettings();
+  }
+
+  void UpdateSettings()
+  {
+    auto* s = settings_instance;
+    s->font_name = glib::String(g_settings_get_string(greeter_settings_, FONT_KEY.c_str())).Str();
+    s->logo = glib::String(g_settings_get_string(greeter_settings_, LOGO_KEY.c_str())).Str();
+    s->background = glib::String(g_settings_get_string(greeter_settings_, BACKGROUND_KEY.c_str())).Str();
+    s->background_color = nux::Color(glib::String(g_settings_get_string(greeter_settings_, BACKGROUND_COLOR_KEY.c_str())).Str());
+    s->show_hostname = g_settings_get_boolean(greeter_settings_, SHOW_HOSTNAME_KEY.c_str()) != FALSE;
+    s->use_user_background = g_settings_get_boolean(greeter_settings_, USER_BG_KEY.c_str()) != FALSE;
+    s->draw_grid = g_settings_get_boolean(greeter_settings_, DRAW_GRID_KEY.c_str()) != FALSE;
+  }
+
+  glib::Object<GSettings> greeter_settings_;
+  glib::Signal<void, GSettings*, const gchar*> signal_;
+};
+
 Settings::Settings()
 {
   if (settings_instance)
@@ -43,6 +80,7 @@
   {
     lockscreen_type = Type::UNITY;
     settings_instance = this;
+    impl_.reset(new Impl());
   }
 }
 
 
=== modified file 'lockscreen/LockScreenSettings.h'
--- lockscreen/LockScreenSettings.h	2014-03-11 14:11:14 +0000
+++ lockscreen/LockScreenSettings.h	2014-03-11 14:11:15 +0000
@@ -45,8 +45,19 @@
   static Settings& Instance();
 
   nux::Property<Type> lockscreen_type;
+  nux::Property<std::string> font_name;
+  nux::Property<std::string> logo;
+  nux::Property<std::string> background;
+  nux::Property<nux::Color> background_color;
+  nux::Property<bool> show_hostname;
+  nux::Property<bool> use_user_background;
+  nux::Property<bool> draw_grid;
 
   static const int GRID_SIZE = 40;
+
+private:
+  struct Impl;
+  std::unique_ptr<Impl> impl_;
 };
 
 }
 
=== modified file 'lockscreen/LockScreenShield.cpp'
--- lockscreen/LockScreenShield.cpp	2014-03-11 14:11:14 +0000
+++ lockscreen/LockScreenShield.cpp	2014-03-11 14:11:15 +0000
@@ -22,26 +22,25 @@
 #include <Nux/VLayout.h>
 #include <Nux/HLayout.h>
 #include <Nux/PaintLayer.h>
-#include <UnityCore/DBusIndicators.h>
 
 #include "BackgroundSettings.h"
 #include "CofView.h"
+#include "LockScreenPanel.h"
 #include "LockScreenSettings.h"
 #include "UserPromptView.h"
-#include "panel/PanelView.h"
-#include "unity-shared/GnomeKeyGrabber.h"
-#include "unity-shared/PanelStyle.h"
 #include "unity-shared/UScreen.h"
+#include "unity-shared/WindowManager.h"
 
 namespace unity
 {
 namespace lockscreen
 {
 
-Shield::Shield(session::Manager::Ptr const& session_manager, int monitor_num, bool is_primary)
-  : AbstractShield(session_manager, monitor_num, is_primary)
-  , bg_settings_(new BackgroundSettings)
+Shield::Shield(session::Manager::Ptr const& session_manager, indicator::Indicators::Ptr const& indicators, int monitor_num, bool is_primary)
+  : AbstractShield(session_manager, indicators, monitor_num, is_primary)
+  , bg_settings_(std::make_shared<BackgroundSettings>())
   , prompt_view_(nullptr)
+  , panel_view_(nullptr)
 {
   is_primary ? ShowPrimaryView() : ShowSecondaryView();
 
@@ -50,8 +49,8 @@
   geometry_changed.connect([this] (nux::Area*, nux::Geometry&) { UpdateBackgroundTexture();});
 
   monitor.changed.connect([this] (int monitor) {
-    if (primary() && panel_view_)
-      panel_view_->SetMonitor(monitor);
+    if (panel_view_)
+      panel_view_->monitor = monitor;
 
     UpdateBackgroundTexture();
   });
@@ -64,6 +63,7 @@
     }
 
     is_primary ? ShowPrimaryView() : ShowSecondaryView();
+    if (panel_view_) panel_view_->SetInputEventSensitivity(is_primary);
     QueueRelayout();
     QueueDraw();
   });
@@ -132,23 +132,29 @@
   main_layout->AddView(cof_view);
 }
 
-nux::View* Shield::CreatePanel()
+Panel* Shield::CreatePanel()
 {
-  auto indicators = std::make_shared<indicator::LockScreenDBusIndicators>();
-  auto gnome_grabber = std::make_shared<key::GnomeGrabber>();
-  auto menu_manager = std::make_shared<menu::Manager>(indicators, gnome_grabber);
-
-  // Hackish but ok for the moment. Would be nice to have menus without grab.
-  indicators->on_entry_show_menu.connect(sigc::mem_fun(this, &Shield::OnIndicatorEntryShowMenu));
-  indicators->on_entry_activated.connect(sigc::mem_fun(this, &Shield::OnIndicatorEntryActivated));
-
-  panel::PanelView* panel_view = new panel::PanelView(this, menu_manager, /*lockscreen_mode*/ true);
-  panel_view->SetMaximumHeight(panel::Style::Instance().PanelHeight(monitor));
-  panel_view->SetOpacity(0.5);
-  panel_view->SetMonitor(monitor);
-  panel_view_ = panel_view;
-
-  return panel_view;
+  if (!indicators_ || !session_manager_)
+    return nullptr;
+
+  panel_view_ = new Panel(monitor, indicators_, session_manager_);
+  panel_active_conn_ = panel_view_->active.changed.connect([this] (bool active) {
+    if (primary())
+    {
+      if (active)
+      {
+        UnGrabPointer();
+        UnGrabKeyboard();
+      }
+      else
+      {
+        GrabPointer();
+        GrabKeyboard();
+      }
+    }
+  });
+
+  return panel_view_;
 }
 
 UserPromptView* Shield::CreatePromptView()
@@ -165,38 +171,31 @@
   return prompt_view;
 }
 
-void Shield::OnIndicatorEntryShowMenu(std::string const&, unsigned, int, int, unsigned)
-{
-  if (primary())
-  {
-    UnGrabPointer();
-    UnGrabKeyboard();
-  }
-}
-
-void Shield::OnIndicatorEntryActivated(std::string const& panel, std::string const& entry, nux::Geometry const& geo)
-{
-  if (primary() && entry.empty() and geo.IsNull()) /* on menu closed */
-  {
-    GrabPointer();
-    GrabKeyboard();
-  }
-}
-
-nux::Area* Shield::FindKeyFocusArea(unsigned int, unsigned long, unsigned long)
-{
-  if (primary && prompt_view_)
-  {
-    auto* focus_view = prompt_view_->focus_view();
-
-    if (focus_view && focus_view->GetInputEventSensitivity())
-      return focus_view;
+nux::Area* Shield::FindKeyFocusArea(unsigned etype, unsigned long key_code, unsigned long modifiers)
+{
+  if (primary)
+  {
+    if (panel_view_)
+    {
+      modifiers &= (nux::NUX_STATE_ALT | nux::NUX_STATE_CTRL | nux::NUX_STATE_SUPER | nux::NUX_STATE_SHIFT);
+      auto const& indicators_key = WindowManager::Default().activate_indicators_key();
+
+      if (indicators_key.first == modifiers && indicators_key.second == key_code)
+        return panel_view_;
+    }
+
+    if (prompt_view_)
+    {
+      auto* focus_view = prompt_view_->focus_view();
+
+      if (focus_view && focus_view->GetInputEventSensitivity())
+        return focus_view;
+    }
   }
 
   return nullptr;
 }
 
-
 bool Shield::AcceptKeyNavFocus()
 {
   return false;
@@ -212,5 +211,10 @@
   return area;
 }
 
+bool Shield::IsIndicatorOpen() const
+{
+  return panel_view_ ? panel_view_->active() : false;
+}
+
 }
 }
 
=== modified file 'lockscreen/LockScreenShield.h'
--- lockscreen/LockScreenShield.h	2014-03-11 14:11:14 +0000
+++ lockscreen/LockScreenShield.h	2014-03-11 14:11:15 +0000
@@ -20,26 +20,27 @@
 #ifndef UNITY_LOCKSCREEN_SHIELD_H
 #define UNITY_LOCKSCREEN_SHIELD_H
 
+#include <UnityCore/ConnectionManager.h>
 #include "LockScreenAbstractShield.h"
 
 namespace unity
 {
-namespace panel
-{
-class PanelView;
-}
 namespace lockscreen
 {
 
 class BackgroundSettings;
 class UserAuthenticator;
 class UserPromptView;
+class Panel;
 
 class Shield : public AbstractShield
 {
 public:
-  Shield(session::Manager::Ptr const& session_manager, int monitor, bool is_primary);
-
+  Shield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, int monitor, bool is_primary);
+
+  bool IsIndicatorOpen() const;
+
+protected:
   bool AcceptKeyNavFocus() override;
   nux::Area* FindKeyFocusArea(unsigned int, unsigned long, unsigned long) override;
   nux::Area* FindAreaUnderMouse(nux::Point const&, nux::NuxEventType) override;
@@ -48,18 +49,16 @@
   void UpdateBackgroundTexture();
   void ShowPrimaryView();
   void ShowSecondaryView();
-  nux::View* CreatePanel();
+  Panel* CreatePanel();
   UserPromptView* CreatePromptView();
 
-  void OnIndicatorEntryShowMenu(std::string const&, unsigned, int, int, unsigned);
-  void OnIndicatorEntryActivated(std::string const& panel, std::string const& entry, nux::Geometry const& geo);
-
   std::shared_ptr<BackgroundSettings> bg_settings_;
   std::unique_ptr<nux::AbstractPaintLayer> background_layer_;
   nux::ObjectPtr<nux::Layout> primary_layout_;
   nux::ObjectPtr<nux::Layout> cof_layout_;
+  connection::Wrapper panel_active_conn_;
   UserPromptView* prompt_view_;
-  panel::PanelView* panel_view_;
+  Panel* panel_view_;
 };
 
 }
 
=== modified file 'lockscreen/LockScreenShieldFactory.cpp'
--- lockscreen/LockScreenShieldFactory.cpp	2014-03-11 14:11:14 +0000
+++ lockscreen/LockScreenShieldFactory.cpp	2014-03-11 14:11:15 +0000
@@ -25,9 +25,9 @@
 namespace lockscreen
 {
 
-nux::ObjectPtr<AbstractShield> ShieldFactory::CreateShield(session::Manager::Ptr const& session_manager, int monitor, bool is_primary)
+nux::ObjectPtr<AbstractShield> ShieldFactory::CreateShield(session::Manager::Ptr const& session_manager, indicator::Indicators::Ptr const& indicators, int monitor, bool is_primary)
 {
-  return nux::ObjectPtr<Shield>(new Shield(session_manager, monitor, is_primary));
+  return nux::ObjectPtr<Shield>(new Shield(session_manager, indicators, monitor, is_primary));
 }
 
 }
 
=== modified file 'lockscreen/LockScreenShieldFactory.h'
--- lockscreen/LockScreenShieldFactory.h	2014-03-11 14:11:14 +0000
+++ lockscreen/LockScreenShieldFactory.h	2014-03-11 14:11:15 +0000
@@ -37,12 +37,12 @@
 
   virtual ~ShieldFactoryInterface() = default;
 
-  virtual nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, int monitor, bool is_primary) = 0;
+  virtual nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, int monitor, bool is_primary) = 0;
 };
 
 struct ShieldFactory : ShieldFactoryInterface
 {
-  nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, int monitor, bool is_primary) override;
+  nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, int monitor, bool is_primary) override;
 };
 
 }
 
=== modified file 'lockscreen/UserAuthenticatorPam.cpp'
--- lockscreen/UserAuthenticatorPam.cpp	2014-03-11 14:11:14 +0000
+++ lockscreen/UserAuthenticatorPam.cpp	2014-03-11 14:11:15 +0000
@@ -77,7 +77,7 @@
   if (num_msg <= 0)
     return PAM_CONV_ERR;
 
-  auto* tmp_response = g_new0(pam_response, num_msg);
+  auto* tmp_response = static_cast<pam_response*>(calloc(num_msg, sizeof(pam_response)));
 
   if (!tmp_response)
     return PAM_CONV_ERR;
 
=== modified file 'lockscreen/UserPromptView.cpp'
--- lockscreen/UserPromptView.cpp	2014-03-11 14:11:14 +0000
+++ lockscreen/UserPromptView.cpp	2014-03-11 14:11:15 +0000
@@ -39,7 +39,6 @@
 const RawPixel MSG_LAYOUT_MARGIN = 15_em;
 const RawPixel PROMPT_LAYOUT_MARGIN = 5_em;
 const int PROMPT_FONT_SIZE = 13;
-const int MESSAGE_FONT_SIZE = 11;
 
 nux::AbstractPaintLayer* CrateBackgroundLayer(int width, int height)
 {
@@ -267,7 +266,7 @@
 void UserPromptView::AddMessage(std::string const& message, nux::Color const& color)
 {
   auto* view = new unity::StaticCairoText("");
-  view->SetFont("Ubuntu "+std::to_string(MESSAGE_FONT_SIZE));
+  view->SetFont(Settings::Instance().font_name());
   view->SetTextColor(color);
   view->SetText(message);
 
 
=== modified file 'lockscreen/pch/lockscreen_pch.hh'
--- lockscreen/pch/lockscreen_pch.hh	2014-03-11 14:11:14 +0000
+++ lockscreen/pch/lockscreen_pch.hh	2014-03-11 14:11:15 +0000
@@ -28,4 +28,5 @@
 #include <security/pam_appl.h>
 
 #include <Nux/Nux.h>
-#include <UnityCore/SessionManager.h>
 \ No newline at end of file
+#include <UnityCore/SessionManager.h>
+#include <UnityCore/Indicators.h>
 \ No newline at end of file
 
=== modified file 'panel/PanelIndicatorEntryView.cpp'
--- panel/PanelIndicatorEntryView.cpp	2014-02-28 15:01:24 +0000
+++ panel/PanelIndicatorEntryView.cpp	2014-03-11 14:11:15 +0000
@@ -387,7 +387,7 @@
     pango_layout_get_pixel_size(layout, &extents.width, &extents.height);
     int y = (height - extents.height) / 2;
 
-    if (overlay_showing_)
+    if (overlay_showing_ && !IsActive())
     {
       cairo_move_to(cr, x, y);
       cairo_set_source_rgb(cr, 1.0f, 1.0f, 1.0f);
 
=== modified file 'panel/PanelIndicatorsView.cpp'
--- panel/PanelIndicatorsView.cpp	2014-02-25 02:38:26 +0000
+++ panel/PanelIndicatorsView.cpp	2014-03-11 14:11:15 +0000
@@ -42,6 +42,7 @@
 , opacity(1.0f, sigc::mem_fun(this, &PanelIndicatorsView::SetOpacity))
 , layout_(new nux::HLayout("", NUX_TRACKER_LOCATION))
 , monitor_(0)
+, overlay_showing_(false)
 {
   opacity.DisableNotifications();
   layout_->SetContentDistribution(nux::MAJOR_POSITION_END);
@@ -327,6 +328,9 @@
   auto view = new PanelIndicatorEntryView(entry, padding, type);
   AddEntryView(view, pos);
 
+  if (overlay_showing_)
+    view->OverlayShown();
+
   return view;
 }
 
@@ -368,12 +372,16 @@
 
 void PanelIndicatorsView::OverlayShown()
 {
+  overlay_showing_ = true;
+
   for (auto const& entry: entries_)
     entry.second->OverlayShown();
 }
 
 void PanelIndicatorsView::OverlayHidden()
 {
+  overlay_showing_ = false;
+
   for (auto const& entry: entries_)
     entry.second->OverlayHidden();
 }
 
=== modified file 'panel/PanelIndicatorsView.h'
--- panel/PanelIndicatorsView.h	2014-02-18 04:47:43 +0000
+++ panel/PanelIndicatorsView.h	2014-03-11 14:11:15 +0000
@@ -98,6 +98,7 @@
   Entries entries_;
 
   int monitor_;
+  bool overlay_showing_;
 
 private:
   bool SetOpacity(double& target, double const& new_value);
 
=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2014-02-27 05:45:23 +0000
+++ panel/PanelMenuView.cpp	2014-03-11 14:11:15 +0000
@@ -64,7 +64,6 @@
   , is_desktop_focused_(false)
   , last_active_view_(nullptr)
   , new_application_(nullptr)
-  , overlay_showing_(false)
   , switcher_showing_(false)
   , spread_showing_(false)
   , launcher_keynav_(false)
 
=== modified file 'panel/PanelMenuView.h'
--- panel/PanelMenuView.h	2014-02-27 05:45:23 +0000
+++ panel/PanelMenuView.h	2014-03-11 14:11:15 +0000
@@ -176,7 +176,6 @@
   nux::Geometry last_geo_;
   nux::Geometry title_geo_;
 
-  bool overlay_showing_;
   bool switcher_showing_;
   bool spread_showing_;
   bool launcher_keynav_;
 
=== modified file 'panel/PanelView.cpp'
--- panel/PanelView.cpp	2014-03-11 14:11:14 +0000
+++ panel/PanelView.cpp	2014-03-11 14:11:15 +0000
@@ -48,7 +48,7 @@
 
 NUX_IMPLEMENT_OBJECT_TYPE(PanelView);
 
-PanelView::PanelView(MockableBaseWindow* parent, menu::Manager::Ptr const& menus, bool lockscreen_mode, NUX_FILE_LINE_DECL)
+PanelView::PanelView(MockableBaseWindow* parent, menu::Manager::Ptr const& menus, NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
   , parent_(parent)
   , remote_(menus->Indicators())
@@ -59,7 +59,6 @@
   , opacity_(1.0f)
   , monitor_(0)
   , stored_dash_width_(0)
-  , lockscreen_mode_(lockscreen_mode)
   , bg_effect_helper_(this)
 {
   auto& wm = WindowManager::Default();
@@ -98,22 +97,15 @@
   menu_view_->EnableDropdownMenu(true, remote_);
   AddPanelView(menu_view_, 0);
 
-  if (lockscreen_mode_)
-    menu_view_->SetVisible(false);
-
   SetCompositionLayout(layout_);
 
-  tray_ = nullptr;
-  if (!lockscreen_mode_)
-  {
-    tray_ = new PanelTray(monitor_);
-    layout_->AddView(tray_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
-    AddChild(tray_);
-  }
+  tray_ = new PanelTray(monitor_);
+  layout_->AddView(tray_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  AddChild(tray_);
 
   indicators_ = new PanelIndicatorsView();
   indicators_->SetMonitor(monitor_);
-  AddPanelView(indicators_, lockscreen_mode_ ? 1 : 0);
+  AddPanelView(indicators_, 0);
 
   for (auto const& object : remote_->GetIndicators())
     OnObjectAdded(object);
@@ -301,7 +293,7 @@
     {
       bg_blur_texture_ = bg_effect_helper_.GetBlurRegion();
     }
-    else if(!lockscreen_mode_)
+    else
     {
       bg_blur_texture_ = bg_effect_helper_.GetRegion();
     }
 
=== modified file 'panel/PanelView.h'
--- panel/PanelView.h	2014-03-11 14:11:14 +0000
+++ panel/PanelView.h	2014-02-25 22:10:53 +0000
@@ -51,7 +51,7 @@
 {
   NUX_DECLARE_OBJECT_TYPE(PanelView, nux::View);
 public:
-  PanelView(MockableBaseWindow* parent, menu::Manager::Ptr const&, bool lockscreen_mode_ = false, NUX_FILE_LINE_PROTO);
+  PanelView(MockableBaseWindow* parent, menu::Manager::Ptr const&, NUX_FILE_LINE_PROTO);
   ~PanelView();
 
   MockableBaseWindow* GetParent() const
@@ -140,7 +140,6 @@
   float opacity_;
   int monitor_;
   int stored_dash_width_;
-  bool lockscreen_mode_;
 
   connection::Manager on_indicator_updated_connections_;
   connection::Manager maximized_opacity_toggle_connections_;
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-03-11 14:11:14 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-03-11 14:11:15 +0000
@@ -338,6 +338,7 @@
      optionSetShowDesktopKeyInitiate(boost::bind(&UnityScreen::showDesktopKeyInitiate, this, _1, _2, _3));
      optionSetPanelFirstMenuInitiate(boost::bind(&UnityScreen::showPanelFirstMenuKeyInitiate, this, _1, _2, _3));
      optionSetPanelFirstMenuTerminate(boost::bind(&UnityScreen::showPanelFirstMenuKeyTerminate, this, _1, _2, _3));
+     optionSetPanelFirstMenuNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetAutomaximizeValueNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetDashTapDurationNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetAltTabTimeoutNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
@@ -2582,6 +2583,15 @@
   WindowManager::Default().close_window_key = std::make_pair(modifiers, keysym);
 }
 
+void UnityScreen::UpdateActivateIndicatorsKey()
+{
+  CompAction::KeyBinding const& keybind = optionGetPanelFirstMenu().key();
+  KeySym keysym = XkbKeycodeToKeysym(screen->dpy(), keybind.keycode(), 0, 0);
+  unsigned modifiers = CompizModifiersToNux(keybind.modifiers());
+
+  WindowManager::Default().activate_indicators_key = std::make_pair(modifiers, keysym);
+}
+
 bool UnityScreen::initPluginActions()
 {
   PluginAdapter& adapter = PluginAdapter::Default();
@@ -2810,12 +2820,21 @@
 
   GLWindowPaintAttrib wAttrib = attrib;
 
-  if (window->type() != CompWindowTypePopupMenuMask)
+  if (uScreen->lockscreen_controller_->IsLocked())
   {
-    if (uScreen->lockscreen_controller_->IsShielded())
+    if (window->type() != CompWindowTypePopupMenuMask ||
+        !uScreen->lockscreen_controller_->HasOpenMenu())
     {
-      wAttrib.opacity = 0;
-      return gWindow->glPaint(wAttrib, matrix, region, mask);
+      // For some reasons PAINT_WINDOW_NO_CORE_INSTANCE_MASK doesn't work here
+      // (well, it works too much, as it applies to menus too), so we need
+      // to paint the windows at the proper opacity, overriding any other
+      // paint plugin (animation, fade?) that might interfere with us.
+      wAttrib.opacity = COMPIZ_COMPOSITE_OPAQUE * (1.0f - uScreen->lockscreen_controller_->Opacity());
+      int old_index = gWindow->glPaintGetCurrentIndex();
+      gWindow->glPaintSetCurrentIndex(MAXSHORT);
+      bool ret = gWindow->glPaint(wAttrib, matrix, region, mask);
+      gWindow->glPaintSetCurrentIndex(old_index);
+      return ret;
     }
   }
 
@@ -3502,6 +3521,9 @@
     case UnityshellOptions::LockScreenType:
       lockscreen_settings_.lockscreen_type = static_cast<lockscreen::Type>(optionGetLockScreenType());
       break;
+    case UnityshellOptions::PanelFirstMenu:
+      UpdateActivateIndicatorsKey();
+      break;
     default:
       break;
   }
@@ -3644,11 +3666,13 @@
 
   // Setup Session Controller
   auto manager = std::make_shared<session::GnomeManager>();
+  session_dbus_manager_ = std::make_shared<session::DBusManager>(manager);
   session_controller_ = std::make_shared<session::Controller>(manager);
   AddChild(session_controller_.get());
 
   // Setup Lockscreen Controller
   lockscreen_controller_ = std::make_shared<lockscreen::Controller>(manager);
+  UpdateActivateIndicatorsKey();
 
   auto on_launcher_size_changed = [this] (nux::Area* area, int w, int h) {
     /* The launcher geometry includes 1px used to draw the right margin
 
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2014-03-11 14:11:14 +0000
+++ plugins/unityshell/src/unityshell.h	2014-03-11 14:11:15 +0000
@@ -67,6 +67,7 @@
 #include "ScreenIntrospection.h"
 #include "SwitcherController.h"
 #include "SessionController.h"
+#include "SessionDBusManager.h"
 #include "SpreadFilter.h"
 #include "UBusWrapper.h"
 #include "UnityshellPrivate.h"
@@ -299,6 +300,7 @@
   unsigned XModifiersToNux(unsigned input) const;
 
   void UpdateCloseWindowKey(CompAction::KeyBinding const&);
+  void UpdateActivateIndicatorsKey();
 
   bool getMipmap () override { return false; }
 
@@ -329,6 +331,7 @@
   switcher::Controller::Ptr switcher_controller_;
   hud::Controller::Ptr      hud_controller_;
   shortcut::Controller::Ptr shortcut_controller_;
+  session::DBusManager::Ptr session_dbus_manager_;
   session::Controller::Ptr  session_controller_;
   std::shared_ptr<lockscreen::Controller> lockscreen_controller_;
   debug::DebugDBusInterface debugger_;
 
=== modified file 'services/panel-service.c'
--- services/panel-service.c	2014-03-11 14:11:14 +0000
+++ services/panel-service.c	2014-03-11 14:11:15 +0000
@@ -1327,7 +1327,7 @@
       IndicatorNg *indicator;
 
       filename = g_build_filename (INDICATOR_SERVICE_DIR, name, NULL);
-      indicator = indicator_ng_new_for_profile (filename, !lockscreen_mode ? "desktop" : "desktop_greeter", &error);
+      indicator = indicator_ng_new_for_profile (filename, !lockscreen_mode ? "desktop" : "desktop_lockscreen", &error);
       if (indicator)
         {
           load_indicator (self, INDICATOR_OBJECT (indicator), name);
 
=== modified file 'shutdown/CMakeLists.txt'
--- shutdown/CMakeLists.txt	2013-02-17 23:55:54 +0000
+++ shutdown/CMakeLists.txt	2014-03-11 14:11:15 +0000
@@ -19,6 +19,7 @@
 set (SHUTDOWN_SOURCES
      SessionButton.cpp
      SessionController.cpp
+     SessionDBusManager.cpp
      SessionView.cpp
      )
 
 
=== added file 'shutdown/SessionDBusManager.cpp'
--- shutdown/SessionDBusManager.cpp	1970-01-01 00:00:00 +0000
+++ shutdown/SessionDBusManager.cpp	2014-03-11 14:11:15 +0000
@@ -0,0 +1,180 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marco Trevisan <[e-mail]>
+ */
+
+#include "SessionDBusManager.h"
+
+namespace unity
+{
+namespace session
+{
+namespace dbus
+{
+const std::string NAME = "com.canonical.Unity";
+const std::string INTERFACE = "com.canonical.Unity.Session";
+const std::string OBJECT_PATH = "/com/canonical/Unity/Session";
+const std::string INTROSPECTION_XML =
+R"(<node>
+  <interface name="com.canonical.Unity.Session">
+    <method name="RealName">
+      <arg type="s" direction="out" name="realname" />
+    </method>
+    <method name="UserName">
+      <arg type="s" direction="out" name="username" />
+    </method>
+    <method name="HostName">
+      <arg type="s" direction="out" name="hostname" />
+    </method>
+    <method name="Lock" />
+    <method name="Logout" />
+    <method name="RequestLogout" />
+    <method name="Reboot" />
+    <method name="RequestReboot" />
+    <method name="Shutdown" />
+    <method name="RequestShutdown" />
+    <method name="Suspend" />
+    <method name="Hibernate" />
+    <method name="CancelAction" />
+    <method name="CanShutdown">
+      <arg type="b" direction="out" name="canshutdown" />
+    </method>
+    <method name="CanSuspend">
+      <arg type="b" direction="out" name="cansuspend" />
+    </method>
+    <method name="CanHibernate">
+      <arg type="b" direction="out" name="canhibernate" />
+    </method>
+
+    <signal name="LockRequested" />
+    <signal name="Locked" />
+    <signal name="UnlockRequested" />
+    <signal name="Unlocked" />
+    <signal name="LogoutRequested">
+      <arg type="b" name="have_inhibitors" />
+    </signal>
+    <signal name="RebootRequested">
+      <arg type="b" name="have_inhibitors" />
+    </signal>
+    <signal name="ShutdownRequested">
+      <arg type="b" name="have_inhibitors" />
+    </signal>
+  </interface>
+</node>)";
+}
+
+DBusManager::DBusManager(session::Manager::Ptr const& session)
+  : session_(session)
+  , server_(dbus::NAME)
+{
+  server_.AddObjects(dbus::INTROSPECTION_XML, dbus::OBJECT_PATH);
+  object_ = server_.GetObject(dbus::INTERFACE);
+  object_->SetMethodsCallsHandler([this] (std::string const& method, GVariant*) -> GVariant* {
+    if (method == "RealName")
+    {
+      return g_variant_new("(s)", session_->RealName().c_str());
+    }
+    else if (method == "UserName")
+    {
+      return g_variant_new("(s)", session_->UserName().c_str());
+    }
+    else if (method == "HostName")
+    {
+      return g_variant_new("(s)", session_->HostName().c_str());
+    }
+    else if (method == "Lock")
+    {
+      session_->LockScreen();
+    }
+    else if (method == "Logout")
+    {
+      session_->Logout();
+    }
+    else if (method == "RequestLogout")
+    {
+      session_->logout_requested.emit(false);
+    }
+    else if (method == "Reboot")
+    {
+      session_->Reboot();
+    }
+    else if (method == "RequestReboot")
+    {
+      session_->reboot_requested.emit(false);
+    }
+    else if (method == "Shutdown")
+    {
+      session_->Shutdown();
+    }
+    else if (method == "RequestShutdown")
+    {
+      session_->shutdown_requested.emit(false);
+    }
+    else if (method == "Suspend")
+    {
+      session_->Suspend();
+    }
+    else if (method == "Hibernate")
+    {
+      session_->Hibernate();
+    }
+    else if (method == "CancelAction")
+    {
+      session_->CancelAction();
+      session_->cancel_requested.emit();
+    }
+    else if (method == "CanShutdown")
+    {
+      return g_variant_new("(b)", session_->CanShutdown() != FALSE);
+    }
+    else if (method == "CanSuspend")
+    {
+      return g_variant_new("(b)", session_->CanSuspend() != FALSE);
+    }
+    else if (method == "CanHibernate")
+    {
+      return g_variant_new("(b)", session_->CanHibernate() != FALSE);
+    }
+
+    return nullptr;
+  });
+
+  connections_.Add(session_->lock_requested.connect([this] {
+    object_->EmitSignal("LockRequested");
+  }));
+  connections_.Add(session_->locked.connect([this] {
+    object_->EmitSignal("Locked");
+  }));
+  connections_.Add(session_->unlock_requested.connect([this] {
+    object_->EmitSignal("UnlockRequested");
+  }));
+  connections_.Add(session_->unlocked.connect([this] {
+    object_->EmitSignal("Unlocked");
+  }));
+  connections_.Add(session_->logout_requested.connect([this] (bool inhibitors) {
+    object_->EmitSignal("LogoutRequested", g_variant_new("(b)", inhibitors));
+  }));
+  connections_.Add(session_->reboot_requested.connect([this] (bool inhibitors) {
+    object_->EmitSignal("RebootRequested", g_variant_new("(b)", inhibitors));
+  }));
+  connections_.Add(session_->shutdown_requested.connect([this] (bool inhibitors) {
+    object_->EmitSignal("ShutdownRequested", g_variant_new("(b)", inhibitors));
+  }));
+}
+
+} // session
+} // unity
 
=== added file 'shutdown/SessionDBusManager.h'
--- shutdown/SessionDBusManager.h	1970-01-01 00:00:00 +0000
+++ shutdown/SessionDBusManager.h	2014-03-11 14:11:15 +0000
@@ -0,0 +1,50 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Marco Trevisan <[e-mail]>
+ */
+
+#ifndef UNITYSHELL_SESSION_DBUS_MANAGER_H
+#define UNITYSHELL_SESSION_DBUS_MANAGER_H
+
+#include <UnityCore/ConnectionManager.h>
+#include <UnityCore/GLibDBusServer.h>
+#include <UnityCore/SessionManager.h>
+
+namespace unity
+{
+namespace session
+{
+
+class DBusManager
+{
+public:
+  typedef std::shared_ptr<DBusManager> Ptr;
+
+  DBusManager(session::Manager::Ptr const& manager);
+  virtual ~DBusManager() = default;
+
+private:
+  session::Manager::Ptr session_;
+  glib::DBusServer server_;
+  glib::DBusObject::Ptr object_;
+  connection::Manager connections_;
+};
+
+} // session
+} // unity
+
+#endif
 
=== modified file 'shutdown/StandaloneSession.cpp'
--- shutdown/StandaloneSession.cpp	2013-03-07 22:30:02 +0000
+++ shutdown/StandaloneSession.cpp	2014-03-11 14:11:15 +0000
@@ -38,6 +38,7 @@
 
   std::string RealName() const { return "Marco Trevisan"; }
   std::string UserName() const { return "marco"; }
+  std::string HostName() const { return "tricky"; }
 
   void LockScreen() { std::cout << "LockScreen" << std::endl; }
   void Logout() { std::cout << "Logout" << std::endl; }
 
=== modified file 'tests/data/external.gschema.xml'
--- tests/data/external.gschema.xml	2014-03-11 14:11:14 +0000
+++ tests/data/external.gschema.xml	2014-03-11 14:11:15 +0000
@@ -57,6 +57,9 @@
     <key type="s" name="logo">
       <default>'/usr/share/unity-greeter/logo.png'</default>
     </key>
+    <key type="s" name="font-name">
+      <default>'Ubuntu 11'</default>
+    </key>
     <key type="s" name="background">
       <default>'/usr/share/backgrounds/warty-final-ubuntu.png'</default>
     </key>
@@ -69,5 +72,8 @@
     <key type="b" name="draw-grid">
       <default>true</default>
     </key>
+    <key type="b" name="show-hostname">
+      <default>true</default>
+    </key>
   </schema>
 </schemalist>
 
=== modified file 'tests/test_lockscreen_controller.cpp'
--- tests/test_lockscreen_controller.cpp	2014-03-11 14:11:14 +0000
+++ tests/test_lockscreen_controller.cpp	2014-03-11 14:11:15 +0000
@@ -62,11 +62,20 @@
 
 }
 
+struct MockShield : AbstractShield
+{
+  MockShield()
+    : AbstractShield(nullptr, nullptr, 0, false)
+  {}
+
+  MOCK_CONST_METHOD0(IsIndicatorOpen, bool());
+};
+
 struct ShieldFactoryMock : ShieldFactoryInterface
 {
-  nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, int, bool) override
+  nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, indicator::Indicators::Ptr const&, int, bool) override
   {
-    return nux::ObjectPtr<AbstractShield>(new AbstractShield(nullptr, 0, false));
+    return nux::ObjectPtr<AbstractShield>(new MockShield());
   }
 };
 
 
=== modified file 'tests/test_mock_session_manager.h'
--- tests/test_mock_session_manager.h	2013-03-07 21:26:57 +0000
+++ tests/test_mock_session_manager.h	2014-03-11 14:11:15 +0000
@@ -31,6 +31,7 @@
 
   MOCK_CONST_METHOD0(RealName, std::string());
   MOCK_CONST_METHOD0(UserName, std::string());
+  MOCK_CONST_METHOD0(HostName, std::string());
 
   MOCK_METHOD0(LockScreen, void());
   MOCK_METHOD0(Logout, void());
 
=== modified file 'unity-shared/WindowManager.h'
--- unity-shared/WindowManager.h	2014-02-17 21:17:51 +0000
+++ unity-shared/WindowManager.h	2014-03-11 14:11:15 +0000
@@ -166,6 +166,7 @@
 
   // Nux Modifiers, Nux Keycode (= X11 KeySym)
   nux::Property<std::pair<unsigned, unsigned>> close_window_key;
+  nux::Property<std::pair<unsigned, unsigned>> activate_indicators_key;
   nux::Property<nux::Color> average_color;
 
   // Signals