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

[Marco Trevisan (Treviño)]

Lockscreen: Multimonitor support, use greeter settings and don't paint popup windows

In detail:
 - Use proper fonts for text input
 - Make text cursor to blink as expected
   (needs lp:~3v1n0/nux/textentry-toggle-cursor-visibility)
 - Use bullet as password char
 - Support multi-monitor correctly, switching view on mouse movement (as the greeter
   does)
 - Fixed lockscreen not showing on newly attached monitors
 - Never paint windows that might popup under the lockscreen (such as tooltips or
   notifications)
 - Use unity greeter gsettings values for painting the Background (support color, or
   disable user bg)
 - Don't lock guest sessions

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3732
http://jenkins.qa.ubuntu.com/job/unity-ci/766/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/302/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/298/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/300/console

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

review: Needs Fixing (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Code looks good to me, and unit tests are passing :)

review: Approve

[Andrea Azzarone (azzar1)]

1070 - auto* tmp_response = static_cast<pam_response*>(malloc(num_msg * sizeof(pam_response)));
1071 + auto* tmp_response = g_new0(pam_response, num_msg);

Please revert. Pam specs says that you need to can use just malloc. I know that internall g_new0 uses it but we don't know in future.

review: Needs Fixing

=== modified file 'UnityCore/DBusIndicators.cpp'
--- UnityCore/DBusIndicators.cpp	2014-03-06 21:47:27 +0000
+++ UnityCore/DBusIndicators.cpp	2014-03-06 21:47:28 +0000
@@ -36,8 +36,8 @@
 
 namespace
 {
-const std::string SERVICE_NAME_DESKTOP("com.canonical.Unity.Panel.ServiceDesktop");
-const std::string SERVICE_NAME_LOCKSCREEN("com.canonical.Unity.Panel.ServiceLockscreen");
+const std::string SERVICE_NAME_DESKTOP("com.canonical.Unity.Panel.Service.Desktop");
+const std::string SERVICE_NAME_LOCKSCREEN("com.canonical.Unity.Panel.Service.LockScreen");
 const std::string SERVICE_PATH("/com/canonical/Unity/Panel/Service");
 const std::string SERVICE_IFACE("com.canonical.Unity.Panel.Service");
 } // anonymous namespace

=== modified file 'UnityCore/GnomeSessionManager.cpp'
--- UnityCore/GnomeSessionManager.cpp	2014-03-06 21:47:27 +0000
+++ UnityCore/GnomeSessionManager.cpp	2014-03-06 21:47:28 +0000
@@ -89,10 +89,9 @@
 
   {
     const char* session_id = test_mode_ ? "id0" : g_getenv("XDG_SESSION_ID");
-    session_id = session_id ? session_id : "";
 
     login_proxy_ = std::make_shared<glib::DBusProxy>(test_mode_ ? testing::DBUS_NAME : "org.freedesktop.login1",
-                                                     std::string("/org/freedesktop/login1/session/") + session_id,
+                                                     "/org/freedesktop/login1/session/" + glib::gchar_to_string(session_id),
                                                      "org.freedesktop.login1.Session",
                                                      test_mode_ ? G_BUS_TYPE_SESSION : G_BUS_TYPE_SYSTEM);
 
@@ -394,9 +393,7 @@
 
 std::string GnomeManager::RealName() const
 {
-  const char* name = g_get_real_name();
-
-  std::string real_name(name ? name : "");
+  std::string real_name = glib::gchar_to_string(g_get_real_name());
 
   if (real_name == "Unknown")
     real_name.clear();
@@ -406,9 +403,12 @@
 
 std::string GnomeManager::UserName() const
 {
-  const char* name = g_get_user_name();
+  return glib::gchar_to_string(g_get_user_name());
+}
 
-  return name ? name : "";
+std::string GnomeManager::HostName() const
+{
+  return glib::gchar_to_string(g_get_host_name());
 }
 
 void GnomeManager::LockScreen()
@@ -416,6 +416,11 @@
   impl_->EnsureCancelPendingAction();
 
   // FIXME (andy) we should ask gnome-session to emit the logind signal
+  if (UserName().find("guest-") == 0)
+  {
+    LOG_INFO(logger) << "Impossible to lock a guest session";
+    return;
+  }
   lock_requested.emit();
 }
 

=== modified file 'UnityCore/GnomeSessionManager.h'
--- UnityCore/GnomeSessionManager.h	2013-03-05 20:21:29 +0000
+++ UnityCore/GnomeSessionManager.h	2014-03-06 21:47:28 +0000
@@ -35,6 +35,7 @@
 
   std::string RealName() const;
   std::string UserName() const;
+  std::string HostName() const;
 
   void LockScreen();
   void Logout();

=== modified file 'UnityCore/SessionManager.h'
--- UnityCore/SessionManager.h	2014-03-06 21:47:27 +0000
+++ UnityCore/SessionManager.h	2014-03-06 21:47:28 +0000
@@ -38,6 +38,7 @@
 
   virtual std::string RealName() const = 0;
   virtual std::string UserName() const = 0;
+  virtual std::string HostName() const = 0;
 
   virtual void LockScreen() = 0;
   virtual void Logout() = 0;
@@ -56,9 +57,9 @@
   Manager(const Manager&) = delete;
   Manager& operator=(const Manager&) = delete;
 
-  sigc::signal<void, bool /* inhibitors */> logout_requested;
   sigc::signal<void> lock_requested;
   sigc::signal<void> unlock_requested;
+  sigc::signal<void, bool /* inhibitors */> logout_requested;
   sigc::signal<void, bool /* inhibitors */> reboot_requested;
   sigc::signal<void, bool /* inhibitors */> shutdown_requested;
 

=== modified file 'debian/control'
--- debian/control	2014-03-06 21:47:27 +0000
+++ debian/control	2014-03-06 21:47:28 +0000
@@ -9,17 +9,14 @@
                dh-migrations,
                dh-translations (>= 94),
                google-mock (>= 1.6.0+svn437),
-               google-mock,
                gsettings-desktop-schemas-dev,
                gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140219),
                intltool (>= 0.35.0),
                libatk1.0-dev,
                libbamf3-dev (>= 0.5.0+13.10.20130731),
                libboost-dev,
-               libboost-serialization-dev,
                libcairo2-dev,
                libdbus-1-dev,
-               libcompizconfig0-dev (>= 1:0.9.11),
                libdbusmenu-glib-dev (>= 0.3.91),
                libdee-dev (>= 1.2.6),
                libgee-dev (>= 0.5.0),
@@ -27,7 +24,6 @@
                libgl1-mesa-dri,
                libglib2.0-dev (>= 2.39.1),
                libgnome-desktop-3-dev,
-               libgrail-dev (>= 1.0.20),
                libgtest-dev,
                libgtk-3-dev (>= 3.1),
                libido3-0.1-dev (>= 13.10.0),
@@ -46,7 +42,6 @@
                libunique-dev,
                libunity-dev (>= 7.1.0),
                libunity-misc-dev (>= 4.0.4),
-               libunity-scopes-json-def-desktop,
                libupstart-dev,
                libxcb-icccm4-dev,
                libxfixes-dev (>= 1:5.0.1-1),
@@ -79,6 +74,7 @@
          nux-tools,
          dconf-cli,
          unity-asset-pool (>= 0.8.18),
+         unity-greeter,
          bamfdaemon,
          libxfixes3 (>= 1:5.0.1-1),
          libxi6 (>= 2:1.7.1.901),

=== modified file 'lockscreen/BackgroundSettings.cpp'
--- lockscreen/BackgroundSettings.cpp	2014-03-06 21:47:27 +0000
+++ lockscreen/BackgroundSettings.cpp	2014-03-06 21:47:28 +0000
@@ -17,22 +17,31 @@
 * Authored by: Andrea Azzarone <[e-mail]>
 */
 
+#include <Nux/Nux.h>
 #include "BackgroundSettings.h"
 
 #include <libgnome-desktop/gnome-bg.h>
 
 #include "LockScreenSettings.h"
-#include "unity-shared/GtkTexture.h"
+#include "unity-shared/CairoTexture.h"
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/UScreen.h"
 
-namespace unity 
+namespace unity
 {
 namespace lockscreen
 {
 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; }
 }
 
 BackgroundSettings::BackgroundSettings()
@@ -45,32 +54,72 @@
 BackgroundSettings::~BackgroundSettings()
 {}
 
-BaseTexturePtr BackgroundSettings::GetBackgroundTexture(int monitor,
-                                                        bool draw_grid,
-                                                        bool draw_logo)
+BaseTexturePtr BackgroundSettings::GetBackgroundTexture(int monitor)
 {
-  nux::Geometry geo = UScreen::GetDefault()->GetMonitorGeometry(monitor);
-
-  cairo_surface_t* cairo_surface = gnome_bg_create_surface(gnome_bg_, gdk_get_default_root_window(),
-                                                           geo.width, geo.height, FALSE);
-  cairo_t* c = cairo_create(cairo_surface);
-
-  if (draw_logo)
-  {
+  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;
+
+  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)
+  {
+    bg_surface = gnome_bg_create_surface(gnome_bg_, gdk_get_default_root_window(), geo.width, geo.height, FALSE);
+  }
+  else
+  {
+    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);
+    }
+  }
+
+  if (bg_surface)
+  {
+    cairo_set_source_surface(c, bg_surface, 0, 0);
+    cairo_paint(c);
+    cairo_surface_destroy(bg_surface);
+  }
+  else
+  {
+    nux::Color bg_color(glib::String(g_settings_get_string(greeter_settings, BACKGROUND_COLOR_KEY.c_str())).Str());
+    cairo_set_source_rgb(c, bg_color.red, bg_color.green, bg_color.blue);
+    cairo_paint(c);
+  }
+
+  {
+    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) + panel::Style::Instance().PanelHeight(monitor);
-
-    cairo_save(c);
-
-    int height = 43;
-    int x = grid_x_offset;
-    int y = grid_y_offset + Settings::GRID_SIZE * (geo.height / Settings::GRID_SIZE - 1) - height;
-    cairo_translate (c, x, y);
-
-    cairo_surface_t* logo_surface = cairo_image_surface_create_from_png ("/usr/share/unity-greeter/logo.png");
-    cairo_set_source_surface(c, logo_surface, 0, 0);
-    cairo_paint_with_alpha(c, 0.5);
-    cairo_restore(c);
+    int grid_y_offset = GetGridOffset(geo.height);
+
+    if (logo && !logo.Str().empty())
+    {
+      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);
+      }
+    }
   }
 
   if (draw_grid)
@@ -78,10 +127,10 @@
     int width = geo.width;
     int height = geo.height;
     int grid_x_offset = GetGridOffset(width);
-    int grid_y_offset = GetGridOffset(height) + panel::Style::Instance().PanelHeight(monitor);
+    int grid_y_offset = GetGridOffset(height);
 
     // overlay grid
-    cairo_surface_t* overlay_surface = cairo_surface_create_similar(cairo_surface,
+    cairo_surface_t* overlay_surface = cairo_surface_create_similar(cairo_graphics.GetSurface(),
                                                                     CAIRO_CONTENT_COLOR_ALPHA,
                                                                     Settings::GRID_SIZE,
                                                                     Settings::GRID_SIZE);
@@ -114,19 +163,7 @@
     cairo_destroy(oc);
   }
 
-  GdkPixbuf* gdk_pixbuf = gdk_pixbuf_get_from_surface(cairo_surface,
-                                                      0, 0, 
-                                                      geo.width, geo.height);
-
-  cairo_destroy(c);
-  cairo_surface_destroy(cairo_surface);
-
-  return texture_ptr_from_gdk_graphics(nux::GdkGraphics(gdk_pixbuf));
-}
-
-int BackgroundSettings::GetGridOffset(int size)
-{
-  return (size % Settings::GRID_SIZE) / 2;
+  return texture_ptr_from_cairo_graphics(cairo_graphics);
 }
 
 } // lockscreen

=== modified file 'lockscreen/BackgroundSettings.h'
--- lockscreen/BackgroundSettings.h	2014-03-06 21:47:27 +0000
+++ lockscreen/BackgroundSettings.h	2014-03-06 21:47:28 +0000
@@ -20,14 +20,18 @@
 #ifndef UNITY_BACKGROUND_SETTINGS_H
 #define UNITY_BACKGROUND_SETTINGS_H
 
-#include <Nux/Nux.h>
+#include <NuxCore/ObjectPtr.h>
 #include <UnityCore/GLibWrapper.h>
 
+namespace nux
+{
+class BaseTexture;
+}
+
 class _GnomeBG;
 
-namespace unity 
+namespace unity
 {
-
 typedef nux::ObjectPtr<nux::BaseTexture> BaseTexturePtr;
 
 namespace lockscreen
@@ -39,13 +43,9 @@
   BackgroundSettings();
   ~BackgroundSettings();
 
-  BaseTexturePtr GetBackgroundTexture(int monitor,
-  	                                  bool draw_grid,
-  	                                  bool draw_logo);
+  BaseTexturePtr GetBackgroundTexture(int monitor);
 
 private:
-  static int GetGridOffset(int size);
-
   glib::Object<_GnomeBG> gnome_bg_;
 };
 

=== added file 'lockscreen/LockScreenAbstractShield.h'
--- lockscreen/LockScreenAbstractShield.h	1970-01-01 00:00:00 +0000
+++ lockscreen/LockScreenAbstractShield.h	2014-03-06 21:47:28 +0000
@@ -0,0 +1,55 @@
+// -*- 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_ABSTRACT_SHIELD_H
+#define UNITY_LOCKSCREEN_ABSTRACT_SHIELD_H
+
+#include <NuxCore/Property.h>
+#include <UnityCore/SessionManager.h>
+
+#include "unity-shared/MockableBaseWindow.h"
+
+namespace unity
+{
+namespace lockscreen
+{
+
+class AbstractShield : public MockableBaseWindow
+{
+public:
+  AbstractShield(session::Manager::Ptr const& session, int monitor_num, bool is_primary)
+    : MockableBaseWindow("Unity Lockscreen")
+    , primary(is_primary)
+    , monitor(monitor_num)
+    , session_manager_(session)
+  {}
+
+  nux::Property<bool> primary;
+  nux::Property<int> monitor;
+
+  sigc::signal<void, int, int> grab_motion;
+
+protected:
+  session::Manager::Ptr session_manager_;
+};
+
+} // lockscreen
+} // unity
+
+#endif // UNITY_LOCKSCREEN_ABSTRACT_SHIELD_H

=== modified file 'lockscreen/LockScreenController.cpp'
--- lockscreen/LockScreenController.cpp	2014-03-06 21:47:27 +0000
+++ lockscreen/LockScreenController.cpp	2014-03-06 21:47:28 +0000
@@ -19,6 +19,7 @@
 
 #include "LockScreenController.h"
 
+#include "LockScreenShield.h"
 #include "LockScreenSettings.h"
 #include "unity-shared/AnimationUtils.h"
 #include "unity-shared/UScreen.h"
@@ -48,10 +49,12 @@
   , fade_animator_(FADE_DURATION)
   , test_mode_(test_mode)
 {
-  auto* uscreen = UScreen::GetDefault();
-  uscreen->changed.connect(sigc::mem_fun(this, &Controller::OnUScreenChanged));
+  uscreen_connection_ = UScreen::GetDefault()->changed.connect([this] (int, std::vector<nux::Geometry> const& monitors) {
+    EnsureShields(monitors);
+  });
+  uscreen_connection_->block();
 
-  session_manager_->lock_requested.connect(sigc::mem_fun(this,&Controller::OnLockRequested));
+  session_manager_->lock_requested.connect(sigc::mem_fun(this, &Controller::OnLockRequested));
   session_manager_->unlock_requested.connect(sigc::mem_fun(this, &Controller::OnUnlockRequested));
 
   fade_animator_.updated.connect([this](double value) {
@@ -60,32 +63,78 @@
     });
   });
 
-  fade_animator_.finished.connect([this]() {
-    if (fade_animator_.GetCurrentValue() == 0.0f)
+  fade_animator_.finished.connect([this] {
+    if (animation::GetDirection(fade_animator_) == animation::Direction::BACKWARD)
+    {
+      motion_connection_->disconnect();
+      uscreen_connection_->block();
       shields_.clear();
+
+      if (Settings::Instance().lockscreen_type() == Type::UNITY)
+        upstart_wrapper_->Emit("desktop-unlock");
+    }
   });
 }
 
-void Controller::OnUScreenChanged(int primary, std::vector<nux::Geometry> const& monitors)
+void Controller::OnPrimaryShieldMotion(int x, int y)
 {
-  if (IsLocked())
-    EnsureShields(primary, monitors);
+  if (!primary_shield_->GetAbsoluteGeometry().IsPointInside(x, y))
+  {
+    for (auto const& shield : shields_)
+    {
+      if (!shield->GetAbsoluteGeometry().IsPointInside(x, y))
+        continue;
+
+      primary_shield_->primary = false;
+      primary_shield_ = shield;
+      shield->primary = true;
+      auto move_cb = sigc::mem_fun(this, &Controller::OnPrimaryShieldMotion);
+      motion_connection_ = shield->grab_motion.connect(move_cb);
+      break;
+    }
+  }
 }
 
-void Controller::EnsureShields(int primary, std::vector<nux::Geometry> const& monitors)
+void Controller::EnsureShields(std::vector<nux::Geometry> const& monitors)
 {
   int num_monitors = monitors.size();
   int shields_size = shields_.size();
+  bool unity_mode = (Settings::Instance().lockscreen_type() == Type::UNITY);
+  int primary = unity_mode ? UScreen::GetDefault()->GetMonitorWithMouse() : -1;
+
+  shields_.resize(num_monitors);
 
   for (int i = 0; i < num_monitors; ++i)
   {
+    auto& shield = shields_[i];
+    bool is_new = false;
+
     if (i >= shields_size)
-      shields_.push_back(shield_factory_->CreateShield(session_manager_, i, i == primary));
-
-    shields_[i]->SetGeometry(monitors.at(i));
-  }
-
-  shields_.resize(num_monitors);
+    {
+      shield = shield_factory_->CreateShield(session_manager_, i, i == primary);
+      is_new = true;
+    }
+
+    shield->SetGeometry(monitors[i]);
+    shield->SetMinMaxSize(monitors[i].width, monitors[i].height);
+    shield->primary = (i == primary);
+    shield->monitor = i;
+
+    if (is_new && fade_animator_.GetCurrentValue() > 0)
+    {
+      shield->SetOpacity(fade_animator_.GetCurrentValue());
+      shield->ShowWindow(true);
+      shield->PushToFront();
+    }
+  }
+
+  if (unity_mode)
+  {
+    primary_shield_ = shields_[primary];
+    primary_shield_->primary = true;
+    auto move_cb = sigc::mem_fun(this, &Controller::OnPrimaryShieldMotion);
+    motion_connection_ = primary_shield_->grab_motion.connect(move_cb);
+  }
 }
 
 void Controller::OnLockRequested()
@@ -93,8 +142,6 @@
   if (IsLocked())
     return;
 
-  upstart_wrapper_->Emit("desktop-lock");
-
   auto lockscreen_type = Settings::Instance().lockscreen_type();
 
   if (lockscreen_type == Type::NONE)
@@ -107,6 +154,7 @@
   }
   else if (lockscreen_type == Type::UNITY)
   {
+    upstart_wrapper_->Emit("desktop-lock");
     LockScreenUsingUnity();
   }
 }
@@ -115,7 +163,7 @@
 {
   // TODO (andy) Move to a different class (DisplayManagerWrapper)
   const char* session_path = g_getenv("XDG_SESSION_PATH");
-  
+
   if (!session_path)
     return;
 
@@ -126,38 +174,31 @@
 
   proxy->Call("Lock", nullptr, [proxy] (GVariant*) {});
 
-  ShowShields(/* interactive */ false, /* skip animation */ true);
+  ShowShields();
+  animation::Skip(fade_animator_);
 }
 
 void Controller::LockScreenUsingUnity()
 {
-  ShowShields(/* interactive */ true, /* skip animation */ false);
+  ShowShields();
 }
 
-void Controller::ShowShields(bool interactive, bool skip_animation)
+void Controller::ShowShields()
 {
   old_blur_type_ = BackgroundEffectHelper::blur_type;
   BackgroundEffectHelper::blur_type = BLUR_NONE;
 
-  WindowManager& wm = WindowManager::Default();
-  wm.SaveInputFocus();
-
-  auto* uscreen = UScreen::GetDefault();
-  EnsureShields(interactive ? uscreen->GetPrimaryMonitor() : -1, uscreen->GetMonitors());
-
-  std::for_each(shields_.begin(), shields_.end(), [skip_animation](nux::ObjectPtr<Shield> const& shield) {
+  WindowManager::Default().SaveInputFocus();
+  EnsureShields(UScreen::GetDefault()->GetMonitors());
+  uscreen_connection_->unblock();
+
+  std::for_each(shields_.begin(), shields_.end(), [] (nux::ObjectPtr<Shield> const& shield) {
+    shield->SetOpacity(0.0f);
     shield->ShowWindow(true);
-    shield->SetOpacity(skip_animation ? 1.0 : 0.0);
+    shield->PushToFront();
   });
 
-  if (!interactive)
-  {
-    shields_.at(uscreen->GetPrimaryMonitor())->GrabPointer();
-    shields_.at(uscreen->GetPrimaryMonitor())->GrabKeyboard();
-  }
-
-  if (!skip_animation)
-    animation::StartOrReverse(fade_animator_, animation::Direction::FORWARD);
+  animation::StartOrReverse(fade_animator_, animation::Direction::FORWARD);
 }
 
 void Controller::OnUnlockRequested()
@@ -165,38 +206,26 @@
   if (!IsLocked())
     return;
 
-  upstart_wrapper_->Emit("desktop-unlock");
-
   auto lockscreen_type = Settings::Instance().lockscreen_type();
 
   if (lockscreen_type == Type::NONE)
-  {
     return;
-  }
-  else if (lockscreen_type == Type::LIGHTDM)
-  {
-    HideShields(/* skip animation */ true);
-  }
-  else if (lockscreen_type == Type::UNITY)
-  {
-    HideShields(/* skip animation */ false);
-  }
+
+  HideShields();
+
+  if (lockscreen_type == Type::LIGHTDM)
+    animation::Skip(fade_animator_);
 }
 
-void Controller::HideShields(bool skip_animation)
+void Controller::HideShields()
 {
   std::for_each(shields_.begin(), shields_.end(), [](nux::ObjectPtr<Shield> const& shield) {
     shield->UnGrabPointer();
     shield->UnGrabKeyboard();
   });
 
-  WindowManager& wm = WindowManager::Default();
-  wm.RestoreInputFocus();
-
-  if (skip_animation)
-    shields_.clear();
-  else
-    animation::StartOrReverse(fade_animator_, animation::Direction::BACKWARD);
+  WindowManager::Default().RestoreInputFocus();
+  animation::StartOrReverse(fade_animator_, animation::Direction::BACKWARD);
 
   BackgroundEffectHelper::blur_type = old_blur_type_;
 }
@@ -206,5 +235,10 @@
   return !shields_.empty();
 }
 
+bool Controller::IsShielded() const
+{
+  return (fade_animator_.GetCurrentValue() == 1.0f && !shields_.empty());
+}
+
 } // lockscreen
 } // unity

=== modified file 'lockscreen/LockScreenController.h'
--- lockscreen/LockScreenController.h	2014-03-06 21:47:27 +0000
+++ lockscreen/LockScreenController.h	2014-03-06 21:47:28 +0000
@@ -21,8 +21,8 @@
 #define UNITY_LOCKSCREEN_CONTROLLER_H
 
 #include <NuxCore/Animation.h>
+#include <UnityCore/ConnectionManager.h>
 
-#include "LockScreenShield.h"
 #include "LockScreenShieldFactory.h"
 #include "unity-shared/BackgroundEffectHelper.h"
 #include "unity-shared/UpstartWrapper.h"
@@ -41,25 +41,29 @@
              bool test_mode = false);
 
   bool IsLocked() const;
+  bool IsShielded() const;
 
 private:
   friend class TestLockScreenController;
 
-  void EnsureShields(int primary, std::vector<nux::Geometry> const& monitors);
+  void EnsureShields(std::vector<nux::Geometry> const& monitors);
   void LockScreenUsingDisplayManager();
   void LockScreenUsingUnity();
-  void ShowShields(bool interactive, bool skip_animation);
-  void HideShields(bool skip_animation);
+  void ShowShields();
+  void HideShields();
 
-  void OnUScreenChanged(int primary, std::vector<nux::Geometry> const& monitors);
   void OnLockRequested();
   void OnUnlockRequested();
+  void OnPrimaryShieldMotion(int x, int y);
 
-  std::vector<nux::ObjectPtr<Shield>> shields_;
+  std::vector<nux::ObjectPtr<AbstractShield>> shields_;
+  nux::ObjectWeakPtr<AbstractShield> primary_shield_;
   session::Manager::Ptr session_manager_;
   UpstartWrapper::Ptr upstart_wrapper_;
   ShieldFactoryInterface::Ptr shield_factory_;
   nux::animation::AnimateValue<double> fade_animator_;
+  connection::Wrapper uscreen_connection_;
+  connection::Wrapper motion_connection_;
   bool test_mode_;
   BlurType old_blur_type_;
 };

=== modified file 'lockscreen/LockScreenShield.cpp'
--- lockscreen/LockScreenShield.cpp	2014-03-06 21:47:27 +0000
+++ lockscreen/LockScreenShield.cpp	2014-03-06 21:47:28 +0000
@@ -31,36 +31,59 @@
 #include "panel/PanelView.h"
 #include "unity-shared/GnomeKeyGrabber.h"
 #include "unity-shared/PanelStyle.h"
+#include "unity-shared/UScreen.h"
 
 namespace unity
 {
 namespace lockscreen
 {
 
-Shield::Shield(session::Manager::Ptr const& session_manager, int monitor, bool is_primary)
-  : MockableBaseWindow("Lockscreen")
-  , primary(is_primary)
-  , session_manager_(session_manager)
-  , monitor_(monitor)
+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)
   , prompt_view_(nullptr)
 {
-  SetLayout(new nux::VLayout());
-
   is_primary ? ShowPrimaryView() : ShowSecondaryView();
 
   EnableInputWindow(true);
 
-  geometry_changed.connect([this](nux::Area*, nux::Geometry&) {
+  geometry_changed.connect([this] (nux::Area*, nux::Geometry&) { UpdateBackgroundTexture();});
+
+  monitor.changed.connect([this] (int monitor) {
+    if (primary() && panel_view_)
+      panel_view_->SetMonitor(monitor);
+
     UpdateBackgroundTexture();
   });
+
+  primary.changed.connect([this] (bool is_primary) {
+    if (!is_primary)
+    {
+      UnGrabPointer();
+      UnGrabKeyboard();
+    }
+
+    is_primary ? ShowPrimaryView() : ShowSecondaryView();
+    QueueRelayout();
+    QueueDraw();
+  });
+
+  mouse_move.connect([this] (int x, int y, int, int, unsigned long, unsigned long) {
+    auto const& abs_geo = GetAbsoluteGeometry();
+    grab_motion.emit(abs_geo.x + x, abs_geo.y + y);
+  });
 }
 
 void Shield::UpdateBackgroundTexture()
 {
-  auto background_texture = bg_settings_->GetBackgroundTexture(monitor_, true, true);
-  background_layer_.reset(new nux::TextureLayer(background_texture->GetDeviceTexture(), nux::TexCoordXForm(), nux::color::White, true));
-  SetBackgroundLayer(background_layer_.get());
+  auto const& monitor_geo = UScreen::GetDefault()->GetMonitorGeometry(monitor);
+
+  if (!background_layer_ || monitor_geo != background_layer_->GetGeometry())
+  {
+    auto background_texture = bg_settings_->GetBackgroundTexture(monitor);
+    background_layer_.reset(new nux::TextureLayer(background_texture->GetDeviceTexture(), nux::TexCoordXForm(), nux::color::White, true));
+    SetBackgroundLayer(background_layer_.get());
+  }
 }
 
 void Shield::ShowPrimaryView()
@@ -68,7 +91,15 @@
   GrabPointer();
   GrabKeyboard();
 
-  nux::Layout* main_layout = GetLayout();
+  if (primary_layout_)
+  {
+    SetLayout(primary_layout_.GetPointer());
+    return;
+  }
+
+  nux::Layout* main_layout = new nux::VLayout();
+  primary_layout_ = main_layout;
+  SetLayout(primary_layout_.GetPointer());
 
   main_layout->AddView(CreatePanel());
 
@@ -86,7 +117,15 @@
 
 void Shield::ShowSecondaryView()
 {
-  nux::Layout* main_layout = GetLayout();
+  if (cof_layout_)
+  {
+    SetLayout(cof_layout_.GetPointer());
+    return;
+  }
+
+  nux::Layout* main_layout = new nux::VLayout();
+  cof_layout_ = main_layout;
+  SetLayout(cof_layout_.GetPointer());
 
   // The circle of friends
   CofView* cof_view = new CofView();
@@ -104,9 +143,10 @@
   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->SetMaximumHeight(panel::Style::Instance().PanelHeight(monitor));
   panel_view->SetOpacity(0.5);
-  panel_view->SetMonitor(monitor_);
+  panel_view->SetMonitor(monitor);
+  panel_view_ = panel_view;
 
   return panel_view;
 }
@@ -127,27 +167,33 @@
 
 void Shield::OnIndicatorEntryShowMenu(std::string const&, unsigned, int, int, unsigned)
 {
-  UnGrabPointer();
-  UnGrabKeyboard();
+  if (primary())
+  {
+    UnGrabPointer();
+    UnGrabKeyboard();
+  }
 }
 
 void Shield::OnIndicatorEntryActivated(std::string const& panel, std::string const& entry, nux::Geometry const& geo)
 {
-  if (entry.empty() and geo.IsNull()) /* on menu closed */
+  if (primary() && entry.empty() and geo.IsNull()) /* on menu closed */
   {
     GrabPointer();
     GrabKeyboard();
   }
 }
 
-nux::Area* Shield::FindKeyFocusArea(unsigned int,
-                                    unsigned long,
-                                    unsigned long)
+nux::Area* Shield::FindKeyFocusArea(unsigned int, unsigned long, unsigned long)
 {
-  if (prompt_view_ && prompt_view_->focus_view() && prompt_view_->focus_view()->GetInputEventSensitivity())
-    return prompt_view_->focus_view();
-  else
-    return nullptr;
+  if (primary && prompt_view_)
+  {
+    auto* focus_view = prompt_view_->focus_view();
+
+    if (focus_view && focus_view->GetInputEventSensitivity())
+      return focus_view;
+  }
+
+  return nullptr;
 }
 
 
@@ -156,5 +202,15 @@
   return false;
 }
 
+nux::Area* Shield::FindAreaUnderMouse(nux::Point const& mouse, nux::NuxEventType event_type)
+{
+  nux::Area* area = BaseWindow::FindAreaUnderMouse(mouse, event_type);
+
+  if (!area && primary)
+    return this;
+
+  return area;
+}
+
 }
 }

=== modified file 'lockscreen/LockScreenShield.h'
--- lockscreen/LockScreenShield.h	2014-03-06 21:47:27 +0000
+++ lockscreen/LockScreenShield.h	2014-03-06 21:47:28 +0000
@@ -20,13 +20,14 @@
 #ifndef UNITY_LOCKSCREEN_SHIELD_H
 #define UNITY_LOCKSCREEN_SHIELD_H
 
-#include <NuxCore/Property.h>
-#include <UnityCore/SessionManager.h>
-
-#include "unity-shared/MockableBaseWindow.h"
+#include "LockScreenAbstractShield.h"
 
 namespace unity
 {
+namespace panel
+{
+class PanelView;
+}
 namespace lockscreen
 {
 
@@ -34,19 +35,14 @@
 class UserAuthenticator;
 class UserPromptView;
 
-class Shield : public MockableBaseWindow
+class Shield : public AbstractShield
 {
 public:
   Shield(session::Manager::Ptr const& session_manager, int monitor, bool is_primary);
 
-  nux::Property<bool> primary;
-
-  nux::Area* FindKeyFocusArea(unsigned int,
-                              unsigned long,
-                              unsigned long) override;
-
   bool AcceptKeyNavFocus() override;
-
+  nux::Area* FindKeyFocusArea(unsigned int, unsigned long, unsigned long) override;
+  nux::Area* FindAreaUnderMouse(nux::Point const&, nux::NuxEventType) override;
 
 private:
   void UpdateBackgroundTexture();
@@ -58,13 +54,12 @@
   void OnIndicatorEntryShowMenu(std::string const&, unsigned, int, int, unsigned);
   void OnIndicatorEntryActivated(std::string const& panel, std::string const& entry, nux::Geometry const& geo);
 
-
-  session::Manager::Ptr session_manager_;
-  int monitor_;
   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_;
   UserPromptView* prompt_view_;
+  panel::PanelView* panel_view_;
 };
 
 }

=== modified file 'lockscreen/LockScreenShieldFactory.cpp'
--- lockscreen/LockScreenShieldFactory.cpp	2014-03-06 21:47:27 +0000
+++ lockscreen/LockScreenShieldFactory.cpp	2014-03-06 21:47:28 +0000
@@ -25,12 +25,9 @@
 namespace lockscreen
 {
 
-nux::ObjectPtr<MockableBaseWindow> ShieldFactory::CreateShield(session::Manager::Ptr const& session_manager,
-                                                               int monitor,
-                                                               bool is_primary)
+nux::ObjectPtr<AbstractShield> ShieldFactory::CreateShield(session::Manager::Ptr const& session_manager, int monitor, bool is_primary)
 {
-  nux::ObjectPtr<Shield> shield(new Shield(session_manager, monitor, is_primary));
-  return shield;
+  return nux::ObjectPtr<Shield>(new Shield(session_manager, monitor, is_primary));
 }
 
 }

=== modified file 'lockscreen/LockScreenShieldFactory.h'
--- lockscreen/LockScreenShieldFactory.h	2014-03-06 21:47:27 +0000
+++ lockscreen/LockScreenShieldFactory.h	2014-03-06 21:47:28 +0000
@@ -21,7 +21,7 @@
 #define UNITY_LOCKSCREEN_SHIELD_FACTORY
 
 #include <Nux/Nux.h>
-#include <UnityCore/SessionManager.h>
+#include "LockScreenAbstractShield.h"
 
 namespace unity
 {
@@ -35,18 +35,14 @@
 {
   typedef std::shared_ptr<ShieldFactoryInterface> Ptr;
 
-  virtual ~ShieldFactoryInterface() {};
+  virtual ~ShieldFactoryInterface() = default;
 
-  virtual nux::ObjectPtr<MockableBaseWindow> CreateShield(session::Manager::Ptr const& session_manager,
-                                                          int monitor,
-                                                          bool is_primary) = 0;
+  virtual nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, int monitor, bool is_primary) = 0;
 };
 
 struct ShieldFactory : ShieldFactoryInterface
 {
-  nux::ObjectPtr<MockableBaseWindow> CreateShield(session::Manager::Ptr const& session_manager,
-                                                  int monitor, 
-                                                  bool is_primary) override;
+  nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, int monitor, bool is_primary) override;
 };
 
 }

=== modified file 'lockscreen/UserAuthenticator.h'
--- lockscreen/UserAuthenticator.h	2014-03-06 21:47:27 +0000
+++ lockscreen/UserAuthenticator.h	2014-03-06 21:47:28 +0000
@@ -31,20 +31,20 @@
 namespace lockscreen
 {
 
+typedef std::shared_ptr<std::promise<std::string>> PromiseAuthCodePtr;
+
 class UserAuthenticator
 {
 public:
   typedef std::function<void(bool)> AuthenticateEndCallback;
 
-  virtual ~UserAuthenticator() {};
+  virtual ~UserAuthenticator() = default;
 
   // Authenticate the user in a background thread.
-  virtual bool AuthenticateStart(std::string const& username,
-                                 AuthenticateEndCallback authenticate_cb) = 0;
+  virtual bool AuthenticateStart(std::string const& username, AuthenticateEndCallback const&) = 0;
 
-  // FIXME (andy) found a better name for the promise ptr.
-  sigc::signal<void, std::string, std::shared_ptr<std::promise<std::string>> const&> echo_on_requested;
-  sigc::signal<void, std::string, std::shared_ptr<std::promise<std::string>> const&> echo_off_requested;
+  sigc::signal<void, std::string, PromiseAuthCodePtr const&> echo_on_requested;
+  sigc::signal<void, std::string, PromiseAuthCodePtr const&> echo_off_requested;
   sigc::signal<void, std::string> message_requested;
   sigc::signal<void, std::string> error_requested;
   sigc::signal<void> clear_prompts;

=== modified file 'lockscreen/UserAuthenticatorPam.cpp'
--- lockscreen/UserAuthenticatorPam.cpp	2014-03-06 21:47:27 +0000
+++ lockscreen/UserAuthenticatorPam.cpp	2014-03-06 21:47:28 +0000
@@ -33,7 +33,7 @@
 {
 
 bool UserAuthenticatorPam::AuthenticateStart(std::string const& username,
-                                             AuthenticateEndCallback authenticate_cb)
+                                             AuthenticateEndCallback const& authenticate_cb)
 {
   first_prompt_ = true;
   username_ = username;
@@ -77,21 +77,24 @@
   if (num_msg <= 0)
     return PAM_CONV_ERR;
 
-  auto* tmp_response = static_cast<pam_response*>(malloc(num_msg * sizeof(pam_response)));
+  auto* tmp_response = g_new0(pam_response, num_msg);
+
   if (!tmp_response)
     return PAM_CONV_ERR;
 
   UserAuthenticatorPam* user_auth = static_cast<UserAuthenticatorPam*>(appdata_ptr);
 
   if (!user_auth->first_prompt_)
+  {
     // Adding a timeout ensures that the signal is emitted in the main thread
-    user_auth->source_manager_.AddTimeout(0, [&]() { user_auth->clear_prompts.emit(); return false; });
+    user_auth->source_manager_.AddTimeout(0, [user_auth] { user_auth->clear_prompts.emit(); return false; });
+  }
 
   user_auth->first_prompt_ = false;
 
   bool raise_error = false;
   int count;
-  std::vector<std::shared_ptr<std::promise<std::string>>> promises;
+  std::vector<PromiseAuthCodePtr> promises;
 
   for (count = 0; count < num_msg && !raise_error; ++count)
   {
@@ -104,7 +107,7 @@
 
         // Adding a timeout ensures that the signal is emitted in the main thread
         std::string message(msg[count]->msg);
-        user_auth->source_manager_.AddTimeout(0, [&, message, promise]() { user_auth->echo_on_requested.emit(message, promise); return false; });
+        user_auth->source_manager_.AddTimeout(0, [user_auth, message, promise] { user_auth->echo_on_requested.emit(message, promise); return false; });
         break;
       }
       case PAM_PROMPT_ECHO_OFF:
@@ -114,28 +117,28 @@
 
         // Adding a timeout ensures that the signal is emitted in the main thread
         std::string message(msg[count]->msg);
-        user_auth->source_manager_.AddTimeout(0, [&, message, promise]() { user_auth->echo_off_requested.emit(message, promise); return false; });
+        user_auth->source_manager_.AddTimeout(0, [user_auth, message, promise] { user_auth->echo_off_requested.emit(message, promise); return false; });
+        break;
       }
-        break;
       case PAM_TEXT_INFO:
       {
         // Adding a timeout ensures that the signal is emitted in the main thread
         std::string message(msg[count]->msg);
-        user_auth->source_manager_.AddTimeout(0, [&, message]() { user_auth->message_requested.emit(message); return false; });
+        user_auth->source_manager_.AddTimeout(0, [user_auth, message] { user_auth->message_requested.emit(message); return false; });
         break;
       }
       default:
       {
         // Adding a timeout ensures that the signal is emitted in the main thread
         std::string message(msg[count]->msg);
-        user_auth->source_manager_.AddTimeout(0, [&, message]() { user_auth->error_requested.emit(message); return false; });
+        user_auth->source_manager_.AddTimeout(0, [user_auth, message] { user_auth->error_requested.emit(message); return false; });
       }
     }
   }
 
   int i = 0;
 
-  for (auto promise : promises)
+  for (auto const& promise : promises)
   {
     auto future = promise->get_future();
     pam_response* resp_item = &tmp_response[i++];
@@ -152,8 +155,7 @@
   if (raise_error)
   {
     for (int i = 0; i < count; ++i)
-      if (tmp_response[i].resp)
-        free(tmp_response[i].resp);
+      free(tmp_response[i].resp);
 
     free(tmp_response);
     return PAM_CONV_ERR;

=== modified file 'lockscreen/UserAuthenticatorPam.h'
--- lockscreen/UserAuthenticatorPam.h	2014-03-06 21:47:27 +0000
+++ lockscreen/UserAuthenticatorPam.h	2014-03-06 21:47:28 +0000
@@ -39,8 +39,7 @@
 class UserAuthenticatorPam : public UserAuthenticator, private boost::noncopyable
 {
 public:
-  bool AuthenticateStart(std::string const& username,
-                         AuthenticateEndCallback authenticate_cb) override;
+  bool AuthenticateStart(std::string const& username, AuthenticateEndCallback const&) override;
 
 private:
   // TODO (andy) move to pimpl

=== modified file 'lockscreen/UserPromptView.cpp'
--- lockscreen/UserPromptView.cpp	2014-03-06 21:47:27 +0000
+++ lockscreen/UserPromptView.cpp	2014-03-06 21:47:28 +0000
@@ -19,17 +19,27 @@
 
 #include "UserPromptView.h"
 
+#include <boost/algorithm/string/trim.hpp>
 #include <Nux/VLayout.h>
 
 #include "LockScreenSettings.h"
 #include "unity-shared/CairoTexture.h"
 #include "unity-shared/TextInput.h"
 #include "unity-shared/StaticCairoText.h"
+#include "unity-shared/RawPixel.h"
 
 namespace unity
 {
 namespace lockscreen
 {
+namespace
+{
+const RawPixel PADDING = 10_em;
+const RawPixel LAYOUT_MARGIN = 10_em;
+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)
 {
@@ -65,15 +75,36 @@
                                 rop));
 }
 
+std::string SanitizeMessage(std::string const& message)
+{
+  std::string msg = boost::algorithm::trim_copy(message);
+
+  if (msg.empty())
+    return msg;
+
+  if (msg[msg.size()-1] == ':')
+    msg = msg.substr(0, msg.size()-1);
+
+  if (msg == "Password")
+    return _("Password");
+
+  if (msg == "login")
+    return _("Username");
+
+  return msg;
+}
+
+}
+
 UserPromptView::UserPromptView(session::Manager::Ptr const& session_manager)
   : nux::View(NUX_TRACKER_LOCATION)
   , session_manager_(session_manager)
 {
-  user_authenticator_.echo_on_requested.connect([this](std::string const& message, std::shared_ptr<std::promise<std::string>> const& promise){
+  user_authenticator_.echo_on_requested.connect([this](std::string const& message, PromiseAuthCodePtr const& promise){
     AddPrompt(message, /* visible */ true, promise);
   });
 
-  user_authenticator_.echo_off_requested.connect([this](std::string const& message, std::shared_ptr<std::promise<std::string>> const& promise){
+  user_authenticator_.echo_off_requested.connect([this](std::string const& message, PromiseAuthCodePtr const& promise){
     AddPrompt(message, /* visible */ false, promise);
   });
 
@@ -97,28 +128,28 @@
 
 void UserPromptView::ResetLayout()
 {
-  focus_queue_ = std::queue<IMTextEntry*>();
+  focus_queue_.clear();
 
   SetLayout(new nux::VLayout());
 
-  GetLayout()->SetLeftAndRightPadding(10);
-  GetLayout()->SetTopAndBottomPadding(10);
-  static_cast<nux::VLayout*>(GetLayout())->SetVerticalInternalMargin(10);
+  GetLayout()->SetLeftAndRightPadding(PADDING);
+  GetLayout()->SetTopAndBottomPadding(PADDING);
+  static_cast<nux::VLayout*>(GetLayout())->SetVerticalInternalMargin(LAYOUT_MARGIN);
 
   auto const& real_name = session_manager_->RealName();
   auto const& name = (real_name.empty() ? session_manager_->UserName() : real_name);
 
   unity::StaticCairoText* username = new unity::StaticCairoText(name);
-  username->SetFont("Ubuntu 13");
+  username->SetFont("Ubuntu "+std::to_string(PROMPT_FONT_SIZE));
   GetLayout()->AddView(username);
 
   msg_layout_ = new nux::VLayout();
-  msg_layout_->SetVerticalInternalMargin(15);
+  msg_layout_->SetVerticalInternalMargin(MSG_LAYOUT_MARGIN);
   msg_layout_->SetReconfigureParentLayoutOnGeometryChange(true);
   GetLayout()->AddLayout(msg_layout_);
 
   prompt_layout_ = new nux::VLayout();
-  prompt_layout_->SetVerticalInternalMargin(5);
+  prompt_layout_->SetVerticalInternalMargin(PROMPT_LAYOUT_MARGIN);
   prompt_layout_->SetReconfigureParentLayoutOnGeometryChange(true);
   GetLayout()->AddLayout(prompt_layout_);
 
@@ -146,7 +177,7 @@
 void UserPromptView::Draw(nux::GraphicsEngine& graphics_engine, bool /* force_draw */)
 {
   nux::Geometry const& geo = GetGeometry();
-  
+
   graphics_engine.PushClippingRectangle(geo);
   nux::GetPainter().PaintBackground(graphics_engine, geo);
 
@@ -182,46 +213,49 @@
   if (focus_queue_.empty())
     return nullptr;
 
-  focus_queue_.front()->cursor_visible_ = true;
+  for (auto* view : focus_queue_)
+    if (view->HasKeyboardFocus())
+      return view;
+
   return focus_queue_.front();
 }
 
-void UserPromptView::AddPrompt(std::string const& message, bool visible, std::shared_ptr<std::promise<std::string>> const& promise)
+void UserPromptView::AddPrompt(std::string const& message, bool visible, PromiseAuthCodePtr const& promise)
 {
-  auto text_input = new unity::TextInput();
-
-  text_input->input_hint = message;
-  text_input->text_entry()->SetPasswordMode(!visible);
-
-  text_input->text_entry()->cursor_visible_ = false;
-  if (text_input->text_entry()->cursor_blink_timer_)
-    g_source_remove(text_input->text_entry()->cursor_blink_timer_);
+  auto* text_input = new unity::TextInput();
+  auto* text_entry = text_input->text_entry();
+
+  text_input->input_hint = SanitizeMessage(message);
+  text_input->hint_font_size = PROMPT_FONT_SIZE;
+  text_entry->SetPasswordMode(!visible);
+  text_entry->SetPasswordChar("•");
+  text_entry->SetToggleCursorVisibilityOnKeyFocus(true);
 
   text_input->SetMinimumHeight(Settings::GRID_SIZE);
   text_input->SetMaximumHeight(Settings::GRID_SIZE);
   prompt_layout_->AddView(text_input, 1);
-  focus_queue_.push(text_input->text_entry());
+  focus_queue_.push_back(text_entry);
 
   // Don't remove it, it helps with a11y.
   if (focus_queue_.size() == 1)
-    nux::GetWindowCompositor().SetKeyFocusArea(text_input->text_entry());
+    nux::GetWindowCompositor().SetKeyFocusArea(text_entry);
 
-  text_input->text_entry()->activated.connect([this, text_input, promise](){
+  text_entry->activated.connect([this, text_input, promise](){
     if (focus_queue_.size() == 1)
     {
       text_input->SetSpinnerVisible(true);
       text_input->SetSpinnerState(STATE_SEARCHING);
     }
 
-    this->focus_queue_.pop();
-
-    text_input->text_entry()->SetInputEventSensitivity(false);
-    text_input->text_entry()->cursor_visible_ = false;
-    this->QueueRelayout();
-    this->QueueDraw();
-
-    std::string password = text_input->text_entry()->GetText();
-    promise->set_value(password);
+    focus_queue_.pop_front();
+    auto* text_entry = text_input->text_entry();
+    text_entry->SetInputEventSensitivity(false);
+    QueueRelayout();
+    QueueDraw();
+
+    std::string const& password = text_entry->GetText();
+    if (promise)
+      promise->set_value(password);
   });
 
   GetLayout()->ComputeContentPosition(0, 0);
@@ -233,7 +267,7 @@
 void UserPromptView::AddMessage(std::string const& message, nux::Color const& color)
 {
   auto* view = new unity::StaticCairoText("");
-  view->SetFont("Ubuntu 10");
+  view->SetFont("Ubuntu "+std::to_string(MESSAGE_FONT_SIZE));
   view->SetTextColor(color);
   view->SetText(message);
 

=== modified file 'lockscreen/UserPromptView.h'
--- lockscreen/UserPromptView.h	2014-03-06 21:47:27 +0000
+++ lockscreen/UserPromptView.h	2014-03-06 21:47:28 +0000
@@ -21,7 +21,7 @@
 #define UNITY_USER_PROMPT_BOX
 
 #include <memory>
-#include <queue>
+#include <deque>
 
 #include <Nux/Nux.h>
 #include <Nux/View.h>
@@ -53,7 +53,7 @@
 
   nux::View* focus_view();
 
-  void AddPrompt(std::string const& message, bool visible, std::shared_ptr<std::promise<std::string>> const& promise);
+  void AddPrompt(std::string const& message, bool visible, PromiseAuthCodePtr const&);
   void AddMessage(std::string const& message, nux::Color const& color);
   void AuthenticationCb(bool authenticated);
 
@@ -72,7 +72,7 @@
   StaticCairoText* message_;
   StaticCairoText* error_;
   StaticCairoText* invalid_login_;
-  std::queue<IMTextEntry*> focus_queue_;
+  std::deque<IMTextEntry*> focus_queue_;
 };
 
 }

=== modified file 'lockscreen/pch/lockscreen_pch.hh'
--- lockscreen/pch/lockscreen_pch.hh	2014-03-06 21:47:27 +0000
+++ lockscreen/pch/lockscreen_pch.hh	2014-03-06 21:47:28 +0000
@@ -23,5 +23,9 @@
  */
 
 #include <memory>
- 
-#include <Nux/BaseWindow.h>
\ No newline at end of file
+#include <vector>
+#include <deque>
+#include <security/pam_appl.h>
+
+#include <Nux/Nux.h>
+#include <UnityCore/SessionManager.h>
\ No newline at end of file

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2014-03-06 21:47:27 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-03-06 21:47:28 +0000
@@ -2810,6 +2810,15 @@
 
   GLWindowPaintAttrib wAttrib = attrib;
 
+  if (window->type() != CompWindowTypePopupMenuMask)
+  {
+    if (uScreen->lockscreen_controller_->IsShielded())
+    {
+      wAttrib.opacity = 0;
+      return gWindow->glPaint(wAttrib, matrix, region, mask);
+    }
+  }
+
   if (mMinimizeHandler)
   {
     mask |= mMinimizeHandler->getPaintMask ();
@@ -2838,7 +2847,7 @@
     paintInnerGlow(scaled_geo, matrix, attrib, mask);
   }
 
-  if (uScreen->session_controller_ && uScreen->session_controller_->Visible())
+  if (uScreen->session_controller_->Visible())
   {
     // Let's darken the other windows if the session dialog is visible
     wAttrib.brightness *= 0.75f;

=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2014-03-06 21:47:27 +0000
+++ plugins/unityshell/unityshell.xml.in	2014-03-06 21:47:28 +0000
@@ -163,7 +163,7 @@
                     </desc>
                     <desc>
                         <value>2</value>
-                        <_name>Custom lockscreen</_name>
+                        <_name>Unity</_name>
                     </desc>
                 </option>
             </group>

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2013-05-10 10:07:04 +0000
+++ po/POTFILES.in	2014-03-06 21:47:28 +0000
@@ -24,6 +24,7 @@
 launcher/SpacerLauncherIcon.cpp
 launcher/TrashLauncherIcon.cpp
 launcher/VolumeLauncherIcon.cpp
+lockscreen/UserPromptView.cpp
 panel/PanelMenuView.cpp
 plugins/networkarearegion/networkarearegion.xml.in
 plugins/unity-mt-grab-handles/unitymtgrabhandles.xml.in

=== modified file 'services/panel-main.c'
--- services/panel-main.c	2014-03-06 21:47:27 +0000
+++ services/panel-main.c	2014-03-06 21:47:28 +0000
@@ -106,8 +106,8 @@
   "  </interface>"
   "</node>";
 
-#define S_NAME_DESKTOP "com.canonical.Unity.Panel.ServiceDesktop"
-#define S_NAME_LOCKSCREEN "com.canonical.Unity.Panel.ServiceLockscreen"
+#define S_NAME_DESKTOP "com.canonical.Unity.Panel.Service.Desktop"
+#define S_NAME_LOCKSCREEN "com.canonical.Unity.Panel.Service.LockScreen"
 #define S_PATH  "/com/canonical/Unity/Panel/Service"
 #define S_IFACE "com.canonical.Unity.Panel.Service"
 

=== modified file 'tests/data/external.gschema.xml'
--- tests/data/external.gschema.xml	2014-01-30 17:57:29 +0000
+++ tests/data/external.gschema.xml	2014-03-06 21:47:28 +0000
@@ -52,4 +52,22 @@
       <default>false</default>
     </key>
   </schema>
+
+  <schema id="com.canonical.unity-greeter" path="/com/canonical/unity-greeter/">
+    <key type="s" name="logo">
+      <default>'/usr/share/unity-greeter/logo.png'</default>
+    </key>
+    <key type="s" name="background">
+      <default>'/usr/share/backgrounds/warty-final-ubuntu.png'</default>
+    </key>
+    <key type="s" name="background-color">
+      <default>'#2C001E'</default>
+    </key>
+    <key type="b" name="draw-user-backgrounds">
+      <default>true</default>
+    </key>
+    <key type="b" name="draw-grid">
+      <default>true</default>
+    </key>
+  </schema>
 </schemalist>

=== modified file 'tests/test_lockscreen_controller.cpp'
--- tests/test_lockscreen_controller.cpp	2014-03-06 21:47:27 +0000
+++ tests/test_lockscreen_controller.cpp	2014-03-06 21:47:28 +0000
@@ -64,11 +64,10 @@
 
 struct ShieldFactoryMock : ShieldFactoryInterface
 {
-  nux::ObjectPtr<MockableBaseWindow> CreateShield (session::Manager::Ptr const&, int, bool) override
+  nux::ObjectPtr<AbstractShield> CreateShield(session::Manager::Ptr const&, int, bool) override
   {
-    nux::ObjectPtr<MockableBaseWindow> shield(new MockableBaseWindow);
-    return shield;
-  }  
+    return nux::ObjectPtr<AbstractShield>(new AbstractShield(nullptr, 0, false));
+  }
 };
 
 struct TestLockScreenController : Test
@@ -254,7 +253,7 @@
 }
 
 TEST_F(TestLockScreenController, LockScreenOnSingleMonitor)
-{  
+{
   session_manager->lock_requested.emit();
 
   ASSERT_EQ(1, controller.shields_.size());
@@ -275,6 +274,7 @@
 TEST_F(TestLockScreenController, SwitchToMultiMonitor)
 {
   session_manager->lock_requested.emit();
+  tick_source.tick(ANIMATION_DURATION);
 
   ASSERT_EQ(1, controller.shields_.size());
   EXPECT_EQ(uscreen.GetMonitors().at(0), controller.shields_.at(0)->GetGeometry());
@@ -284,7 +284,10 @@
   ASSERT_EQ(monitors::MAX, controller.shields_.size());
 
   for (unsigned int i=0; i < monitors::MAX; ++i)
-    EXPECT_EQ(uscreen.GetMonitors().at(i), controller.shields_.at(i)->GetAbsoluteGeometry());  
+  {
+    ASSERT_EQ(uscreen.GetMonitors().at(i), controller.shields_.at(i)->GetAbsoluteGeometry());
+    ASSERT_TRUE(controller.shields_.at(i)->IsVisible());
+  }
 }
 
 TEST_F(TestLockScreenController, SwitchToSingleMonitor)
@@ -295,7 +298,7 @@
   ASSERT_EQ(monitors::MAX, controller.shields_.size());
 
   for (unsigned int i=0; i < monitors::MAX; ++i)
-    EXPECT_EQ(uscreen.GetMonitors().at(i), controller.shields_.at(i)->GetAbsoluteGeometry());
+    ASSERT_EQ(uscreen.GetMonitors().at(i), controller.shields_.at(i)->GetAbsoluteGeometry());
 
   uscreen.Reset(/* emit_change */ true);
 

=== modified file 'tests/test_text_input.cpp'
--- tests/test_text_input.cpp	2014-03-06 21:47:27 +0000
+++ tests/test_text_input.cpp	2014-03-06 21:47:28 +0000
@@ -35,7 +35,6 @@
 class TextInputMock : public TextInput
 {
     public:
-      using TextInput::Init;
       using TextInput::OnInputHintChanged;
       using TextInput::OnMouseButtonDown;
       using TextInput::OnEndKeyFocus;
@@ -52,7 +51,6 @@
      TestTextInput()
      {
        entry = new TextInputMock();
-       entry->Init();
        hint = entry->GetHint();
        pango_entry = entry->GetPangoEntry();
      }

=== modified file 'unity-shared/IMTextEntry.cpp'
--- unity-shared/IMTextEntry.cpp	2012-07-04 02:37:23 +0000
+++ unity-shared/IMTextEntry.cpp	2014-03-06 21:47:28 +0000
@@ -1,4 +1,4 @@
-// -*- Mode: C++; indent-tabs-mode: ni; tab-width: 2 -*-
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
  * Copyright (C) 2011-2012 Canonical Ltd
  *
@@ -26,7 +26,7 @@
 NUX_IMPLEMENT_OBJECT_TYPE(IMTextEntry);
 
 IMTextEntry::IMTextEntry()
-: TextEntry("", NUX_TRACKER_LOCATION)
+  : TextEntry("", NUX_TRACKER_LOCATION)
 {}
 
 void IMTextEntry::CopyClipboard()
@@ -85,4 +85,5 @@
 {
   return !preedit_.empty();
 }
+
 }

=== modified file 'unity-shared/IMTextEntry.h'
--- unity-shared/IMTextEntry.h	2014-03-06 21:47:27 +0000
+++ unity-shared/IMTextEntry.h	2014-03-06 21:47:28 +0000
@@ -32,12 +32,9 @@
   NUX_DECLARE_OBJECT_TYPE(IMTextEntry, nux::TextEntry);
 public:
   IMTextEntry();
-  virtual ~IMTextEntry() {}
+
   bool im_preedit();
 
-  using TextEntry::cursor_visible_;
-  using TextEntry::cursor_blink_timer_;
-
 protected:
   virtual void InsertText(std::string const& text);
   virtual void CopyClipboard();

=== modified file 'unity-shared/TextInput.cpp'
--- unity-shared/TextInput.cpp	2014-03-06 21:47:27 +0000
+++ unity-shared/TextInput.cpp	2014-03-06 21:47:28 +0000
@@ -30,9 +30,8 @@
 const int HIGHLIGHT_HEIGHT = 24;
 
 // Fonts
-const std::string HINT_LABEL_FONT_SIZE = "14px";
-const std::string HINT_LABEL_FONT_STYLE = "";
-const std::string HINT_LABEL_DEFAULT_FONT = "Ubuntu " + HINT_LABEL_FONT_STYLE + " " + HINT_LABEL_FONT_SIZE;
+const std::string HINT_LABEL_DEFAULT_FONT_NAME = "Ubuntu";
+const int HINT_LABEL_FONT_SIZE = 11;
 
 const std::string PANGO_ENTRY_DEFAULT_FONT_FAMILY = "Ubuntu";
 const int PANGO_ENTRY_FONT_SIZE = 14;
@@ -42,34 +41,33 @@
 namespace unity
 {
 
-nux::logging::Logger logger("unity.dash.textinput");
+nux::logging::Logger logger("unity.textinput");
 
 NUX_IMPLEMENT_OBJECT_TYPE(TextInput);
 
 TextInput::TextInput(NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
   , input_hint("")
+  , hint_font_name(HINT_LABEL_DEFAULT_FONT_NAME)
+  , hint_font_size(HINT_LABEL_FONT_SIZE)
+  , bg_layer_(new nux::ColorLayer(nux::Color(0xff595853), true))
   , last_width_(-1)
   , last_height_(-1)
 {
-  Init();
-}
-
-void TextInput::Init()
-{
-  bg_layer_.reset(new nux::ColorLayer(nux::Color(0xff595853), true));
-
   layout_ = new nux::HLayout(NUX_TRACKER_LOCATION);
   layout_->SetLeftAndRightPadding(LEFT_INTERNAL_PADDING, TEXT_INPUT_RIGHT_BORDER);
   layout_->SetSpaceBetweenChildren(SPACE_BETWEEN_ENTRY_AND_HIGHLIGHT);
   SetLayout(layout_);
 
   nux::HLayout* hint_layout = new nux::HLayout(NUX_TRACKER_LOCATION);
+  hint_layout->SetLeftAndRightPadding(3, 3);
 
-  hint_ = new StaticCairoText(" ");
+  hint_ = new StaticCairoText("");
   hint_->SetTextColor(nux::Color(1.0f, 1.0f, 1.0f, 0.5f));
-  hint_->SetFont(HINT_LABEL_DEFAULT_FONT.c_str());
-  hint_layout->AddView(hint_,  0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  hint_layout->AddView(hint_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
+  hint_font_name.changed.connect(sigc::hide(sigc::mem_fun(this, &TextInput::UpdateHintFont)));
+  hint_font_size.changed.connect(sigc::hide(sigc::mem_fun(this, &TextInput::UpdateHintFont)));
+  UpdateHintFont();
 
   pango_entry_ = new IMTextEntry();
   pango_entry_->SetFontFamily(PANGO_ENTRY_DEFAULT_FONT_FAMILY.c_str());
@@ -115,11 +113,15 @@
   spinner_->SetState(spinner_state);
 }
 
+void TextInput::UpdateHintFont()
+{
+  hint_->SetFont((hint_font_name() + " " + std::to_string(hint_font_size())).c_str());
+}
+
 void TextInput::OnFontChanged(GtkSettings* settings, GParamSpec* pspec)
 {
   glib::String font_name;
   PangoFontDescription* desc;
-  std::ostringstream font_desc;
 
   g_object_get(settings, "gtk-font-name", &font_name, NULL);
 
@@ -130,20 +132,19 @@
     pango_entry_->SetFontSize(PANGO_ENTRY_FONT_SIZE);
     pango_entry_->SetFontOptions(gdk_screen_get_font_options(gdk_screen_get_default()));
 
-    font_desc << pango_font_description_get_family(desc) << " " << HINT_LABEL_FONT_STYLE << " " << HINT_LABEL_FONT_SIZE;
-    hint_->SetFont(font_desc.str().c_str());
-
-    font_desc.str("");
-    font_desc.clear();
-
-    pango_font_description_free(desc);
+    if (hint_font_name() == HINT_LABEL_DEFAULT_FONT_NAME)
+    {
+      std::ostringstream font_desc;
+      font_desc << pango_font_description_get_family(desc) << " " << hint_font_size();
+      hint_->SetFont(font_desc.str().c_str());
+      pango_font_description_free(desc);
+    }
   }
 }
 
 void TextInput::OnInputHintChanged()
 {
-  glib::String tmp(g_markup_escape_text(input_hint().c_str(), -1));
-  hint_->SetText(tmp);
+  hint_->SetText(input_hint().c_str(), true);
 }
 
 void TextInput::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)

=== modified file 'unity-shared/TextInput.h'
--- unity-shared/TextInput.h	2014-03-06 21:47:27 +0000
+++ unity-shared/TextInput.h	2014-03-06 21:47:28 +0000
@@ -58,7 +58,6 @@
 public:
   typedef nux::ObjectPtr<TextInput> Ptr;
   TextInput(NUX_FILE_LINE_PROTO);
-  TextInput(bool show_filter_hint, NUX_FILE_LINE_PROTO);
 
   void SetSpinnerVisible(bool visible);
   void SetSpinnerState(SpinnerState spinner_state);
@@ -67,12 +66,14 @@
 
   nux::RWProperty<std::string> input_string;
   nux::Property<std::string> input_hint;
+  nux::Property<std::string> hint_font_name;
+  nux::Property<int> hint_font_size;
   nux::ROProperty<bool> im_active;
   nux::ROProperty<bool> im_preedit;
 
 private:
-
   void OnFontChanged(GtkSettings* settings, GParamSpec* pspec=NULL);
+  void UpdateHintFont();
   void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);
   void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
   void UpdateBackground(bool force);
@@ -83,11 +84,8 @@
   bool AcceptKeyNavFocus();
 
 protected:
-
-  void Init();
   void OnInputHintChanged();
-  void OnMouseButtonDown(int x, int y, unsigned long button_flags,
-          unsigned long key_flags);
+  void OnMouseButtonDown(int x, int y, unsigned long button_flags, unsigned long key_flags);
   void OnEndKeyFocus();
 
   // getters & setters

=== modified file 'unity-shared/UScreen.cpp'
--- unity-shared/UScreen.cpp	2014-02-27 05:30:25 +0000
+++ unity-shared/UScreen.cpp	2014-03-06 21:47:28 +0000
@@ -98,16 +98,16 @@
 
 const std::string UScreen::GetMonitorName(int output_number = 0) const
 {
-  if (output_number < 0 || output_number > gdk_screen_get_n_monitors(screen_))
+  if (output_number < 0 || output_number >= gdk_screen_get_n_monitors(screen_))
   {
-    LOG_ERROR(logger) << "UScreen::GetMonitorName: Invalid monitor number" << output_number;
+    LOG_WARN(logger) << "UScreen::GetMonitorName: Invalid monitor number" << output_number;
     return "";
   }
 
   glib::String output_name(gdk_screen_get_monitor_plug_name(screen_, output_number));
   if (!output_name)
   {
-    LOG_ERROR(logger) << "UScreen::GetMonitorName: Failed to get monitor name for monitor" << output_number;
+    LOG_WARN(logger) << "UScreen::GetMonitorName: Failed to get monitor name for monitor" << output_number;
     return "";
   }