Merge lp:~3v1n0/unity/multi-monitor-icon-quirks into lp:unity

[Marco Trevisan (Treviño)]

LauncherIcon: add MultiMonitor quirks support

A quirk can be now set for all monitors or for just one

Make the Icon Quirks to be multi-monitor aware. Each icon property can be applied to both all monitors or just a specified one. This allows to apply effects such as de-saturation and visibility to just one monitor (like on DnD or when an overlay is opened).

Also Improved XdndManager not to strictly depend on X, use XdndCollectionWindow to get the DnD data we need. This allows proper unit-testing.

This required to update some tests. Also, I've added a testwrapper::StandaloneWM wrapper that allows to cast and wrap the StaticWindowManager so that we don't have to worry about resetting its state at the end of each test (not to break the others assumptions).
Added new tests as well.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3607
http://jenkins.qa.ubuntu.com/job/unity-ci/443/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/333/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/330/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/331/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/443/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3608
http://jenkins.qa.ubuntu.com/job/unity-ci/444/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/334/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/331/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/332/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/444/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3609
http://jenkins.qa.ubuntu.com/job/unity-ci/445/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/335/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/332/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/333/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/445/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3611
http://jenkins.qa.ubuntu.com/job/unity-ci/446/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/336/console
    None: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/333/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/334/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/446/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3612
http://jenkins.qa.ubuntu.com/job/unity-ci/447/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/337
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/334
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/335

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/447/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3615
http://jenkins.qa.ubuntu.com/job/unity-ci/448/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/338
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/335
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/336

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/448/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3616
http://jenkins.qa.ubuntu.com/job/unity-ci/454/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/341
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/342

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/454/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3618
http://jenkins.qa.ubuntu.com/job/unity-ci/456/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/343
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/344

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/456/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3619
http://jenkins.qa.ubuntu.com/job/unity-ci/457/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/347
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/345

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/457/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3620
http://jenkins.qa.ubuntu.com/job/unity-ci/458/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/348
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/345
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/346

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/458/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3621
http://jenkins.qa.ubuntu.com/job/unity-ci/462/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/352
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/350

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/462/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Woot Nice! LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/365/
Executed test runs:
    FAILURE: http://10.97.0.26:8080/job/generic-cleanup-mbs/2908/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/321/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/321/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/321/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3622
http://jenkins.qa.ubuntu.com/job/unity-ci/467/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/357/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/354/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/355/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/467/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/366/
Executed test runs:
    FAILURE: http://10.97.0.26:8080/job/generic-cleanup-mbs/2914/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/322/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/322/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/322/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3623
http://jenkins.qa.ubuntu.com/job/unity-ci/468/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/358/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/355/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/356/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/468/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'launcher/AbstractLauncherIcon.h'
--- launcher/AbstractLauncherIcon.h	2013-10-04 00:19:56 +0000
+++ launcher/AbstractLauncherIcon.h	2013-10-22 12:34:26 +0000
@@ -186,13 +186,13 @@
 
   virtual uint64_t SwitcherPriority() = 0;
 
-  virtual bool GetQuirk(Quirk quirk) const = 0;
-
-  virtual void SetQuirk(Quirk quirk, bool value) = 0;
-
-  virtual struct timespec GetQuirkTime(Quirk quirk) = 0;
-
-  virtual void ResetQuirkTime(Quirk quirk) = 0;
+  virtual bool GetQuirk(Quirk quirk, int monitor = -1) const = 0;
+
+  virtual void SetQuirk(Quirk quirk, bool value, int monitor = -1) = 0;
+
+  virtual struct timespec GetQuirkTime(Quirk quirk, int monitor) = 0;
+
+  virtual void ResetQuirkTime(Quirk quirk, int monitor = -1) = 0;
 
   virtual IconType GetIconType() const = 0;
 
@@ -242,10 +242,10 @@
   sigc::signal<void, int>      mouse_enter;
   sigc::signal<void, int>      mouse_leave;
 
-  sigc::signal<void, AbstractLauncherIcon::Ptr const&> needs_redraw;
+  sigc::signal<void, AbstractLauncherIcon::Ptr const&, int> needs_redraw;
   sigc::signal<void, AbstractLauncherIcon::Ptr const&> remove;
   sigc::signal<void, nux::ObjectPtr<nux::View>> tooltip_visible;
-  sigc::signal<void> visibility_changed;
+  sigc::signal<void, int> visibility_changed;
   sigc::signal<void> position_saved;
   sigc::signal<void> position_forgot;
   sigc::signal<void, std::string const&> uri_changed;

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2013-10-11 20:37:05 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2013-10-22 12:34:26 +0000
@@ -226,11 +226,11 @@
   }));
 }
 
-bool ApplicationLauncherIcon::GetQuirk(AbstractLauncherIcon::Quirk quirk) const
+bool ApplicationLauncherIcon::GetQuirk(AbstractLauncherIcon::Quirk quirk, int monitor) const
 {
   if (quirk == Quirk::ACTIVE)
   {
-    if (!SimpleLauncherIcon::GetQuirk(Quirk::ACTIVE))
+    if (!SimpleLauncherIcon::GetQuirk(Quirk::ACTIVE, monitor))
       return false;
 
     if (app_->type() == "webapp")
@@ -242,7 +242,7 @@
     return app_->OwnsWindow(WindowManager::Default().GetActiveWindow());
   }
 
-  return SimpleLauncherIcon::GetQuirk(quirk);
+  return SimpleLauncherIcon::GetQuirk(quirk, monitor);
 }
 
 void ApplicationLauncherIcon::Remove()
@@ -491,11 +491,15 @@
 
 void ApplicationLauncherIcon::OnWindowMinimized(guint32 xid)
 {
-  if (!app_->OwnsWindow(xid))
-    return;
-
-  Present(0.5f, 600);
-  UpdateQuirkTimeDelayed(300, Quirk::SHIMMER);
+  for (auto const& window: app_->GetWindows())
+  {
+    if (xid == window->window_id())
+    {
+      Present(0.5f, 600, window->monitor());
+      UpdateQuirkTimeDelayed(300, Quirk::SHIMMER, window->monitor());
+      break;
+    }
+  }
 }
 
 void ApplicationLauncherIcon::OnWindowMoved(guint32 moved_win)
@@ -713,8 +717,6 @@
 
   for (unsigned i = 0; i < monitors::MAX; i++)
     SetWindowVisibleOnMonitor(monitors[i], i);
-
-  EmitNeedsRedraw();
 }
 
 void ApplicationLauncherIcon::UpdateDesktopQuickList()

=== modified file 'launcher/ApplicationLauncherIcon.h'
--- launcher/ApplicationLauncherIcon.h	2013-10-10 12:22:47 +0000
+++ launcher/ApplicationLauncherIcon.h	2013-10-22 12:34:26 +0000
@@ -52,7 +52,7 @@
   bool IsRunning() const;
   bool IsUrgent() const;
 
-  virtual bool GetQuirk(Quirk quirk) const;
+  virtual bool GetQuirk(Quirk quirk, int monitor = 0) const override;
 
   virtual void Quit();
   virtual void AboutToRemove();

=== modified file 'launcher/BFBLauncherIcon.cpp'
--- launcher/BFBLauncherIcon.cpp	2013-09-13 06:31:30 +0000
+++ launcher/BFBLauncherIcon.cpp	2013-10-22 12:34:26 +0000
@@ -38,7 +38,6 @@
   icon_name = PKGDATADIR"/launcher_bfb.png";
   position = Position::BEGIN;
   SetQuirk(Quirk::VISIBLE, true);
-  SetQuirk(Quirk::RUNNING, false);
 
   background_color_ = nux::color::White;
 
@@ -64,8 +63,7 @@
   if (overlay_identity.Str() == "dash" && IsVisibleOnMonitor(overlay_monitor))
   {
     tooltip_enabled = !visible;
-    SetQuirk(Quirk::ACTIVE, visible);
-    EmitNeedsRedraw();
+    SetQuirk(Quirk::ACTIVE, visible, overlay_monitor);
   }
   // If the hud is open, we hide the BFB if we have a locked launcher
   else if (overlay_identity.Str() == "hud")
@@ -73,7 +71,7 @@
     if (launcher_hide_mode_ == LAUNCHER_HIDE_NEVER)
     {
       SetVisibleOnMonitor(overlay_monitor, !visible);
-      EmitNeedsRedraw();
+      ResetQuirkTime(Quirk::VISIBLE, overlay_monitor);
     }
   }
 }

=== modified file 'launcher/DesktopLauncherIcon.cpp'
--- launcher/DesktopLauncherIcon.cpp	2013-08-05 13:59:08 +0000
+++ launcher/DesktopLauncherIcon.cpp	2013-10-22 12:34:26 +0000
@@ -36,7 +36,6 @@
   tooltip_text = _("Show Desktop");
   icon_name = "desktop";
   SetQuirk(Quirk::VISIBLE, true);
-  SetQuirk(Quirk::RUNNING, false);
   SetShortcut('d');
 }
 

=== modified file 'launcher/ExpoLauncherIcon.cpp'
--- launcher/ExpoLauncherIcon.cpp	2013-08-05 13:59:08 +0000
+++ launcher/ExpoLauncherIcon.cpp	2013-10-22 12:34:26 +0000
@@ -34,8 +34,6 @@
 {
   tooltip_text = _("Workspace Switcher");
   icon_name = "workspace-switcher-top-left";
-  SetQuirk(Quirk::VISIBLE, false);
-  SetQuirk(Quirk::RUNNING, false);
   SetShortcut('s');
 
   auto& wm = WindowManager::Default();

=== modified file 'launcher/HudLauncherIcon.cpp'
--- launcher/HudLauncherIcon.cpp	2013-09-13 06:31:30 +0000
+++ launcher/HudLauncherIcon.cpp	2013-10-22 12:34:26 +0000
@@ -34,14 +34,13 @@
 DECLARE_LOGGER(logger, "unity.launcher.icon.hud");
 
 HudLauncherIcon::HudLauncherIcon(LauncherHideMode hide_mode)
- : SingleMonitorLauncherIcon(IconType::HUD, 0)
+ : SingleMonitorLauncherIcon(IconType::HUD)
  , launcher_hide_mode_(hide_mode)
 {
   tooltip_text = _("HUD");
+  tooltip_enabled = false;
   icon_name = PKGDATADIR"/launcher_bfb.png";
   position = Position::BEGIN;
-  SetQuirk(Quirk::VISIBLE, false);
-  SetQuirk(Quirk::RUNNING, false);
   SetQuirk(Quirk::ACTIVE, true);
 
   background_color_ = nux::color::White;
@@ -55,7 +54,7 @@
                                  sigc::bind(sigc::mem_fun(this, &HudLauncherIcon::OnOverlayShown),
                                             false));
 
-  mouse_enter.connect([&](int m) { ubus_manager_.SendMessage(UBUS_DASH_ABOUT_TO_SHOW); });
+  mouse_enter.connect([this](int m) { ubus_manager_.SendMessage(UBUS_DASH_ABOUT_TO_SHOW); });
 }
 
 void HudLauncherIcon::OnHudIconChanged(GVariant *data)
@@ -68,8 +67,6 @@
       icon_name = PKGDATADIR"/launcher_bfb.png";
     else
       icon_name = hud_icon_name;
-
-    EmitNeedsRedraw();
   }
 }
 
@@ -97,11 +94,8 @@
   if (overlay_identity.Str() == "hud" &&
       launcher_hide_mode_ == LAUNCHER_HIDE_NEVER)
   {
-    SetMonitor(overlay_monitor);
-    SetQuirk(Quirk::VISIBLE, visible);
-    SetQuirk(Quirk::ACTIVE, visible);
-    tooltip_enabled = !visible;
-    EmitNeedsRedraw();
+    SetMonitor(visible ? overlay_monitor : -1);
+    ResetQuirkTime(Quirk::VISIBLE, overlay_monitor);
   }
 }
 

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2013-10-11 18:16:10 +0000
+++ launcher/Launcher.cpp	2013-10-22 12:34:26 +0000
@@ -69,6 +69,7 @@
 const int ICON_PADDING = 6;
 const int RIGHT_LINE_WIDTH = 1;
 
+const int ANIM_DURATION_SHORT = 125;
 const int ANIM_DURATION_SHORT_SHORT = 100;
 const int ANIM_DURATION = 200;
 const int ANIM_DURATION_LONG = 350;
@@ -100,8 +101,6 @@
 
 NUX_IMPLEMENT_OBJECT_TYPE(Launcher);
 
-const int Launcher::Launcher::ANIM_DURATION_SHORT = 125;
-
 Launcher::Launcher(MockableBaseWindow* parent,
                    NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
@@ -315,55 +314,55 @@
 
 bool Launcher::IconNeedsAnimation(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const
 {
-  struct timespec time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::VISIBLE);
-  if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION_SHORT)
-    return true;
-
-  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::RUNNING);
-  if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION_SHORT)
-    return true;
-
-  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::STARTING);
+  struct timespec time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::VISIBLE, monitor());
+  if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION_SHORT)
+    return true;
+
+  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::RUNNING, monitor());
+  if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION_SHORT)
+    return true;
+
+  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::STARTING, monitor());
   if (unity::TimeUtil::TimeDelta(&current, &time) < (ANIM_DURATION_LONG * MAX_STARTING_BLINKS * STARTING_BLINK_LAMBDA * 2))
     return true;
 
-  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::URGENT);
+  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::URGENT, monitor());
   if (unity::TimeUtil::TimeDelta(&current, &time) < (ANIM_DURATION_LONG * URGENT_BLINKS * 2))
     return true;
 
-  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::PULSE_ONCE);
+  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::PULSE_ONCE, monitor());
   if (unity::TimeUtil::TimeDelta(&current, &time) < (ANIM_DURATION_LONG * PULSE_BLINK_LAMBDA * 2))
     return true;
 
-  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::PRESENTED);
-  if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION)
-    return true;
-
-  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::UNFOLDED);
-  if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION)
-    return true;
-
-  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::SHIMMER);
+  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::PRESENTED, monitor());
+  if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION)
+    return true;
+
+  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::UNFOLDED, monitor());
+  if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION)
+    return true;
+
+  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::SHIMMER, monitor());
   if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION_LONG)
     return true;
 
-  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::CENTER_SAVED);
-  if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION)
-    return true;
-
-  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::PROGRESS);
-  if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION)
-    return true;
-
-  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::DROP_DIM);
-  if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION)
-    return true;
-
-  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::DESAT);
+  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::CENTER_SAVED, monitor());
+  if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION)
+    return true;
+
+  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::PROGRESS, monitor());
+  if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION)
+    return true;
+
+  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::DROP_DIM, monitor());
+  if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION)
+    return true;
+
+  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::DESAT, monitor());
   if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION_SHORT_SHORT)
     return true;
 
-  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::DROP_PRELIGHT);
+  time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::DROP_PRELIGHT, monitor());
   if (unity::TimeUtil::TimeDelta(&current, &time) < ANIM_DURATION)
     return true;
 
@@ -407,23 +406,15 @@
 
 float Launcher::IconVisibleProgress(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const
 {
-  if (!icon->IsVisibleOnMonitor(monitor))
-    return 0.0f;
-
-  if (icon->GetIconType() == AbstractLauncherIcon::IconType::HUD)
-  {
-    return icon->IsVisible() ? 1.0f : 0.0f;
-  }
-
-  if (icon->IsVisible())
-  {
-    struct timespec icon_visible_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::VISIBLE);
+  if (icon->IsVisibleOnMonitor(monitor))
+  {
+    struct timespec icon_visible_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::VISIBLE, monitor());
     DeltaTime enter_ms = unity::TimeUtil::TimeDelta(&current, &icon_visible_time);
     return CLAMP((float) enter_ms / (float) ANIM_DURATION_SHORT, 0.0f, 1.0f);
   }
   else
   {
-    struct timespec icon_hide_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::VISIBLE);
+    struct timespec icon_hide_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::VISIBLE, monitor());
     DeltaTime hide_ms = unity::TimeUtil::TimeDelta(&current, &icon_hide_time);
     return 1.0f - CLAMP((float) hide_ms / (float) ANIM_DURATION_SHORT, 0.0f, 1.0f);
   }
@@ -431,7 +422,7 @@
 
 void Launcher::SetDndDelta(float x, float y, nux::Geometry const& geo, timespec const& current)
 {
-  AbstractLauncherIcon::Ptr const& anchor = MouseIconIntersection(x, enter_y_);
+  auto const& anchor = MouseIconIntersection(x, enter_y_);
 
   if (anchor)
   {
@@ -455,11 +446,11 @@
 
 float Launcher::IconPresentProgress(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const
 {
-  struct timespec icon_present_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::PRESENTED);
+  struct timespec icon_present_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::PRESENTED, monitor());
   DeltaTime ms = unity::TimeUtil::TimeDelta(&current, &icon_present_time);
   float result = CLAMP((float) ms / (float) ANIM_DURATION, 0.0f, 1.0f);
 
-  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::PRESENTED))
+  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::PRESENTED, monitor()))
     return result;
   else
     return 1.0f - result;
@@ -467,11 +458,11 @@
 
 float Launcher::IconUnfoldProgress(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const
 {
-  struct timespec icon_unfold_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::UNFOLDED);
+  struct timespec icon_unfold_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::UNFOLDED, monitor());
   DeltaTime ms = unity::TimeUtil::TimeDelta(&current, &icon_unfold_time);
   float result = CLAMP((float) ms / (float) ANIM_DURATION, 0.0f, 1.0f);
 
-  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::UNFOLDED))
+  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::UNFOLDED, monitor()))
     return result;
   else
     return 1.0f - result;
@@ -479,7 +470,7 @@
 
 float Launcher::IconUrgentProgress(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const
 {
-  struct timespec urgent_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::URGENT);
+  struct timespec urgent_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::URGENT, monitor());
   DeltaTime urgent_ms = unity::TimeUtil::TimeDelta(&current, &urgent_time);
   float result;
 
@@ -488,7 +479,7 @@
   else
     result = CLAMP((float) urgent_ms / (float)(ANIM_DURATION_LONG * URGENT_BLINKS * 2), 0.0f, 1.0f);
 
-  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT))
+  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT, monitor()))
     return result;
   else
     return 1.0f - result;
@@ -496,11 +487,11 @@
 
 float Launcher::IconDropDimValue(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const
 {
-  struct timespec dim_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::DROP_DIM);
+  struct timespec dim_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::DROP_DIM, monitor());
   DeltaTime dim_ms = unity::TimeUtil::TimeDelta(&current, &dim_time);
   float result = CLAMP((float) dim_ms / (float) ANIM_DURATION, 0.0f, 1.0f);
 
-  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::DROP_DIM))
+  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::DROP_DIM, monitor()))
     return 1.0f - result;
   else
     return result;
@@ -508,11 +499,11 @@
 
 float Launcher::IconDesatValue(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const
 {
-  struct timespec dim_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::DESAT);
+  struct timespec dim_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::DESAT, monitor());
   DeltaTime ms = unity::TimeUtil::TimeDelta(&current, &dim_time);
   float result = CLAMP((float) ms / (float) ANIM_DURATION_SHORT_SHORT, 0.0f, 1.0f);
 
-  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT))
+  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, monitor()))
     return 1.0f - result;
   else
     return result;
@@ -520,21 +511,21 @@
 
 float Launcher::IconShimmerProgress(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const
 {
-  struct timespec shimmer_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::SHIMMER);
+  struct timespec shimmer_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::SHIMMER, monitor());
   DeltaTime shimmer_ms = unity::TimeUtil::TimeDelta(&current, &shimmer_time);
   return CLAMP((float) shimmer_ms / (float) ANIM_DURATION_LONG, 0.0f, 1.0f);
 }
 
 float Launcher::IconCenterTransitionProgress(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const
 {
-  struct timespec save_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::CENTER_SAVED);
+  struct timespec save_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::CENTER_SAVED, monitor());
   DeltaTime save_ms = unity::TimeUtil::TimeDelta(&current, &save_time);
   return CLAMP((float) save_ms / (float) ANIM_DURATION, 0.0f, 1.0f);
 }
 
 float Launcher::IconUrgentPulseValue(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const
 {
-  if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT))
+  if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT, monitor()))
     return 1.0f; // we are full on in a normal condition
 
   double urgent_progress = (double) IconUrgentProgress(icon, current);
@@ -543,19 +534,19 @@
 
 float Launcher::IconPulseOnceValue(AbstractLauncherIcon::Ptr const& icon, struct timespec const &current) const
 {
-  struct timespec pulse_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::PULSE_ONCE);
+  struct timespec pulse_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::PULSE_ONCE, monitor());
   DeltaTime pulse_ms = unity::TimeUtil::TimeDelta(&current, &pulse_time);
   double pulse_progress = (double) CLAMP((float) pulse_ms / (ANIM_DURATION_LONG * PULSE_BLINK_LAMBDA * 2), 0.0f, 1.0f);
 
   if (pulse_progress == 1.0f)
-    icon->SetQuirk(AbstractLauncherIcon::Quirk::PULSE_ONCE, false);
+    icon->SetQuirk(AbstractLauncherIcon::Quirk::PULSE_ONCE, false, monitor());
 
   return 0.5f + (float) (std::cos(M_PI * 2.0 * pulse_progress)) * 0.5f;
 }
 
 float Launcher::IconUrgentWiggleValue(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const
 {
-  if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT))
+  if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT, monitor()))
     return 0.0f; // we are full on in a normal condition
 
   double urgent_progress = (double) IconUrgentProgress(icon, current);
@@ -564,13 +555,13 @@
 
 float Launcher::IconStartingBlinkValue(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const
 {
-  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING))
-    return 1.0f;
-
-  if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::STARTING))
-    return 1.0f;
-
-  struct timespec starting_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::STARTING);
+  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING, monitor()))
+    return 1.0f;
+
+  if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::STARTING, monitor()))
+    return 1.0f;
+
+  struct timespec starting_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::STARTING, monitor());
   DeltaTime starting_ms = unity::TimeUtil::TimeDelta(&current, &starting_time);
   double starting_progress = (double) CLAMP((float) starting_ms / (float)(ANIM_DURATION_LONG * STARTING_BLINK_LAMBDA), 0.0f, 1.0f);
   double val = IsBackLightModeToggles() ? 3.0f : 4.0f;
@@ -579,20 +570,20 @@
 
 float Launcher::IconStartingPulseValue(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const
 {
-  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING))
-    return 1.0f;
-
-  if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::STARTING))
-    return 1.0f;
-
-  struct timespec starting_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::STARTING);
+  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING, monitor()))
+    return 1.0f;
+
+  if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::STARTING, monitor()))
+    return 1.0f;
+
+  struct timespec starting_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::STARTING, monitor());
   DeltaTime starting_ms = unity::TimeUtil::TimeDelta(&current, &starting_time);
   double starting_progress = (double) CLAMP((float) starting_ms / (float)(ANIM_DURATION_LONG * MAX_STARTING_BLINKS * STARTING_BLINK_LAMBDA * 2), 0.0f, 1.0f);
 
-  if (starting_progress == 1.0f && !icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING))
+  if (starting_progress == 1.0f && !icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING, monitor()))
   {
-    icon->SetQuirk(AbstractLauncherIcon::Quirk::STARTING, false);
-    icon->ResetQuirkTime(AbstractLauncherIcon::Quirk::STARTING);
+    icon->SetQuirk(AbstractLauncherIcon::Quirk::STARTING, false, monitor());
+    icon->ResetQuirkTime(AbstractLauncherIcon::Quirk::STARTING, monitor());
   }
 
   return 1.0f-(0.5f + (float)(std::cos(M_PI * (float)(MAX_STARTING_BLINKS * 2) * starting_progress)) * 0.5f);
@@ -602,16 +593,16 @@
 {
   float result = 0.0f;
 
-  struct timespec running_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::RUNNING);
+  struct timespec running_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::RUNNING, monitor());
   DeltaTime running_ms = unity::TimeUtil::TimeDelta(&current, &running_time);
   float running_progress = CLAMP((float) running_ms / (float) ANIM_DURATION_SHORT, 0.0f, 1.0f);
 
-  if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING))
+  if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING, monitor()))
     running_progress = 1.0f - running_progress;
 
   // After we finish a fade in from running, we can reset the quirk
-  if (running_progress == 1.0f && icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING))
-    icon->SetQuirk(AbstractLauncherIcon::Quirk::STARTING, false);
+  if (running_progress == 1.0f && icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING, monitor()))
+    icon->SetQuirk(AbstractLauncherIcon::Quirk::STARTING, false, monitor());
 
   float backlight_strength;
   if (options()->backlight_mode() == BACKLIGHT_ALWAYS_ON)
@@ -635,8 +626,8 @@
         result = backlight_strength; // The blink concept is a failure in this case (it just doesn't work right)
       break;
     case LAUNCH_ANIMATION_PULSE:
-      if (running_progress == 1.0f && icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING))
-        icon->ResetQuirkTime(AbstractLauncherIcon::Quirk::STARTING);
+      if (running_progress == 1.0f && icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING, monitor()))
+        icon->ResetQuirkTime(AbstractLauncherIcon::Quirk::STARTING, monitor());
 
       result = backlight_strength;
       if (options()->backlight_mode() == BACKLIGHT_ALWAYS_ON)
@@ -648,7 +639,7 @@
       break;
   }
 
-  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::PULSE_ONCE))
+  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::PULSE_ONCE, monitor()))
   {
     if (options()->backlight_mode() == BACKLIGHT_ALWAYS_ON)
       result *= CLAMP(running_progress + IconPulseOnceValue(icon, current), 0.0f, 1.0f);
@@ -659,7 +650,7 @@
   }
 
   // urgent serves to bring the total down only
-  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT) && options()->urgent_animation() == URGENT_ANIMATION_PULSE)
+  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT, monitor()) && options()->urgent_animation() == URGENT_ANIMATION_PULSE)
     result *= 0.2f + 0.8f * IconUrgentPulseValue(icon, current);
 
   return result;
@@ -667,11 +658,11 @@
 
 float Launcher::IconProgressBias(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current) const
 {
-  struct timespec icon_progress_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::PROGRESS);
+  struct timespec icon_progress_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::PROGRESS, monitor());
   DeltaTime ms = unity::TimeUtil::TimeDelta(&current, &icon_progress_time);
   float result = CLAMP((float) ms / (float) ANIM_DURATION, 0.0f, 1.0f);
 
-  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::PROGRESS))
+  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::PROGRESS, monitor()))
     return -1.0f + result;
   else
     return result;
@@ -695,8 +686,8 @@
   arg.alpha               = 0.2f + 0.8f * desat_value;
   arg.saturation          = desat_value;
   arg.colorify            = nux::color::White;
-  arg.running_arrow       = icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING);
-  arg.running_colored     = icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT);
+  arg.running_arrow       = icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING, monitor());
+  arg.running_colored     = icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT, monitor());
   arg.draw_edge_only      = IconDrawEdgeOnly(icon);
   arg.active_colored      = false;
   arg.skip                = false;
@@ -721,7 +712,7 @@
     arg.saturation = 0.0;
   }
 
-  arg.active_arrow = icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE);
+  arg.active_arrow = icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, monitor());
 
   /* BFB or HUD icons don't need the active arrow if the overaly is opened
    * in another monitor */
@@ -744,7 +735,7 @@
     arg.shortcut_label = 0;
 
   // we dont need to show strays
-  if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING))
+  if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::RUNNING, monitor()))
   {
     arg.window_indicators = 0;
   }
@@ -768,13 +759,13 @@
 
   float urgent_progress = IconUrgentProgress(icon, current);
 
-  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT))
+  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT, monitor()))
     urgent_progress = CLAMP(urgent_progress * 3.0f, 0.0f, 1.0f);  // we want to go 3x faster than the urgent normal cycle
   else
     urgent_progress = CLAMP(urgent_progress * 3.0f - 2.0f, 0.0f, 1.0f);  // we want to go 3x faster than the urgent normal cycle
   arg.glow_intensity = urgent_progress;
 
-  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT) && options()->urgent_animation() == URGENT_ANIMATION_WIGGLE)
+  if (icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT, monitor()) && options()->urgent_animation() == URGENT_ANIMATION_WIGGLE)
   {
     arg.rotation.z = IconUrgentWiggleValue(icon, current);
   }
@@ -1059,7 +1050,7 @@
     RenderArg arg;
     AbstractLauncherIcon::Ptr const& icon = *it;
 
-    if (icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT) && options()->hide_mode == LAUNCHER_HIDE_AUTOHIDE)
+    if (icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT, monitor()) && options()->hide_mode == LAUNCHER_HIDE_AUTOHIDE)
     {
       HandleUrgentIcon(icon, current);
     }
@@ -1126,7 +1117,6 @@
   }
 }
 
-// FIXME: add monitor-aware quirks!
 void Launcher::DesaturateIcons()
 {
   bool inactive_only = WindowManager::Default().IsScaleActiveForGroup();
@@ -1137,12 +1127,12 @@
 
     if (icon->GetIconType () != AbstractLauncherIcon::IconType::HOME &&
         icon->GetIconType () != AbstractLauncherIcon::IconType::HUD &&
-        (!inactive_only || !icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE)))
+        (!inactive_only || !icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, monitor())))
     {
       desaturate = true;
     }
 
-    icon->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, desaturate);
+    icon->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, desaturate, monitor());
     icon->HideTooltip();
   }
 }
@@ -1151,7 +1141,7 @@
 {
   for (auto const& icon : *model_)
   {
-    icon->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, false);
+    icon->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, false, monitor());
   }
 }
 
@@ -1186,7 +1176,9 @@
     {
       hud_is_open_ = true;
     }
+
     bg_effect_helper_.enabled = true;
+
     // Don't desaturate icons if the mouse is over the launcher:
     if (!hovered_)
     {
@@ -1196,8 +1188,6 @@
 
     if (icon_under_mouse_)
       icon_under_mouse_->HideTooltip();
-
-    QueueDraw();
   }
 }
 
@@ -1238,6 +1228,7 @@
       bg_effect_helper_.enabled = false;
       LOG_DEBUG(logger) << "Saturate on monitor " << monitor();
       SaturateIcons();
+      QueueDraw();
     }
   }
 
@@ -1245,8 +1236,6 @@
   // FIXME: remove when we change the mouse grab strategy in nux
   nux::Point pt = nux::GetWindowCompositor().GetMousePosition();
   SetStateMouseOverLauncher(GetAbsoluteGeometry().IsInside(pt));
-
-  QueueDraw();
 }
 
 bool Launcher::IsOverlayOpen() const
@@ -1537,15 +1526,15 @@
 
 void Launcher::WiggleUrgentIcon(AbstractLauncherIcon::Ptr const& icon)
 {
-  icon->SetQuirk(AbstractLauncherIcon::Quirk::URGENT, false);
-  icon->SetQuirk(AbstractLauncherIcon::Quirk::URGENT, true);
+  icon->SetQuirk(AbstractLauncherIcon::Quirk::URGENT, false, monitor());
+  icon->SetQuirk(AbstractLauncherIcon::Quirk::URGENT, true, monitor());
 
   clock_gettime(CLOCK_MONOTONIC, &urgent_finished_time_);
 }
 
 void Launcher::HandleUrgentIcon(AbstractLauncherIcon::Ptr const& icon, struct timespec const& current)
 {
-  struct timespec urgent_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::URGENT);
+  struct timespec urgent_time = icon->GetQuirkTime(AbstractLauncherIcon::Quirk::URGENT, monitor());
   DeltaTime urgent_delta = unity::TimeUtil::TimeDelta(&urgent_time, &urgent_finished_time_);
 
   // If the Launcher is hidden, then add a timer to wiggle the urgent icons at
@@ -1602,7 +1591,7 @@
     // Look for any icons that are still urgent and wiggle them
     for (auto icon : *model_)
     {
-      if (icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT))
+      if (icon->GetQuirk(AbstractLauncherIcon::Quirk::URGENT, monitor()))
       {
         WiggleUrgentIcon(icon);
 
@@ -1663,12 +1652,24 @@
   ConfigureBarrier();
 }
 
+void Launcher::OnIconNeedsRedraw(AbstractLauncherIcon::Ptr const& icon, int icon_monitor)
+{
+  if (icon_monitor < 0 || icon_monitor == monitor())
+    QueueDraw();
+}
+
 void Launcher::OnIconAdded(AbstractLauncherIcon::Ptr const& icon)
 {
   QueueDraw();
 
-  icon->needs_redraw.connect(sigc::hide(sigc::mem_fun(this, &Launcher::QueueDraw)));
+  icon->needs_redraw.connect(sigc::mem_fun(this, &Launcher::OnIconNeedsRedraw));
   icon->tooltip_visible.connect(sigc::mem_fun(this, &Launcher::OnTooltipVisible));
+
+  if (IsOverlayOpen() && !hovered_)
+  {
+    icon->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, true, monitor());
+    icon->ResetQuirkTime(AbstractLauncherIcon::Quirk::DESAT, monitor());
+  }
 }
 
 void Launcher::OnIconRemoved(AbstractLauncherIcon::Ptr const& icon)
@@ -1685,7 +1686,7 @@
 void Launcher::SetModel(LauncherModel::Ptr model)
 {
   model_ = model;
-  auto const& queue_draw_cb = sigc::hide(sigc::mem_fun(this, &Launcher::QueueDraw));
+  auto const& queue_draw_cb = sigc::mem_fun(this, &Launcher::OnIconNeedsRedraw);
 
   for (auto const& icon : *model_)
     icon->needs_redraw.connect(queue_draw_cb);
@@ -1708,7 +1709,7 @@
   int natural_y = 0;
   for (auto icon : *model_)
   {
-    if (!icon->IsVisible() || !icon->IsVisibleOnMonitor(monitor))
+    if (!icon->IsVisibleOnMonitor(monitor))
       continue;
 
     if (icon == selection)
@@ -1992,8 +1993,8 @@
 
 void Launcher::StartIconDragRequest(int x, int y)
 {
-  nux::Geometry const& abs_geo = GetAbsoluteGeometry();
-  AbstractLauncherIcon::Ptr const& drag_icon = MouseIconIntersection(abs_geo.width / 2.0f, y);
+  auto const& abs_geo = GetAbsoluteGeometry();
+  auto const& drag_icon = MouseIconIntersection(abs_geo.width / 2.0f, y);
 
   // FIXME: nux doesn't give nux::GetEventButton (button_flags) there, relying
   // on an internal Launcher property then
@@ -2051,7 +2052,7 @@
 
     if (hovered_icon && hovered_icon->GetIconType() == AbstractLauncherIcon::IconType::TRASH)
     {
-      hovered_icon->SetQuirk(AbstractLauncherIcon::Quirk::PULSE_ONCE, true);
+      hovered_icon->SetQuirk(AbstractLauncherIcon::Quirk::PULSE_ONCE, true, monitor());
 
       remove_request.emit(drag_icon_);
 
@@ -2149,7 +2150,7 @@
     {
       auto const& icon = *it;
 
-      if (!icon->IsVisible() || !icon->IsVisibleOnMonitor(monitor))
+      if (!icon->IsVisibleOnMonitor(monitor))
         continue;
 
       if (y >= icon->GetCenter(monitor).y)
@@ -2268,7 +2269,7 @@
   if (WindowManager::Default().IsScaleActiveForGroup())
   {
     auto icon = MouseIconIntersection(x, y);
-    if (icon && !icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE))
+    if (icon && !icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, monitor()))
       SaturateIcons();
   }
 
@@ -2480,7 +2481,7 @@
 
   for (it = model_->begin(); it != model_->end(); ++it)
   {
-    if (!(*it)->IsVisible() || !(*it)->IsVisibleOnMonitor(monitor))
+    if (!(*it)->IsVisibleOnMonitor(monitor))
       continue;
 
     nux::Point2 screen_coord [4];
@@ -2585,18 +2586,16 @@
   for (auto it : *model_)
   {
     auto icon_type = it->GetIconType();
-
-    if (icon_type == AbstractLauncherIcon::IconType::HOME ||
-        icon_type == AbstractLauncherIcon::IconType::HUD)
-    {
-      it->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, false);
-    }
-    else
-    {
-      it->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, is_overlay_open && !hovered_);
-    }
-
-    it->SetQuirk(AbstractLauncherIcon::Quirk::UNFOLDED, false);
+    bool desaturate = false;
+
+    if (icon_type != AbstractLauncherIcon::IconType::HOME &&
+        icon_type != AbstractLauncherIcon::IconType::HUD)
+    {
+      desaturate = is_overlay_open && !hovered_;
+    }
+
+    it->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, desaturate, monitor());
+    it->SetQuirk(AbstractLauncherIcon::Quirk::UNFOLDED, false, monitor());
   }
 
   DndHoveredIconReset();
@@ -2610,7 +2609,7 @@
 
   if (steal_drag_ && dnd_hovered_icon_)
   {
-    dnd_hovered_icon_->SetQuirk(AbstractLauncherIcon::Quirk::VISIBLE, false);
+    dnd_hovered_icon_->SetQuirk(AbstractLauncherIcon::Quirk::VISIBLE, false, monitor());
     dnd_hovered_icon_->remove.emit(dnd_hovered_icon_);
   }
 
@@ -2663,17 +2662,6 @@
     // only set hover once we know our first x/y
     SetActionState(ACTION_DRAG_EXTERNAL);
     SetStateMouseOverLauncher(true);
-
-    if (!steal_drag_ && !dnd_data_.Uris().empty())
-    {
-      for (auto const& it : *model_)
-      {
-        if (it->ShouldHighlightOnDrag(dnd_data_))
-          it->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, false);
-        else
-          it->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, true);
-      }
-    }
   }
 
   SetMousePosition(x - parent_->GetGeometry().x, y - parent_->GetGeometry().y);
@@ -2697,7 +2685,7 @@
   }
 
   EventLogic();
-  AbstractLauncherIcon::Ptr const& hovered_icon = MouseIconIntersection(mouse_position_.x, mouse_position_.y);
+  auto const& hovered_icon = MouseIconIntersection(mouse_position_.x, mouse_position_.y);
 
   bool hovered_icon_is_appropriate = false;
   if (hovered_icon)
@@ -2728,7 +2716,7 @@
         }
         else
         {
-          dnd_hovered_icon_->SetQuirk(AbstractLauncherIcon::Quirk::VISIBLE, false);
+          dnd_hovered_icon_->SetQuirk(AbstractLauncherIcon::Quirk::VISIBLE, false, monitor());
           dnd_hovered_icon_->remove.emit(dnd_hovered_icon_);
           dnd_hovered_icon_ = nullptr;
         }
@@ -2845,13 +2833,13 @@
     {
       if (it->ShouldHighlightOnDrag(dnd_data_))
       {
-        it->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, false);
-        it->SetQuirk(AbstractLauncherIcon::Quirk::UNFOLDED, true);
+        it->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, false, monitor());
+        it->SetQuirk(AbstractLauncherIcon::Quirk::UNFOLDED, true, monitor());
       }
       else
       {
-        it->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, true);
-        it->SetQuirk(AbstractLauncherIcon::Quirk::UNFOLDED, false);
+        it->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, true, monitor());
+        it->SetQuirk(AbstractLauncherIcon::Quirk::UNFOLDED, false, monitor());
       }
     }
   }
@@ -2865,9 +2853,6 @@
 
   data_checked_ = false;
 
-  if (IsOverlayOpen() && !hovered_)
-    DesaturateIcons();
-
   DndReset();
 #endif
 }
@@ -2882,6 +2867,20 @@
 void Launcher::UnsetDndQuirk()
 {
 #ifdef USE_X11
+
+  if (IsOverlayOpen() && !hovered_)
+  {
+    DesaturateIcons();
+  }
+  else
+  {
+    for (auto const& it : *model_)
+    {
+      it->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, false, monitor());
+      it->SetQuirk(AbstractLauncherIcon::Quirk::UNFOLDED, false, monitor());
+    }
+  }
+
   hide_machine_.SetQuirk(LauncherHideMachine::EXTERNAL_DND_ACTIVE, false);
   hide_machine_.SetQuirk(LauncherHideMachine::EXTERNAL_DND_ACTIVE, false);
 #endif

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2013-10-11 12:37:51 +0000
+++ launcher/Launcher.h	2013-10-22 12:34:26 +0000
@@ -147,11 +147,8 @@
   void EnterKeyNavMode();
   void ExitKeyNavMode();
   bool IsInKeyNavMode() const;
-
   bool IsOverlayOpen() const;
 
-  static const int ANIM_DURATION_SHORT;
-
   void RenderIconToTexture(nux::GraphicsEngine&, nux::ObjectPtr<nux::IOpenGLBaseTexture> const&, AbstractLauncherIcon::Ptr const&);
 
 #ifdef NUX_GESTURES_SUPPORT
@@ -275,6 +272,7 @@
 
   void OnIconAdded(AbstractLauncherIcon::Ptr const& icon);
   void OnIconRemoved(AbstractLauncherIcon::Ptr const& icon);
+  void OnIconNeedsRedraw(AbstractLauncherIcon::Ptr const& icon, int monitor);
 
   void OnTooltipVisible(nux::ObjectPtr<nux::View> view);
 

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2013-10-07 14:13:45 +0000
+++ launcher/LauncherController.cpp	2013-10-22 12:34:26 +0000
@@ -118,7 +118,6 @@
   , reactivate_keynav(false)
   , keynav_restore_window_(true)
   , launcher_key_press_time_(0)
-  , last_dnd_monitor_(-1)
   , dbus_server_(DBUS_NAME)
 {
 #ifdef USE_X11
@@ -276,8 +275,7 @@
 {
   if (parent_->multiple_launchers)
   {
-    last_dnd_monitor_ = monitor;
-    launchers[last_dnd_monitor_]->DndStarted(data);
+    launchers[monitor]->DndStarted(data);
   }
   else
   {
@@ -289,8 +287,8 @@
 {
   if (parent_->multiple_launchers)
   {
-    launchers[last_dnd_monitor_]->DndFinished();
-    last_dnd_monitor_ = -1;
+    if (xdnd_manager_->Monitor() >= 0)
+      launchers[xdnd_manager_->Monitor()]->DndFinished();
   }
   else
   {
@@ -298,14 +296,15 @@
   }
 }
 
-void Controller::Impl::OnDndMonitorChanged(int monitor)
+void Controller::Impl::OnDndMonitorChanged(std::string const& data, int old_monitor, int new_monitor)
 {
   if (parent_->multiple_launchers)
   {
-    launchers[last_dnd_monitor_]->UnsetDndQuirk();
-    last_dnd_monitor_ = monitor;
-    launchers[last_dnd_monitor_]->SetDndQuirk();
- }
+    if (old_monitor >= 0)
+      launchers[old_monitor]->UnsetDndQuirk();
+
+    launchers[new_monitor]->DndStarted(data);
+  }
 }
 
 Launcher* Controller::Impl::CreateLauncher()
@@ -761,7 +760,7 @@
 
   if (icon->GetIconType() == AbstractLauncherIcon::IconType::APPLICATION)
   {
-    icon->visibility_changed.connect(sigc::mem_fun(this, &Impl::SortAndUpdate));
+    icon->visibility_changed.connect(sigc::hide(sigc::mem_fun(this, &Impl::SortAndUpdate)));
     SortAndUpdate();
   }
 
@@ -939,7 +938,6 @@
     return result;
 
   result = new SoftwareCenterLauncherIcon(app, aptdaemon_trans_id, icon_path);
-  result->Stick(false);
 
   return result;
 }
@@ -1250,7 +1248,7 @@
     if ((XKeysymToKeycode(display, (*it)->GetShortcut()) == key_code) ||
         ((gchar)((*it)->GetShortcut()) == key_string[0]))
     {
-      struct timespec last_action_time = (*it)->GetQuirkTime(AbstractLauncherIcon::Quirk::LAST_ACTION);
+      struct timespec last_action_time = (*it)->GetQuirkTime(AbstractLauncherIcon::Quirk::LAST_ACTION, 0);
       struct timespec current;
       TimeUtil::SetTimeStruct(&current);
       if (TimeUtil::TimeDelta(&current, &last_action_time) > local::ignore_repeat_shortcut_duration)

=== modified file 'launcher/LauncherControllerPrivate.h'
--- launcher/LauncherControllerPrivate.h	2013-10-07 14:13:45 +0000
+++ launcher/LauncherControllerPrivate.h	2013-10-22 12:34:26 +0000
@@ -115,7 +115,7 @@
 
   void OnDndStarted(std::string const& data, int monitor);
   void OnDndFinished();
-  void OnDndMonitorChanged(int monitor);
+  void OnDndMonitorChanged(std::string const& data, int old_monitor, int new_monitor);
   GVariant* OnDBusMethodCall(std::string const& method, GVariant *parameters);
 
   Controller* parent_;
@@ -142,7 +142,6 @@
   int reactivate_index;
   bool keynav_restore_window_;
   int launcher_key_press_time_;
-  int last_dnd_monitor_;
 
   glib::DBusServer dbus_server_;
   glib::SourceManager sources_;

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2013-10-11 20:37:05 +0000
+++ launcher/LauncherIcon.cpp	2013-10-22 12:34:26 +0000
@@ -23,11 +23,9 @@
 #include <NuxCore/Color.h>
 #include <NuxCore/Logger.h>
 
-#include "Launcher.h"
 #include "LauncherIcon.h"
 #include "unity-shared/AnimationUtils.h"
 #include "unity-shared/CairoTexture.h"
-#include "unity-shared/TimeUtil.h"
 
 #include "QuicklistManager.h"
 #include "QuicklistMenuItem.h"
@@ -75,20 +73,14 @@
   , _background_color(nux::color::White)
   , _glow_color(nux::color::White)
   , _shortcut(0)
+  , _allow_quicklist_to_show(true)
   , _center(monitors::MAX)
   , _has_visible_window(monitors::MAX, false)
-  , _is_visible_on_monitor(monitors::MAX, true)
+  , _quirks(monitors::MAX, decltype(_quirks)::value_type(unsigned(Quirk::LAST), false))
+  , _quirk_times(monitors::MAX, decltype(_quirk_times)::value_type(unsigned(Quirk::LAST)))
   , _last_stable(monitors::MAX)
   , _saved_center(monitors::MAX)
-  , _allow_quicklist_to_show(true)
 {
-  for (unsigned i = 0; i < unsigned(Quirk::LAST); ++i)
-  {
-    _quirks[i] = false;
-    _quirk_times[i].tv_sec = 0;
-    _quirk_times[i].tv_nsec = 0;
-  }
-
   tooltip_enabled = true;
   tooltip_enabled.changed.connect(sigc::mem_fun(this, &LauncherIcon::OnTooltipEnabledChanged));
   tooltip_text.SetSetterFunction(sigc::mem_fun(this, &LauncherIcon::SetTooltipText));
@@ -652,7 +644,7 @@
     }
 
     return false;
-  }, CENTER_STABILIZE_TIMEOUT);
+  }, CENTER_STABILIZE_TIMEOUT + std::to_string(monitor));
 }
 
 nux::Point3
@@ -686,23 +678,19 @@
     return;
 
   _has_visible_window[monitor] = val;
-  EmitNeedsRedraw();
+  EmitNeedsRedraw(monitor);
 }
 
 void
 LauncherIcon::SetVisibleOnMonitor(int monitor, bool visible)
 {
-  if (_is_visible_on_monitor[monitor] == visible)
-    return;
-
-  _is_visible_on_monitor[monitor] = visible;
-  EmitNeedsRedraw();
+  SetQuirk(Quirk::VISIBLE, visible, monitor);
 }
 
 bool
 LauncherIcon::IsVisibleOnMonitor(int monitor) const
 {
-  return _is_visible_on_monitor[monitor];
+  return GetQuirk(Quirk::VISIBLE, monitor);
 }
 
 float LauncherIcon::PresentUrgency()
@@ -711,36 +699,36 @@
 }
 
 void
-LauncherIcon::Present(float present_urgency, int length)
+LauncherIcon::Present(float present_urgency, int length, int monitor)
 {
-  if (GetQuirk(Quirk::PRESENTED))
+  if (GetQuirk(Quirk::PRESENTED, monitor))
     return;
 
   if (length >= 0)
   {
-    _source_manager.AddTimeout(length, [this] {
-      if (!GetQuirk(Quirk::PRESENTED))
+    _source_manager.AddTimeout(length, [this, monitor] {
+      if (!GetQuirk(Quirk::PRESENTED, monitor))
         return false;
 
-      Unpresent();
+      Unpresent(monitor);
       return false;
-    }, PRESENT_TIMEOUT);
+    }, PRESENT_TIMEOUT + std::to_string(monitor));
   }
 
   _present_urgency = CLAMP(present_urgency, 0.0f, 1.0f);
-  SetQuirk(Quirk::PRESENTED, true);
-  SetQuirk(Quirk::UNFOLDED, true);
+  SetQuirk(Quirk::PRESENTED, true, monitor);
+  SetQuirk(Quirk::UNFOLDED, true, monitor);
 }
 
 void
-LauncherIcon::Unpresent()
+LauncherIcon::Unpresent(int monitor)
 {
-  if (!GetQuirk(Quirk::PRESENTED))
+  if (!GetQuirk(Quirk::PRESENTED, monitor))
     return;
 
-  _source_manager.Remove(PRESENT_TIMEOUT);
-  SetQuirk(Quirk::PRESENTED, false);
-  SetQuirk(Quirk::UNFOLDED, false);
+  _source_manager.Remove(PRESENT_TIMEOUT + std::to_string(monitor));
+  SetQuirk(Quirk::PRESENTED, false, monitor);
+  SetQuirk(Quirk::UNFOLDED, false, monitor);
 }
 
 void
@@ -781,68 +769,107 @@
 }
 
 bool
-LauncherIcon::GetQuirk(LauncherIcon::Quirk quirk) const
+LauncherIcon::GetQuirk(LauncherIcon::Quirk quirk, int monitor) const
 {
-  return _quirks[unsigned(quirk)];
+  if (monitor < 0)
+  {
+    for (unsigned i = 0; i < monitors::MAX; ++i)
+    {
+      if (!_quirks[i][unsigned(quirk)])
+        return false;
+    }
+
+    return true;
+  }
+
+  return _quirks[monitor][unsigned(quirk)];
 }
 
 void
-LauncherIcon::SetQuirk(LauncherIcon::Quirk quirk, bool value)
+LauncherIcon::SetQuirk(LauncherIcon::Quirk quirk, bool value, int monitor)
 {
-  if (_quirks[unsigned(quirk)] == value)
+  bool changed = false;
+
+  if (monitor < 0)
+  {
+    for (unsigned i = 0; i < monitors::MAX; ++i)
+    {
+      if (_quirks[i][unsigned(quirk)] != value)
+      {
+        _quirks[i][unsigned(quirk)] = value;
+        _quirk_times[i][unsigned(quirk)].SetToNow();
+        changed = true;
+      }
+    }
+  }
+  else
+  {
+    if (_quirks[monitor][unsigned(quirk)] != value)
+    {
+      _quirks[monitor][unsigned(quirk)] = value;
+      _quirk_times[monitor][unsigned(quirk)].SetToNow();
+      changed = true;
+    }
+  }
+
+  if (!changed)
     return;
 
-  _quirks[unsigned(quirk)] = value;
-  if (quirk == Quirk::VISIBLE)
-    TimeUtil::SetTimeStruct(&(_quirk_times[unsigned(quirk)]), &(_quirk_times[unsigned(quirk)]), Launcher::ANIM_DURATION_SHORT);
-  else
-    clock_gettime(CLOCK_MONOTONIC, &(_quirk_times[unsigned(quirk)]));
-  EmitNeedsRedraw();
-
-  // Present on urgent as a general policy
-  if (quirk == Quirk::VISIBLE && value)
-    Present(0.5f, 1500);
-  if (quirk == Quirk::URGENT)
-  {
-    if (value)
-    {
-      Present(0.5f, 1500);
-    }
-  }
-
-  if (quirk == Quirk::VISIBLE)
-  {
-     visibility_changed.emit();
-  }
+  EmitNeedsRedraw(monitor);
+
+  // Present on urgent and visible as a general policy
+  if (value && (quirk == Quirk::URGENT || quirk == Quirk::VISIBLE))
+  {
+    Present(0.5f, 1500, monitor);
+  }
+
+  if (quirk == Quirk::VISIBLE)
+    visibility_changed.emit(monitor);
 }
 
 void
-LauncherIcon::UpdateQuirkTimeDelayed(guint ms, LauncherIcon::Quirk quirk)
+LauncherIcon::UpdateQuirkTimeDelayed(guint ms, LauncherIcon::Quirk quirk, int monitor)
 {
-  _source_manager.AddTimeout(ms, [&, quirk] {
-    UpdateQuirkTime(quirk);
+  _source_manager.AddTimeout(ms, [this, quirk, monitor] {
+    UpdateQuirkTime(quirk, monitor);
     return false;
-  }, QUIRK_DELAY_TIMEOUT);
-}
-
-void
-LauncherIcon::UpdateQuirkTime(LauncherIcon::Quirk quirk)
-{
-  clock_gettime(CLOCK_MONOTONIC, &(_quirk_times[unsigned(quirk)]));
-  EmitNeedsRedraw();
-}
-
-void
-LauncherIcon::ResetQuirkTime(LauncherIcon::Quirk quirk)
-{
-  _quirk_times[unsigned(quirk)].tv_sec = 0;
-  _quirk_times[unsigned(quirk)].tv_nsec = 0;
+  }, QUIRK_DELAY_TIMEOUT + std::to_string(unsigned(quirk)) + std::to_string(monitor));
+}
+
+void
+LauncherIcon::UpdateQuirkTime(LauncherIcon::Quirk quirk, int monitor)
+{
+  if (monitor < 0)
+  {
+    for (unsigned i = 0; i < monitors::MAX; ++i)
+      _quirk_times[i][unsigned(quirk)].SetToNow();
+  }
+  else
+  {
+    _quirk_times[monitor][unsigned(quirk)].SetToNow();
+  }
+
+  EmitNeedsRedraw(monitor);
+}
+
+void
+LauncherIcon::ResetQuirkTime(LauncherIcon::Quirk quirk, int monitor)
+{
+  if (monitor < 0)
+  {
+    for (unsigned i = 0; i < monitors::MAX; ++i)
+      _quirk_times[i][unsigned(quirk)].Reset();
+  }
+  else
+  {
+    _quirk_times[monitor][unsigned(quirk)].Reset();
+  }
 }
 
 struct timespec
-LauncherIcon::GetQuirkTime(LauncherIcon::Quirk quirk)
+LauncherIcon::GetQuirkTime(LauncherIcon::Quirk quirk, int monitor)
 {
-  return _quirk_times[unsigned(quirk)];
+  return _quirk_times[monitor][unsigned(quirk)];
 }
 
 void
@@ -1131,10 +1158,10 @@
   return root;
 }
 
-void LauncherIcon::EmitNeedsRedraw()
+void LauncherIcon::EmitNeedsRedraw(int monitor)
 {
   if (OwnsTheReference() && GetReferenceCount() > 0)
-    needs_redraw.emit(AbstractLauncherIcon::Ptr(this));
+    needs_redraw.emit(AbstractLauncherIcon::Ptr(this), monitor);
 }
 
 void LauncherIcon::EmitRemove()

=== modified file 'launcher/LauncherIcon.h'
--- launcher/LauncherIcon.h	2013-10-07 23:30:27 +0000
+++ launcher/LauncherIcon.h	2013-10-22 12:34:26 +0000
@@ -32,6 +32,7 @@
 #include "Tooltip.h"
 #include "QuicklistView.h"
 #include "LauncherEntryRemote.h"
+#include "unity-shared/TimeUtil.h"
 
 
 namespace unity
@@ -123,11 +124,11 @@
     return 0;
   }
 
-  bool GetQuirk(Quirk quirk) const;
-
-  void SetQuirk(Quirk quirk, bool value);
-
-  struct timespec GetQuirkTime(Quirk quirk);
+  bool GetQuirk(Quirk quirk, int monitor = -1) const;
+
+  void SetQuirk(Quirk quirk, bool value, int monitor = -1);
+
+  struct timespec GetQuirkTime(Quirk quirk, int monitor);
 
   IconType GetIconType() const;
 
@@ -203,11 +204,11 @@
 
   void AddProperties(GVariantBuilder* builder);
 
-  void UpdateQuirkTimeDelayed(guint ms, Quirk quirk);
-
-  void UpdateQuirkTime(Quirk quirk);
-
-  void ResetQuirkTime(Quirk quirk);
+  void UpdateQuirkTimeDelayed(guint ms, Quirk quirk, int monitor = -1);
+
+  void UpdateQuirkTime(Quirk quirk, int monitor = -1);
+
+  void ResetQuirkTime(Quirk quirk, int monitor = -1);
 
   void Remove();
 
@@ -215,9 +216,9 @@
 
   void SetWindowVisibleOnMonitor(bool val, int monitor);
 
-  void Present(float urgency, int length);
+  void Present(float urgency, int length, int monitor = -1);
 
-  void Unpresent();
+  void Unpresent(int monitor = -1);
 
   void SetEmblem(BaseTexturePtr const& emblem);
 
@@ -280,7 +281,7 @@
 
   void OnRemoteProgressVisibleChanged(LauncherEntryRemote* remote);
 
-  void EmitNeedsRedraw();
+  void EmitNeedsRedraw(int monitor = -1);
 
   void EmitRemove();
 
@@ -303,35 +304,31 @@
 
   void OnTooltipEnabledChanged(bool value);
 
-  bool              _sticky;
-  bool              _remote_urgent;
-  float             _present_urgency;
-  float             _progress;
-  int               _sort_priority;
-  int               _last_monitor;
-  nux::Color        _background_color;
-  nux::Color        _glow_color;
-
-  gint64            _shortcut;
+  bool _sticky;
+  bool _remote_urgent;
+  float _present_urgency;
+  float _progress;
+  int _sort_priority;
+  int _last_monitor;
+  nux::Color _background_color;
+  nux::Color _glow_color;
+  gint64 _shortcut;
+  bool _allow_quicklist_to_show;
 
   std::vector<nux::Point3> _center;
   std::vector<bool> _has_visible_window;
-  std::vector<bool> _is_visible_on_monitor;
+  std::vector<std::vector<bool>> _quirks;
+  std::vector<std::vector<time::Spec>> _quirk_times;
   std::vector<nux::Point3> _last_stable;
   std::vector<nux::Point3> _saved_center;
 
-  static glib::Object<GtkIconTheme> _unity_theme;
-
   BaseTexturePtr _emblem;
 
-  bool             _quirks[unsigned(Quirk::LAST)];
-  struct timespec  _quirk_times[unsigned(Quirk::LAST)];
-
-  bool             _allow_quicklist_to_show;
-
   std::list<LauncherEntryRemote::Ptr> _entry_list;
   glib::Object<DbusmenuClient> _remote_menus;
 
+  static glib::Object<GtkIconTheme> _unity_theme;
+
 protected:
   glib::SourceManager _source_manager;
 };

=== modified file 'launcher/MockLauncherIcon.h'
--- launcher/MockLauncherIcon.h	2013-10-04 00:19:56 +0000
+++ launcher/MockLauncherIcon.h	2013-10-22 12:34:26 +0000
@@ -32,9 +32,11 @@
 
 #include <libdbusmenu-glib/menuitem.h>
 #include "unity-shared/ApplicationManager.h"
+#include "unity-shared/TimeUtil.h"
 #include <UnityCore/GTKWrapper.h>
 
 #include "AbstractLauncherIcon.h"
+#include "MultiMonitor.h"
 
 namespace unity
 {
@@ -69,14 +71,13 @@
     : icon_(0)
     , type_(type)
     , sort_priority_(DefaultPriority(type))
+    , quirks_(monitors::MAX, decltype(quirks_)::value_type(unsigned(Quirk::LAST), false))
+    , quirk_times_(monitors::MAX, decltype(quirk_times_)::value_type(unsigned(Quirk::LAST)))
     , remote_uri_("fake")
     , is_tooltip_visible_(false)
   {
     tooltip_text = "Mock Icon";
     position = Position::FLOATING;
-
-    for (unsigned i = 0; i < unsigned(Quirk::LAST); ++i)
-      quirks_[i] = false;
   }
 
   std::string GetName() const { return "MockLauncherIcon"; }
@@ -230,22 +231,55 @@
     return 0;
   }
 
-  bool GetQuirk(Quirk quirk) const
-  {
-    return quirks_[unsigned(quirk)];
-  }
-
-  void SetQuirk(Quirk quirk, bool value)
-  {
-    quirks_[unsigned(quirk)] = value;
-    clock_gettime(CLOCK_MONOTONIC, &(quirk_times_[unsigned(quirk)]));
-  }
-
-  void ResetQuirkTime(Quirk quirk) {};
-
-  struct timespec GetQuirkTime(Quirk quirk)
-  {
-    return quirk_times_[unsigned(quirk)];
+  bool GetQuirk(Quirk quirk, int monitor = -1) const
+  {
+    if (monitor < 0)
+    {
+      for (unsigned i = 0; i < monitors::MAX; ++i)
+      {
+        if (!quirks_[i][unsigned(quirk)])
+          return false;
+      }
+
+      return true;
+    }
+
+    return quirks_[monitor][unsigned(quirk)];
+  }
+
+  void SetQuirk(Quirk quirk, bool value, int monitor = -1)
+  {
+    if (monitor < 0)
+    {
+      for (unsigned i = 0; i < monitors::MAX; ++i)
+      {
+        quirks_[i][unsigned(quirk)] = value;
+        quirk_times_[i][unsigned(quirk)].SetToNow();
+      }
+    }
+    else
+    {
+      quirks_[monitor][unsigned(quirk)] = value;
+      quirk_times_[monitor][unsigned(quirk)].SetToNow();
+    }
+  }
+
+  void ResetQuirkTime(Quirk quirk, int monitor)
+  {
+    if (monitor < 0)
+    {
+      for (unsigned i = 0; i < monitors::MAX; ++i)
+        quirk_times_[i][unsigned(quirk)].Reset();
+    }
+    else
+    {
+      quirk_times_[monitor][unsigned(quirk)].Reset();
+    }
+  };
+
+  struct timespec GetQuirkTime(Quirk quirk, int monitor)
+  {
+    return quirk_times_[monitor][unsigned(quirk)];
   }
 
   IconType GetIconType() const
@@ -371,8 +405,8 @@
   nux::BaseTexture* icon_;
   IconType type_;
   int sort_priority_;
-  bool quirks_[unsigned(Quirk::LAST)];
-  timespec quirk_times_[unsigned(Quirk::LAST)];
+  std::vector<std::vector<bool>> quirks_;
+  std::vector<std::vector<time::Spec>> quirk_times_;
   std::map<int, nux::Point3> center_;
   std::string remote_uri_;
   bool is_tooltip_visible_;

=== modified file 'launcher/SingleMonitorLauncherIcon.cpp'
--- launcher/SingleMonitorLauncherIcon.cpp	2013-07-29 17:17:43 +0000
+++ launcher/SingleMonitorLauncherIcon.cpp	2013-10-22 12:34:26 +0000
@@ -27,7 +27,7 @@
 namespace launcher
 {
 
-SingleMonitorLauncherIcon::SingleMonitorLauncherIcon(IconType type, unsigned monitor)
+SingleMonitorLauncherIcon::SingleMonitorLauncherIcon(IconType type, int monitor)
  : SimpleLauncherIcon(type)
  , monitor_(monitor)
 {
@@ -37,12 +37,10 @@
 void SingleMonitorLauncherIcon::UpdateMonitor()
 {
   for (unsigned i = 0; i < monitors::MAX; ++i)
-    SetVisibleOnMonitor(i, i == monitor_);
-
-  EmitNeedsRedraw();
+    SetVisibleOnMonitor(i, static_cast<int>(i) == monitor_);
 }
 
-void SingleMonitorLauncherIcon::SetMonitor(unsigned monitor)
+void SingleMonitorLauncherIcon::SetMonitor(int monitor)
 {
   if (monitor != monitor_)
   {
@@ -51,7 +49,7 @@
   }
 }
 
-unsigned SingleMonitorLauncherIcon::GetMonitor() const
+int SingleMonitorLauncherIcon::GetMonitor() const
 {
   return monitor_;
 }

=== modified file 'launcher/SingleMonitorLauncherIcon.h'
--- launcher/SingleMonitorLauncherIcon.h	2013-07-29 17:17:43 +0000
+++ launcher/SingleMonitorLauncherIcon.h	2013-10-22 12:34:26 +0000
@@ -29,12 +29,11 @@
 
 class SingleMonitorLauncherIcon : public SimpleLauncherIcon
 {
-
 public:
-  SingleMonitorLauncherIcon(IconType type, unsigned monitor);
+  SingleMonitorLauncherIcon(IconType type, int monitor = -1);
 
-void SetMonitor(unsigned monitor);
-unsigned GetMonitor() const;
+void SetMonitor(int monitor);
+int GetMonitor() const;
 
 protected:
   std::string GetName() const;
@@ -43,7 +42,7 @@
 private:
   void UpdateMonitor();
 
-  unsigned monitor_;
+  int monitor_;
 };
 
 }

=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
--- launcher/SoftwareCenterLauncherIcon.cpp	2013-10-10 12:24:10 +0000
+++ launcher/SoftwareCenterLauncherIcon.cpp	2013-10-22 12:34:26 +0000
@@ -57,7 +57,10 @@
   , needs_urgent_(false)
   , aptdaemon_trans_id_(aptdaemon_trans_id)
 {
+  Stick(false);
   SetQuirk(Quirk::VISIBLE, false);
+  ResetQuirkTime(Quirk::VISIBLE);
+
   aptdaemon_trans_->Connect("PropertyChanged", sigc::mem_fun(this, &SoftwareCenterLauncherIcon::OnPropertyChanged));
   aptdaemon_trans_->Connect("Finished", sigc::mem_fun(this, &SoftwareCenterLauncherIcon::OnFinished));
   aptdaemon_trans_->GetProperty("Progress", [this] (GVariant *value) {
@@ -94,11 +97,8 @@
   floating_icon->icon_name = icon_name();
 
   // Transform this in a spacer-icon and make it visible only on launcher's monitor
-  for (unsigned i = 0; i < monitors::MAX; ++i)
-    SetVisibleOnMonitor(i, static_cast<int>(i) == monitor);
-
   icon_name = "";
-  SetQuirk(Quirk::VISIBLE, true);
+  SetQuirk(Quirk::VISIBLE, true, monitor);
 
   auto rcb = std::bind(&Launcher::RenderIconToTexture, launcher.GetPointer(), _1, _2, floating_icon_ptr);
   drag_window_ = new LauncherDragWindow(launcher->GetWidth(), rcb);
@@ -121,9 +121,7 @@
   drag_window_->ShowWindow(false);
   drag_window_.Release();
   launcher->ForceReveal(false);
-
-  for (unsigned i = 0; i < monitors::MAX; ++i)
-    SetVisibleOnMonitor(i, true);
+  SetQuirk(Quirk::VISIBLE, true);
 }
 
 void SoftwareCenterLauncherIcon::ActivateLauncherIcon(ActionArg arg)

=== modified file 'launcher/SpacerLauncherIcon.cpp'
--- launcher/SpacerLauncherIcon.cpp	2013-09-13 06:31:30 +0000
+++ launcher/SpacerLauncherIcon.cpp	2013-10-22 12:34:26 +0000
@@ -31,7 +31,6 @@
   : SingleMonitorLauncherIcon(IconType::SPACER, monitor)
 {
   SetQuirk(Quirk::VISIBLE, true);
-  SetQuirk(Quirk::RUNNING, false);
 
   tooltip_text = _("Drop To Add Application");
 }

=== modified file 'launcher/StandaloneLauncher.cpp'
--- launcher/StandaloneLauncher.cpp	2013-08-07 19:47:00 +0000
+++ launcher/StandaloneLauncher.cpp	2013-10-22 12:34:26 +0000
@@ -43,6 +43,11 @@
 const nux::Color bg_color(95/255.0f, 18/255.0f, 45/255.0f, 1.0f);
 }
 
+struct StandaloneDndManager : XdndManager
+{
+  int Monitor() const { return 0; }
+};
+
 struct LauncherWindow
 {
   LauncherWindow()
@@ -68,7 +73,7 @@
   void Init()
   {
     SetupBackground();
-    controller.reset(new launcher::Controller(std::make_shared<XdndManager>(), std::make_shared<ui::EdgeBarrierController>()));
+    controller.reset(new launcher::Controller(std::make_shared<StandaloneDndManager>(), std::make_shared<ui::EdgeBarrierController>()));
 
     UScreen* uscreen = UScreen::GetDefault();
     std::vector<nux::Geometry> fake_monitor({nux::Geometry(0, 0, win_size.width, win_size.height)});

=== modified file 'launcher/XdndCollectionWindow.h'
--- launcher/XdndCollectionWindow.h	2012-11-20 13:11:53 +0000
+++ launcher/XdndCollectionWindow.h	2013-10-22 12:34:26 +0000
@@ -42,6 +42,7 @@
 
   virtual void Collect() = 0;
   virtual void Deactivate() = 0;
+  virtual std::string GetData(std::string const& type) = 0;
 
   sigc::signal<void, std::vector<std::string>> collected;
 };

=== modified file 'launcher/XdndCollectionWindowImp.cpp'
--- launcher/XdndCollectionWindowImp.cpp	2013-04-11 05:15:36 +0000
+++ launcher/XdndCollectionWindowImp.cpp	2013-10-22 12:34:26 +0000
@@ -83,7 +83,7 @@
     std::vector<std::string> data;
     for (auto mime : mimes)
       if (mime) data.push_back(mime);
-  
+
     parent_->collected.emit(data);
   }
 
@@ -116,5 +116,11 @@
   if (nux::GetWindowThread()->IsEmbeddedWindow())
     window_->EnableInputWindow(false, "XdndCollectionWindowImp");
 }
-  
+
+std::string XdndCollectionWindowImp::GetData(std::string const& type)
+{
+  auto& gp_display = nux::GetWindowThread()->GetGraphicsDisplay();
+  return glib::String(gp_display.GetDndData(const_cast<char*>(type.c_str()))).Str();
+}
+
 }

=== modified file 'launcher/XdndCollectionWindowImp.h'
--- launcher/XdndCollectionWindowImp.h	2012-11-20 13:11:53 +0000
+++ launcher/XdndCollectionWindowImp.h	2013-10-22 12:34:26 +0000
@@ -34,6 +34,7 @@
 
   void Collect();
   void Deactivate();
+  std::string GetData(std::string const& type);
 
 private:
   nux::ObjectPtr<nux::BaseWindow> window_;

=== modified file 'launcher/XdndManager.h'
--- launcher/XdndManager.h	2012-11-15 16:09:05 +0000
+++ launcher/XdndManager.h	2013-10-22 12:34:26 +0000
@@ -33,9 +33,11 @@
 
   virtual ~XdndManager() {}
 
-  sigc::signal<void, std::string, int> dnd_started;
+  virtual int Monitor() const = 0;
+
+  sigc::signal<void, std::string const&, int> dnd_started;
+  sigc::signal<void, std::string const&, int, int> monitor_changed;
   sigc::signal<void> dnd_finished;
-  sigc::signal<void, int> monitor_changed;
 };
 
 }

=== modified file 'launcher/XdndManagerImp.cpp'
--- launcher/XdndManagerImp.cpp	2012-11-20 13:11:53 +0000
+++ launcher/XdndManagerImp.cpp	2013-10-22 12:34:26 +0000
@@ -22,13 +22,16 @@
 #include "unity-shared/UScreen.h"
 
 namespace unity {
+namespace
+{
+  const std::string URI_TYPE = "text/uri-list";
+}
 
-XdndManagerImp::XdndManagerImp(XdndStartStopNotifier::Ptr const& xdnd_start_stop_notifier, 
+XdndManagerImp::XdndManagerImp(XdndStartStopNotifier::Ptr const& xdnd_start_stop_notifier,
                                XdndCollectionWindow::Ptr const& xdnd_collection_window)
   : xdnd_start_stop_notifier_(xdnd_start_stop_notifier)
   , xdnd_collection_window_(xdnd_collection_window)
   , last_monitor_(-1)
-  , valid_dnd_in_progress_(false)
 {
   xdnd_start_stop_notifier_->started.connect(sigc::mem_fun(this, &XdndManagerImp::OnDndStarted));
   xdnd_start_stop_notifier_->finished.connect(sigc::mem_fun(this, &XdndManagerImp::OnDndFinished));
@@ -36,6 +39,11 @@
   xdnd_collection_window_->collected.connect(sigc::mem_fun(this, &XdndManagerImp::OnDndDataCollected));
 }
 
+int XdndManagerImp::Monitor() const
+{
+  return last_monitor_;
+}
+
 void XdndManagerImp::OnDndStarted()
 {
   xdnd_collection_window_->Collect();
@@ -46,9 +54,9 @@
   xdnd_collection_window_->Deactivate();
   mouse_poller_timeout_.reset();
 
-  if (valid_dnd_in_progress_)
+  if (!dnd_data_.empty())
   {
-    valid_dnd_in_progress_ = false;
+    dnd_data_.clear();
     dnd_finished.emit();
   }
 }
@@ -58,24 +66,23 @@
   if (!IsAValidDnd(mimes))
     return;
 
-  valid_dnd_in_progress_ = true;
+  dnd_data_ = xdnd_collection_window_->GetData(URI_TYPE);
 
-  auto& gp_display = nux::GetWindowThread()->GetGraphicsDisplay();
-  char target[] = "text/uri-list";
-  glib::String data(gp_display.GetDndData(target));
+  if (dnd_data_.empty())
+    return;
 
   auto uscreen = UScreen::GetDefault();
   last_monitor_ = uscreen->GetMonitorWithMouse();
 
   mouse_poller_timeout_.reset(new glib::Timeout(20, sigc::mem_fun(this, &XdndManagerImp::CheckMousePosition)));
 
-  dnd_started.emit(data.Str(), last_monitor_);
+  dnd_started.emit(dnd_data_, last_monitor_);
 }
 
 bool XdndManagerImp::IsAValidDnd(std::vector<std::string> const& mimes)
 {
   auto end = std::end(mimes);
-  auto it = std::find(std::begin(mimes), end, "text/uri-list");
+  auto it = std::find(std::begin(mimes), end, URI_TYPE);
 
   return it != end;
 }
@@ -85,10 +92,11 @@
   auto uscreen = UScreen::GetDefault();
   auto monitor = uscreen->GetMonitorWithMouse();
 
-  if (valid_dnd_in_progress_ && monitor != last_monitor_)
+  if (!dnd_data_.empty() && monitor != last_monitor_)
   {
+    int old_monitor = last_monitor_;
     last_monitor_ = monitor;
-    monitor_changed.emit(last_monitor_);
+    monitor_changed.emit(dnd_data_, old_monitor, last_monitor_);
   }
 
   return true;

=== modified file 'launcher/XdndManagerImp.h'
--- launcher/XdndManagerImp.h	2012-11-20 13:11:53 +0000
+++ launcher/XdndManagerImp.h	2013-10-22 12:34:26 +0000
@@ -30,10 +30,13 @@
 
 namespace unity {
 
-class XdndManagerImp : public XdndManager, public sigc::trackable {
+class XdndManagerImp : public XdndManager, public sigc::trackable
+{
 public:
   XdndManagerImp(XdndStartStopNotifier::Ptr const&, XdndCollectionWindow::Ptr const&);
 
+  virtual int Monitor() const;
+
 private:
   void OnDndStarted();
   void OnDndFinished();
@@ -44,7 +47,7 @@
   XdndStartStopNotifier::Ptr xdnd_start_stop_notifier_;
   XdndCollectionWindow::Ptr xdnd_collection_window_;
   int last_monitor_;
-  bool valid_dnd_in_progress_;
+  std::string dnd_data_;
 
   glib::Source::UniquePtr mouse_poller_timeout_;
 };

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-10-16 03:42:35 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-10-22 12:34:26 +0000
@@ -3424,7 +3424,7 @@
 }
 
 UnityWindow::UnityWindow(CompWindow* window)
-  : BaseSwitchWindow (dynamic_cast<BaseSwitchScreen *> (UnityScreen::get (screen)), window)
+  : BaseSwitchWindow(static_cast<BaseSwitchScreen*>(UnityScreen::get(screen)), window)
   , PluginClassHandler<UnityWindow, CompWindow>(window)
   , window(window)
   , cWindow(CompositeWindow::get(window))

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2013-09-29 23:26:29 +0000
+++ plugins/unityshell/src/unityshell.h	2013-10-22 12:34:26 +0000
@@ -27,6 +27,7 @@
 #include <Nux/WindowThread.h>
 #include <NuxCore/Property.h>
 #include <sigc++/sigc++.h>
+#include <unordered_set>
 
 #include <scale/scale.h>
 #include <core/core.h>
@@ -329,7 +330,7 @@
   GLMatrix panel_shadow_matrix_;
 
   bool paint_panel_under_dash_;
-  std::set<UnityWindow*> fake_decorated_windows_;
+  std::unordered_set<UnityWindow*> fake_decorated_windows_;
 
   bool scale_just_activated_;
   WindowMinimizeSpeedController minimize_speed_controller_;

=== modified file 'tests/mock-application.h'
--- tests/mock-application.h	2013-09-11 07:56:26 +0000
+++ tests/mock-application.h	2013-10-22 12:34:26 +0000
@@ -56,7 +56,7 @@
     ON_CALL(*this, window_id()).WillByDefault(Invoke([this] { return xid_; }));
     ON_CALL(*this, monitor()).WillByDefault(Invoke([this] { return monitor_; }));
     ON_CALL(*this, Focus()).WillByDefault(Invoke([this] { return LocalFocus(); }));
-    ON_CALL(*this, application()).WillByDefault(Invoke([this] { return nullptr; }));
+    ON_CALL(*this, application()).WillByDefault(Return(unity::ApplicationPtr()));
   }
 
   Window xid_;
@@ -141,8 +141,10 @@
 
       ON_CALL(*this, type()).WillByDefault(Invoke([this] { return type_; }));
       ON_CALL(*this, desktop_id()).WillByDefault(Invoke([this] { return desktop_file_; }));
-      ON_CALL(*this, repr()).WillByDefault(Invoke([this] { return "MockApplication"; }));
+      ON_CALL(*this, repr()).WillByDefault(Return("MockApplication"));
       ON_CALL(*this, GetWindows()).WillByDefault(Invoke([this] { return windows_; }));
+      ON_CALL(*this, GetSupportedMimeTypes()).WillByDefault(Return(std::vector<std::string>()));
+      ON_CALL(*this, GetFocusableWindow()).WillByDefault(Return(unity::ApplicationWindowPtr()));
       ON_CALL(*this, OwnsWindow(_)).WillByDefault(Invoke(this, &MockApplication::LocalOwnsWindow));
       ON_CALL(*this, LogEvent(_,_)).WillByDefault(Invoke(this, &MockApplication::LocalLogEvent));
     }

=== modified file 'tests/test_application_launcher_icon.cpp'
--- tests/test_application_launcher_icon.cpp	2013-10-11 20:37:05 +0000
+++ tests/test_application_launcher_icon.cpp	2013-10-22 12:34:26 +0000
@@ -26,12 +26,12 @@
 
 #include "ApplicationLauncherIcon.h"
 #include "FavoriteStore.h"
-#include "StandaloneWindowManager.h"
 #include "UBusWrapper.h"
 #include "UBusMessages.h"
 #include "ZeitgeistUtils.h"
 #include "mock-application.h"
 #include "test_utils.h"
+#include "test_standalone_wm.h"
 
 using namespace testing;
 using namespace testmocks;
@@ -87,8 +87,6 @@
 {
   virtual void SetUp() override
   {
-    WM = dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default());
-
     usc_app = std::make_shared<MockApplication::Nice>(USC_DESKTOP, "softwarecenter");
     usc_icon = new NiceMock<MockApplicationLauncherIcon>(usc_app);
     ASSERT_EQ(usc_icon->DesktopFile(), USC_DESKTOP);
@@ -102,12 +100,6 @@
     ASSERT_TRUE(mock_icon->DesktopFile().empty());
   }
 
-  virtual void TearDown() override
-  {
-    for (auto const& win : WM->GetStandaloneWindows())
-      WM->Close(win->Xid());
-  }
-
   void AddMockWindow(Window xid, int monitor, int desktop)
   {
     auto app_window = std::make_shared<MockApplicationWindow::Nice>(xid);
@@ -166,7 +158,7 @@
     EXPECT_TRUE(app->icon.changed.empty());
   }
 
-  StandaloneWindowManager* WM;
+  testwrapper::StandaloneWM WM;
   MockApplication::Ptr usc_app;
   MockApplication::Ptr empty_app;
   MockApplication::Ptr mock_app;

=== modified file 'tests/test_bamf_application.cpp'
--- tests/test_bamf_application.cpp	2013-06-28 09:45:28 +0000
+++ tests/test_bamf_application.cpp	2013-10-22 12:34:26 +0000
@@ -24,7 +24,7 @@
 #include "bamf-mock-application.h"
 #include "bamf-mock-window.h"
 #include "mock-application.h"
-#include "StandaloneWindowManager.h"
+#include "test_standalone_wm.h"
 
 #include <UnityCore/GLibWrapper.h>
 
@@ -35,7 +35,7 @@
   auto fake_window = std::make_shared<unity::StandaloneWindow>(xid);
   fake_window->mapped = mapped;
 
-  unity::StandaloneWindowManager* wm = dynamic_cast<unity::StandaloneWindowManager*>(&unity::WindowManager::Default());
+  auto wm = unity::testwrapper::StandaloneWM::Get();
   wm->AddStandaloneWindow(fake_window);
 
   return fake_window;
@@ -48,6 +48,7 @@
     , application_(mock_manager_, unity::glib::object_cast<BamfApplication>(bamf_mock_application_))
   {}
 
+  unity::testwrapper::StandaloneWM WM;
   testmocks::MockApplicationManager::Nice mock_manager_;
   unity::glib::Object<BamfMockApplication> bamf_mock_application_;
   unity::bamf::Application application_;

=== modified file 'tests/test_expo_launcher_icon.cpp'
--- tests/test_expo_launcher_icon.cpp	2013-03-07 19:41:50 +0000
+++ tests/test_expo_launcher_icon.cpp	2013-10-22 12:34:26 +0000
@@ -21,7 +21,7 @@
 #include <gmock/gmock.h>
 
 #include "launcher/ExpoLauncherIcon.h"
-#include "unity-shared/StandaloneWindowManager.h"
+#include "test_standalone_wm.h"
 
 using namespace unity;
 using namespace unity::launcher;
@@ -31,17 +31,8 @@
 
 struct TestExpoLauncherIcon : testing::Test
 {
-  TestExpoLauncherIcon()
-    : wm(dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default()))
-  {}
-
-  void TearDown()
-  {
-    wm->SetViewportSize(2, 2);
-  }
-
   ExpoLauncherIcon icon;
-  StandaloneWindowManager* wm;
+  testwrapper::StandaloneWM wm;
 };
 
 TEST_F(TestExpoLauncherIcon, ActivateToggleExpo)

=== modified file 'tests/test_launcher.cpp'
--- tests/test_launcher.cpp	2013-10-14 17:38:37 +0000
+++ tests/test_launcher.cpp	2013-10-22 12:34:26 +0000
@@ -31,7 +31,7 @@
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/UnitySettings.h"
 #include "unity-shared/IconRenderer.h"
-#include "StandaloneWindowManager.h"
+#include "test_standalone_wm.h"
 #include "test_utils.h"
 
 namespace unity
@@ -144,8 +144,7 @@
   };
 
   TestLauncher()
-    : WM(dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default()))
-    , parent_window_(new MockableBaseWindow("TestLauncherWindow"))
+    : parent_window_(new MockableBaseWindow("TestLauncherWindow"))
     , model_(new LauncherModel)
     , options_(new Options)
     , launcher_(new MockLauncher(parent_window_.GetPointer()))
@@ -154,15 +153,6 @@
     launcher_->SetModel(model_);
   }
 
-  ~TestLauncher()
-  {
-    WM->SetScaleActiveForGroup(false);
-    WM->SetScaleActive(false);
-
-    if (WM->IsExpoActive())
-      WM->TerminateExpo();
-  }
-
   std::vector<MockMockLauncherIcon::Ptr> AddMockIcons(unsigned number)
   {
     std::vector<MockMockLauncherIcon::Ptr> icons;
@@ -187,7 +177,7 @@
   }
 
   MockUScreen uscreen;
-  StandaloneWindowManager* WM;
+  testwrapper::StandaloneWM WM;
   nux::ObjectPtr<MockableBaseWindow> parent_window_;
   Settings settings;
   panel::Style panel_style;
@@ -227,9 +217,9 @@
   launcher_->DndStarted("");
   Utils::WaitPendingEvents();
 
-  EXPECT_FALSE(first->GetQuirk(launcher::AbstractLauncherIcon::Quirk::DESAT));
-  EXPECT_FALSE(second->GetQuirk(launcher::AbstractLauncherIcon::Quirk::DESAT));
-  EXPECT_TRUE(third->GetQuirk(launcher::AbstractLauncherIcon::Quirk::DESAT));
+  EXPECT_FALSE(first->GetQuirk(launcher::AbstractLauncherIcon::Quirk::DESAT, launcher_->monitor()));
+  EXPECT_FALSE(second->GetQuirk(launcher::AbstractLauncherIcon::Quirk::DESAT, launcher_->monitor()));
+  EXPECT_TRUE(third->GetQuirk(launcher::AbstractLauncherIcon::Quirk::DESAT, launcher_->monitor()));
 }
 
 TEST_F(TestLauncher, TestMouseWheelScroll)
@@ -240,7 +230,7 @@
   launcher_->SetHover(true);
   launcher_->icon_under_mouse_ = icon;
 
-  unsigned long key_flags = 0; 
+  unsigned long key_flags = 0;
 
   EXPECT_CALL(*icon, PerformScroll(AbstractLauncherIcon::ScrollDirection::UP, _));
   launcher_->RecvMouseWheel(0, 0, 20, 0, key_flags);
@@ -258,14 +248,14 @@
   launcher_->SetHover(true);
   initial_scroll_delta = launcher_->GetDragDelta();
 
-  unsigned long key_flags = 0; 
+  unsigned long key_flags = 0;
 
   launcher_->RecvMouseWheel(0, 0, 20, 0, key_flags);
   EXPECT_EQ((launcher_->GetDragDelta()), initial_scroll_delta);
 
   key_flags |= nux::NUX_STATE_ALT;
 
-  // scroll down 
+  // scroll down
   launcher_->RecvMouseWheel(0, 0, 20, 0, key_flags);
   EXPECT_EQ((launcher_->GetDragDelta() - initial_scroll_delta), 25);
 
@@ -711,21 +701,23 @@
   auto const& icons = AddMockIcons(5);
   icons[g_random_int()%icons.size()]->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, true);
 
-  WM->SetScaleActiveForGroup(false);
   WM->SetScaleActive(true);
   WM->initiate_spread.emit();
 
-  Utils::WaitUntilMSec([&icons] {
+  Utils::WaitUntilMSec([this, &icons] {
     for (auto const& icon : icons)
     {
-      if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT))
+      if (!icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, launcher_->monitor()))
         return false;
     }
     return true;
   });
 
   for (auto const& icon : icons)
-    ASSERT_TRUE(icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT));
+  {
+    for (int i = 0; i < static_cast<int>(monitors::MAX); ++i)
+      ASSERT_EQ(launcher_->monitor() == i, icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, i));
+  }
 }
 
 TEST_F(TestLauncher, SaturateAllIconsOnSpreadTerminated)
@@ -736,12 +728,10 @@
   for (auto const& icon : icons)
     icon->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, true);
 
-  WM->SetScaleActiveForGroup(false);
-  WM->SetScaleActive(false);
   WM->terminate_spread.emit();
 
   for (auto const& icon : icons)
-    ASSERT_FALSE(icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT));
+    ASSERT_FALSE(icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, launcher_->monitor()));
 }
 
 TEST_F(TestLauncher, SaturatesAllIconsOnSpreadWithMouseOver)
@@ -753,14 +743,13 @@
     icon->SetQuirk(AbstractLauncherIcon::Quirk::DESAT, true);
 
   launcher_->SetHover(true);
-  WM->SetScaleActiveForGroup(false);
   WM->SetScaleActive(true);
   WM->initiate_spread.emit();
 
   Utils::WaitPendingEvents();
 
   for (auto const& icon : icons)
-    ASSERT_FALSE(icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT));
+    ASSERT_FALSE(icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, launcher_->monitor()));
 }
 
 TEST_F(TestLauncher, DesaturateInactiveIconsOnAppSpread)
@@ -772,17 +761,17 @@
   WM->SetScaleActive(true);
   WM->initiate_spread.emit();
 
-  Utils::WaitUntilMSec([&icons] {
+  Utils::WaitUntilMSec([this, &icons] {
     for (auto const& icon : icons)
     {
-      if (icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE) == icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT))
+      if (icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, launcher_->monitor()) == icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, launcher_->monitor()))
         return false;
     }
     return true;
   });
 
   for (auto const& icon : icons)
-    ASSERT_NE(icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE), icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT));
+    ASSERT_NE(icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, launcher_->monitor()), icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, launcher_->monitor()));
 }
 
 TEST_F(TestLauncher, SaturatesAllIconsOnAppSpreadMouseMove)
@@ -796,37 +785,37 @@
   WM->SetScaleActive(true);
   WM->initiate_spread.emit();
 
-  Utils::WaitUntilMSec([&icons] {
+  Utils::WaitUntilMSec([this, &icons] {
     for (auto const& icon : icons)
     {
-      if (icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE) == icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT))
+      if (icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, launcher_->monitor()) == icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, launcher_->monitor()))
         return false;
     }
     return true;
   });
 
   for (auto const& icon : icons)
-    ASSERT_NE(icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE), icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT));
+    ASSERT_NE(icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, launcher_->monitor()), icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, launcher_->monitor()));
 
   auto const& active_center = icons[active_idx]->GetCenter(launcher_->monitor());
   launcher_->mouse_move.emit(active_center.x, active_center.y, 0, 0, 0, 0);
 
   for (auto const& icon : icons)
-    ASSERT_NE(icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE), icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT));
+    ASSERT_NE(icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, launcher_->monitor()), icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, launcher_->monitor()));
 
   auto const& other_center = icons[(active_idx+1)%icons.size()]->GetCenter(launcher_->monitor());
   launcher_->mouse_move.emit(other_center.x, other_center.y, 0, 0, 0, 0);
 
   for (auto const& icon : icons)
-    ASSERT_FALSE(icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT));
+    ASSERT_FALSE(icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, launcher_->monitor()));
 
   launcher_->SetHover(false);
   for (auto const& icon : icons)
-    ASSERT_NE(icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE), icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT));
+    ASSERT_NE(icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, launcher_->monitor()), icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, launcher_->monitor()));
 
   launcher_->SetHover(true);
   for (auto const& icon : icons)
-    ASSERT_FALSE(icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT));
+    ASSERT_FALSE(icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, launcher_->monitor()));
 }
 
 TEST_F(TestLauncher, DesaturateActiveIconOnAppSpreadIconUpdate)
@@ -842,7 +831,7 @@
 
   Utils::WaitPendingEvents();
   for (auto const& icon : icons)
-    ASSERT_NE(icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE), icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT));
+    ASSERT_NE(icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, launcher_->monitor()), icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, launcher_->monitor()));
 
   unsigned new_active_idx = (active_idx+1)%icons.size();
   icons[active_idx]->SetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, false);
@@ -853,7 +842,7 @@
 
   Utils::WaitPendingEvents();
   for (auto const& icon : icons)
-    ASSERT_NE(icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE), icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT));
+    ASSERT_NE(icon->GetQuirk(AbstractLauncherIcon::Quirk::ACTIVE, launcher_->monitor()), icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, launcher_->monitor()));
 }
 
 TEST_F(TestLauncher, HideTooltipOnSpread)
@@ -875,6 +864,7 @@
     WM->InitiateExpo();
 
   launcher_->SetIconUnderMouse(icon);
+  WM->SetExpoActive(true);
   WM->initiate_expo.emit();
 }
 

=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2013-10-07 16:26:18 +0000
+++ tests/test_launcher_controller.cpp	2013-10-22 12:34:26 +0000
@@ -197,13 +197,21 @@
   std::string uuid_;
 };
 
+struct MockXdndManager : XdndManager
+{
+  typedef std::shared_ptr<MockXdndManager> Ptr;
+  typedef testing::NiceMock<MockXdndManager> Nice;
+
+  MOCK_CONST_METHOD0(Monitor, int());
+};
+
 namespace launcher
 {
 struct TestLauncherController : testmocks::TestUnityAppBase
 {
   TestLauncherController()
     : logger_output_(std::make_shared<helper::CaptureLogOutput>())
-    , xdnd_manager_(std::make_shared<XdndManager>())
+    , xdnd_manager_(std::make_shared<MockXdndManager::Nice>())
     , edge_barriers_(std::make_shared<ui::EdgeBarrierController>())
     , lc(xdnd_manager_, edge_barriers_)
   {}
@@ -272,7 +280,7 @@
   Settings settings;
   panel::Style panel_style;
   MockFavoriteStore favorite_store;
-  XdndManager::Ptr xdnd_manager_;
+  MockXdndManager::Ptr xdnd_manager_;
   ui::EdgeBarrierController::Ptr edge_barriers_;
   MockLauncherController lc;
 };
@@ -1732,55 +1740,153 @@
   color_property.changed.emit(nux::color::RandomColor());
 }
 
-// thumper: 2012-11-28 disabling the drag and drop tests as they are taking over 20s
-// each, and that is not acceptable for unit tests.  These sound more like functional
-// tests.
-TEST_F(TestLauncherController, DISABLED_DragAndDrop_MultipleLaunchers)
+TEST_F(TestLauncherController, DragAndDrop_MultipleLaunchers)
 {
   lc.multiple_launchers = true;
   uscreen.SetupFakeMultiMonitor();
   lc.options()->hide_mode = LAUNCHER_HIDE_AUTOHIDE;
+  unsigned monitor = 0;
+  unsigned old_monitor = -1;
 
   auto check_fn = [this](int index) {
     return lc.launchers()[index]->Hidden();
   };
 
-  xdnd_manager_->dnd_started.emit("my_awesome_file", 0);
-
-  for (unsigned i = 0; i < monitors::MAX; ++i)
-    Utils::WaitUntilMSec(std::bind(check_fn, i), i != 0);
-
-  xdnd_manager_->monitor_changed.emit(3);
-
-  for (unsigned i = 0; i < monitors::MAX; ++i)
-    Utils::WaitUntilMSec(std::bind(check_fn, i), i != 3);
+  ON_CALL(*xdnd_manager_, Monitor()).WillByDefault(ReturnPointee(&monitor));
+  xdnd_manager_->dnd_started.emit("my_awesome_file", monitor);
+
+  for (unsigned i = 0; i < monitors::MAX; ++i)
+  {
+    Utils::WaitUntilMSec(std::bind(check_fn, i), i != monitor);
+    ASSERT_EQ(i != monitor, check_fn(i));
+  }
+
+  old_monitor = monitor;
+  monitor = 3;
+  xdnd_manager_->monitor_changed.emit("another_file", old_monitor, monitor);
+
+  for (unsigned i = 0; i < monitors::MAX; ++i)
+  {
+    Utils::WaitUntilMSec(std::bind(check_fn, i), i != monitor);
+    ASSERT_EQ(i != monitor, check_fn(i));
+  }
 
   xdnd_manager_->dnd_finished.emit();
 
   for (unsigned i = 0; i < monitors::MAX; ++i)
+  {
     Utils::WaitUntilMSec(std::bind(check_fn, i), true);
+    ASSERT_TRUE(check_fn(i));
+  }
 }
 
-TEST_F(TestLauncherController, DISABLED_DragAndDrop_SingleLauncher)
+TEST_F(TestLauncherController, DragAndDrop_SingleLauncher)
 {
   lc.multiple_launchers = false;
-  uscreen.SetupFakeMultiMonitor(2);
+  unsigned monitor = 2;
+  unsigned old_monitor = -1;
+  uscreen.SetupFakeMultiMonitor(monitor);
   lc.options()->hide_mode = LAUNCHER_HIDE_AUTOHIDE;
 
   auto check_fn = [this]() {
     return lc.launcher().Hidden();
   };
 
-  xdnd_manager_->dnd_started.emit("my_awesome_file", 0);
+  ON_CALL(*xdnd_manager_, Monitor()).WillByDefault(ReturnPointee(&monitor));
+
+  xdnd_manager_->dnd_started.emit("my_awesome_file", monitor);
   Utils::WaitUntilMSec(check_fn, false);
 
-  xdnd_manager_->monitor_changed.emit(2);
+  old_monitor = monitor;
+  monitor = 1;
+  xdnd_manager_->monitor_changed.emit("another_file", old_monitor, monitor);
   Utils::WaitUntilMSec(check_fn, false);
 
   xdnd_manager_->dnd_finished.emit();
   Utils::WaitUntilMSec(check_fn, true);
 }
 
+TEST_F(TestLauncherController, DragAndDrop_MultipleLaunchers_DesaturateIcons)
+{
+  lc.multiple_launchers = true;
+  uscreen.SetupFakeMultiMonitor();
+  unsigned monitor = 0;
+  unsigned old_monitor = -1;
+  auto const& model = lc.Impl()->model_;
+
+  ON_CALL(*xdnd_manager_, Monitor()).WillByDefault(ReturnPointee(&monitor));
+  xdnd_manager_->dnd_started.emit("my_awesome_file", monitor);
+
+  for (auto const& icon : *model)
+  {
+    bool is_trash = icon->GetIconType() == AbstractLauncherIcon::IconType::TRASH;
+
+    for (unsigned i = 0; i < monitors::MAX; ++i)
+      ASSERT_EQ(monitor == i && !is_trash, icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, i));
+  }
+
+  old_monitor = monitor;
+  monitor = 3;
+  xdnd_manager_->monitor_changed.emit("another_file", old_monitor, monitor);
+
+  for (auto const& icon : *model)
+  {
+    bool is_trash = icon->GetIconType() == AbstractLauncherIcon::IconType::TRASH;
+
+    for (unsigned i = 0; i < monitors::MAX; ++i)
+      ASSERT_EQ(monitor == i && !is_trash, icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, i));
+  }
+
+  xdnd_manager_->dnd_finished.emit();
+
+  for (auto const& icon : *model)
+  {
+    for (unsigned i = 0; i < monitors::MAX; ++i)
+      ASSERT_FALSE(icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, i));
+  }
+}
+
+TEST_F(TestLauncherController, DragAndDrop_SingleLauncher_DesaturateIcons)
+{
+  lc.multiple_launchers = false;
+  unsigned monitor = 2;
+  unsigned old_monitor = -1;
+  uscreen.SetupFakeMultiMonitor(monitor);
+  lc.options()->hide_mode = LAUNCHER_HIDE_AUTOHIDE;
+  auto const& model = lc.Impl()->model_;
+
+  ON_CALL(*xdnd_manager_, Monitor()).WillByDefault(ReturnPointee(&monitor));
+  xdnd_manager_->dnd_started.emit("my_awesome_file", monitor);
+
+  for (auto const& icon : *model)
+  {
+    bool is_trash = icon->GetIconType() == AbstractLauncherIcon::IconType::TRASH;
+
+    for (unsigned i = 0; i < monitors::MAX; ++i)
+      ASSERT_EQ(monitor == i && !is_trash, icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, i));
+  }
+
+  old_monitor = monitor;
+  monitor = 0;
+  xdnd_manager_->monitor_changed.emit("another_file", old_monitor, monitor);
+
+  for (auto const& icon : *model)
+  {
+    bool is_trash = icon->GetIconType() == AbstractLauncherIcon::IconType::TRASH;
+
+    for (unsigned i = 0; i < monitors::MAX; ++i)
+      ASSERT_EQ(old_monitor == i && !is_trash, icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, i));
+  }
+
+  xdnd_manager_->dnd_finished.emit();
+
+  for (auto const& icon : *model)
+  {
+    for (unsigned i = 0; i < monitors::MAX; ++i)
+      ASSERT_FALSE(icon->GetQuirk(AbstractLauncherIcon::Quirk::DESAT, i));
+  }
+}
+
 TEST_F(TestLauncherController, SetExistingLauncherIconAsFavorite)
 {
   const char * desktop_file = "normal-icon.desktop";

=== modified file 'tests/test_launcher_hover_machine.cpp'
--- tests/test_launcher_hover_machine.cpp	2012-10-31 09:30:09 +0000
+++ tests/test_launcher_hover_machine.cpp	2013-10-22 12:34:26 +0000
@@ -32,7 +32,7 @@
   unity::LauncherHoverMachine::KEY_NAV_ACTIVE,
   unity::LauncherHoverMachine::LAUNCHER_IN_ACTION };
 
-struct SingleQuirk : public TestWithParam<std::tr1::tuple<unity::LauncherHoverMachine::HoverQuirk, bool, bool>> {
+struct SingleQuirk : public TestWithParam<std::tuple<unity::LauncherHoverMachine::HoverQuirk, bool, bool>> {
   unity::LauncherHoverMachine machine;
 };
 
@@ -70,8 +70,8 @@
     Combine(ValuesIn(QUIRKS), Bool(), Bool()));
 
 
-struct MultipleQuirks : public TestWithParam<std::tr1::tuple<unity::LauncherHoverMachine::HoverQuirk, bool, bool,
-                                                             unity::LauncherHoverMachine::HoverQuirk, bool, bool>> {
+struct MultipleQuirks : public TestWithParam<std::tuple<unity::LauncherHoverMachine::HoverQuirk, bool, bool,
+                                                        unity::LauncherHoverMachine::HoverQuirk, bool, bool>> {
   unity::LauncherHoverMachine machine;
 };
 

=== modified file 'tests/test_launcher_icon.cpp'
--- tests/test_launcher_icon.cpp	2013-10-11 13:37:52 +0000
+++ tests/test_launcher_icon.cpp	2013-10-22 12:34:26 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * Copyright 2012-2013 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
@@ -25,28 +25,55 @@
 
 using namespace unity;
 using namespace unity::launcher;
+using namespace testing;
 
 namespace
 {
+
 struct MockLauncherIcon : LauncherIcon
 {
-  MockLauncherIcon(IconType type)
+  MockLauncherIcon(IconType type = AbstractLauncherIcon::IconType::APPLICATION)
     : LauncherIcon(type)
   {}
 
   virtual nux::BaseTexture* GetTextureForSize(int size) { return nullptr; }
+
+  using LauncherIcon::UpdateQuirkTime;
+  using LauncherIcon::ResetQuirkTime;
 };
 
-struct TestLauncherIcon : testing::Test
+struct TestLauncherIcon : Test
 {
-  TestLauncherIcon()
-  	: icon(AbstractLauncherIcon::IconType::APPLICATION)
-  {}
-
   unity::Settings settings;
   MockLauncherIcon icon;
 };
 
+struct SigReceiver : sigc::trackable
+{
+  typedef NiceMock<SigReceiver> Nice;
+
+  SigReceiver(AbstractLauncherIcon::Ptr const& icon)
+  {
+    icon->needs_redraw.connect(sigc::mem_fun(this, &SigReceiver::Redraw));
+    icon->visibility_changed.connect(sigc::mem_fun(this, &SigReceiver::Visible));
+  }
+
+  MOCK_METHOD2(Redraw, void(AbstractLauncherIcon::Ptr const&, int monitor));
+  MOCK_METHOD1(Visible, void(int monitor));
+};
+
+std::vector<AbstractLauncherIcon::Quirk> GetQuirks()
+{
+  std::vector<AbstractLauncherIcon::Quirk> quirks;
+  for (unsigned i = 0; i < unsigned(AbstractLauncherIcon::Quirk::LAST); ++i)
+    quirks.push_back(static_cast<AbstractLauncherIcon::Quirk>(i));
+
+  return quirks;
+}
+
+struct Quirks : TestLauncherIcon, WithParamInterface<AbstractLauncherIcon::Quirk> {};
+INSTANTIATE_TEST_CASE_P(TestLauncherIcon, Quirks, ValuesIn(GetQuirks()));
+
 TEST_F(TestLauncherIcon, Construction)
 {
   EXPECT_EQ(icon.GetIconType(), AbstractLauncherIcon::IconType::APPLICATION);
@@ -55,11 +82,165 @@
   EXPECT_FALSE(icon.IsSticky());
   EXPECT_FALSE(icon.IsVisible());
 
-  for (unsigned i = 0; i < unsigned(AbstractLauncherIcon::Quirk::LAST); ++i)
-    ASSERT_FALSE(icon.GetQuirk(static_cast<AbstractLauncherIcon::Quirk>(i)));
-
-  for (unsigned i = 0; i < monitors::MAX; ++i)
-    ASSERT_TRUE(icon.IsVisibleOnMonitor(i));
+  for (auto quirk : GetQuirks())
+  {
+    ASSERT_FALSE(icon.GetQuirk(quirk));
+
+    for (unsigned i = 0; i < monitors::MAX; ++i)
+    {
+      ASSERT_FALSE(icon.GetQuirk(quirk, i));
+      ASSERT_EQ(0, icon.GetQuirkTime(quirk, i).tv_sec);
+      ASSERT_EQ(0, icon.GetQuirkTime(quirk, i).tv_nsec);
+    }
+  }
+}
+
+TEST_P(/*TestLauncherIcon*/Quirks, SetQuirkNewSingleMonitor)
+{
+  AbstractLauncherIcon::Ptr icon_ptr(new NiceMock<MockLauncherIcon>());
+
+  for (unsigned i = 0; i < monitors::MAX; ++i)
+  {
+    SigReceiver::Nice receiver(icon_ptr);
+    EXPECT_CALL(receiver, Redraw(_, i)).Times(AtLeast(1));
+    EXPECT_CALL(receiver, Visible(i)).Times((GetParam() == AbstractLauncherIcon::Quirk::VISIBLE) ? 1 : 0);
+
+    icon_ptr->SetQuirk(GetParam(), true, i);
+    time::Spec now;
+    now.SetToNow();
+
+    ASSERT_TRUE(icon_ptr->GetQuirk(GetParam(), i));
+    ASSERT_GE(now->tv_sec, icon_ptr->GetQuirkTime(GetParam(), i).tv_sec);
+    ASSERT_GE(now->tv_nsec, icon_ptr->GetQuirkTime(GetParam(), i).tv_nsec);
+  }
+}
+
+TEST_P(/*TestLauncherIcon*/Quirks, SetQuirkNewAllMonitors)
+{
+  AbstractLauncherIcon::Ptr icon_ptr(new NiceMock<MockLauncherIcon>());
+
+  SigReceiver::Nice receiver(icon_ptr);
+  EXPECT_CALL(receiver, Redraw(_, -1)).Times(AtLeast(1));
+  EXPECT_CALL(receiver, Visible(-1)).Times((GetParam() == AbstractLauncherIcon::Quirk::VISIBLE) ? 1 : 0);
+
+  icon_ptr->SetQuirk(GetParam(), true);
+  time::Spec now;
+  now.SetToNow();
+
+  ASSERT_TRUE(icon_ptr->GetQuirk(GetParam()));
+
+  for (unsigned i = 0; i < monitors::MAX; ++i)
+  {
+    ASSERT_TRUE(icon_ptr->GetQuirk(GetParam(), i));
+    ASSERT_GE(now->tv_sec, icon_ptr->GetQuirkTime(GetParam(), i).tv_sec);
+    ASSERT_GE(now->tv_nsec, icon_ptr->GetQuirkTime(GetParam(), i).tv_nsec);
+  }
+}
+
+TEST_P(/*TestLauncherIcon*/Quirks, SetQuirkOldSingleMonitor)
+{
+  AbstractLauncherIcon::Ptr icon_ptr(new NiceMock<MockLauncherIcon>());
+
+  for (unsigned i = 0; i < monitors::MAX; ++i)
+  {
+    SigReceiver::Nice receiver(icon_ptr);
+    EXPECT_CALL(receiver, Redraw(_, _)).Times(0);
+    EXPECT_CALL(receiver, Visible(_)).Times(0);
+
+    icon_ptr->SetQuirk(GetParam(), false, i);
+
+    ASSERT_FALSE(icon_ptr->GetQuirk(GetParam(), i));
+    ASSERT_EQ(0, icon_ptr->GetQuirkTime(GetParam(), i).tv_sec);
+    ASSERT_EQ(0, icon_ptr->GetQuirkTime(GetParam(), i).tv_nsec);
+  }
+}
+
+TEST_P(/*TestLauncherIcon*/Quirks, SetQuirkOldAllMonitors)
+{
+  AbstractLauncherIcon::Ptr icon_ptr(new NiceMock<MockLauncherIcon>());
+
+  SigReceiver::Nice receiver(icon_ptr);
+  EXPECT_CALL(receiver, Redraw(_, _)).Times(0);
+  EXPECT_CALL(receiver, Visible(_)).Times(0);
+
+  icon_ptr->SetQuirk(GetParam(), false);
+  ASSERT_FALSE(icon_ptr->GetQuirk(GetParam()));
+
+  for (unsigned i = 0; i < monitors::MAX; ++i)
+  {
+    ASSERT_FALSE(icon_ptr->GetQuirk(GetParam(), i));
+    ASSERT_EQ(0, icon_ptr->GetQuirkTime(GetParam(), i).tv_sec);
+    ASSERT_EQ(0, icon_ptr->GetQuirkTime(GetParam(), i).tv_nsec);
+  }
+}
+
+TEST_P(/*TestLauncherIcon*/Quirks, UpdateQuirkTimeSingleMonitor)
+{
+  AbstractLauncherIcon::Ptr icon_ptr(new NiceMock<MockLauncherIcon>());
+
+  for (unsigned i = 0; i < monitors::MAX; ++i)
+  {
+    SigReceiver::Nice receiver(icon_ptr);
+    EXPECT_CALL(receiver, Redraw(_, i));
+
+    static_cast<MockLauncherIcon*>(icon_ptr.GetPointer())->UpdateQuirkTime(GetParam(), i);
+    time::Spec now;
+    now.SetToNow();
+
+    ASSERT_GE(now->tv_sec, icon_ptr->GetQuirkTime(GetParam(), i).tv_sec);
+    ASSERT_GE(now->tv_nsec, icon_ptr->GetQuirkTime(GetParam(), i).tv_nsec);
+  }
+}
+
+TEST_P(/*TestLauncherIcon*/Quirks, UpdateQuirkTimeAllMonitors)
+{
+  AbstractLauncherIcon::Ptr icon_ptr(new NiceMock<MockLauncherIcon>());
+
+  SigReceiver::Nice receiver(icon_ptr);
+  EXPECT_CALL(receiver, Redraw(_, -1));
+
+  static_cast<MockLauncherIcon*>(icon_ptr.GetPointer())->UpdateQuirkTime(GetParam());
+  time::Spec now;
+  now.SetToNow();
+
+  for (unsigned i = 0; i < monitors::MAX; ++i)
+  {
+    ASSERT_GE(now->tv_sec, icon_ptr->GetQuirkTime(GetParam(), i).tv_sec);
+    ASSERT_GE(now->tv_nsec, icon_ptr->GetQuirkTime(GetParam(), i).tv_nsec);
+  }
+}
+
+TEST_P(/*TestLauncherIcon*/Quirks, ResetQuirkTimeSingleMonitor)
+{
+  AbstractLauncherIcon::Ptr icon_ptr(new NiceMock<MockLauncherIcon>());
+
+  for (unsigned i = 0; i < monitors::MAX; ++i)
+  {
+    static_cast<MockLauncherIcon*>(icon_ptr.GetPointer())->UpdateQuirkTime(GetParam(), i);
+
+    SigReceiver::Nice receiver(icon_ptr);
+    EXPECT_CALL(receiver, Redraw(_, _)).Times(0);
+    static_cast<MockLauncherIcon*>(icon_ptr.GetPointer())->ResetQuirkTime(GetParam(), i);
+
+    ASSERT_EQ(0, icon_ptr->GetQuirkTime(GetParam(), i).tv_sec);
+    ASSERT_EQ(0, icon_ptr->GetQuirkTime(GetParam(), i).tv_nsec);
+  }
+}
+
+TEST_P(/*TestLauncherIcon*/Quirks, ResetQuirkTimeAllMonitors)
+{
+  AbstractLauncherIcon::Ptr icon_ptr(new NiceMock<MockLauncherIcon>());
+  static_cast<MockLauncherIcon*>(icon_ptr.GetPointer())->UpdateQuirkTime(GetParam());
+
+  SigReceiver::Nice receiver(icon_ptr);
+  EXPECT_CALL(receiver, Redraw(_, _)).Times(0);
+  static_cast<MockLauncherIcon*>(icon_ptr.GetPointer())->ResetQuirkTime(GetParam());
+
+  for (unsigned i = 0; i < monitors::MAX; ++i)
+  {
+    ASSERT_EQ(0, icon_ptr->GetQuirkTime(GetParam(), i).tv_sec);
+    ASSERT_EQ(0, icon_ptr->GetQuirkTime(GetParam(), i).tv_nsec);
+  }
 }
 
 TEST_F(TestLauncherIcon, Visibility)
@@ -76,6 +257,38 @@
   EXPECT_FALSE(icon.IsVisible());
 }
 
+TEST_F(TestLauncherIcon, SetVisiblePresentsAllMonitors)
+{
+  icon.SetQuirk(AbstractLauncherIcon::Quirk::VISIBLE, true);
+  EXPECT_TRUE(icon.GetQuirk(AbstractLauncherIcon::Quirk::PRESENTED));
+}
+
+TEST_F(TestLauncherIcon, SetVisiblePresentsOneMonitor)
+{
+  for (unsigned i = 0; i < monitors::MAX; ++i)
+  {
+    icon.SetQuirk(AbstractLauncherIcon::Quirk::VISIBLE, true, i);
+    ASSERT_TRUE(icon.GetQuirk(AbstractLauncherIcon::Quirk::PRESENTED, i));
+    ASSERT_EQ(i == monitors::MAX-1, icon.GetQuirk(AbstractLauncherIcon::Quirk::PRESENTED));
+  }
+}
+
+TEST_F(TestLauncherIcon, SetUrgentPresentsAllMonitors)
+{
+  icon.SetQuirk(AbstractLauncherIcon::Quirk::URGENT, true);
+  EXPECT_TRUE(icon.GetQuirk(AbstractLauncherIcon::Quirk::PRESENTED));
+}
+
+TEST_F(TestLauncherIcon, SetUrgentPresentsOneMonitor)
+{
+  for (unsigned i = 0; i < monitors::MAX; ++i)
+  {
+    icon.SetQuirk(AbstractLauncherIcon::Quirk::URGENT, true, i);
+    ASSERT_TRUE(icon.GetQuirk(AbstractLauncherIcon::Quirk::PRESENTED, i));
+    ASSERT_EQ(i == monitors::MAX-1, icon.GetQuirk(AbstractLauncherIcon::Quirk::PRESENTED));
+  }
+}
+
 TEST_F(TestLauncherIcon, Stick)
 {
   bool saved = false;

=== modified file 'tests/test_layout_system.cpp'
--- tests/test_layout_system.cpp	2013-06-18 00:55:30 +0000
+++ tests/test_layout_system.cpp	2013-10-22 12:34:26 +0000
@@ -19,7 +19,7 @@
 
 #include <gmock/gmock.h>
 #include "LayoutSystem.h"
-#include "StandaloneWindowManager.h"
+#include "test_standalone_wm.h"
 
 #include <vector>
 
@@ -29,7 +29,6 @@
 {
 namespace
 {
-StandaloneWindowManager* wm = nullptr;
 
 StandaloneWindow::Ptr AddFakeWindowToWM(Window xid, nux::Geometry const& geo = nux::Geometry(1, 2, 30, 40))
 {
@@ -38,15 +37,17 @@
   fake_window->geo = geo;
   fake_window->deco_sizes[unsigned(WindowManager::Edge::TOP)] = nux::Size(geo.width, top_deco);
 
-  if (!wm)
-    wm = dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default());
-
-  wm->AddStandaloneWindow(fake_window);
+  testwrapper::StandaloneWM::Get()->AddStandaloneWindow(fake_window);
 
   return fake_window;
 }
 
-TEST(TestLayoutWindow, InitializationNormalWindow)
+struct TestLayoutWindow : testing::Test
+{
+  testwrapper::StandaloneWM wm;
+};
+
+TEST_F(TestLayoutWindow, InitializationNormalWindow)
 {
   const Window xid = g_random_int();
   auto fake_window = AddFakeWindowToWM(xid);
@@ -59,7 +60,7 @@
   EXPECT_EQ(lwin.aspect_ratio, fake_window->geo().width / static_cast<float>(fake_window->geo().height));
 }
 
-TEST(TestLayoutWindow, InitializationMinimizedNormalWindow)
+TEST_F(TestLayoutWindow, InitializationMinimizedNormalWindow)
 {
   const Window xid = g_random_int();
   auto fake_window = AddFakeWindowToWM(xid);
@@ -73,7 +74,7 @@
   EXPECT_EQ(lwin.aspect_ratio, fake_window->geo().width / static_cast<float>(fake_window->geo().height));
 }
 
-TEST(TestLayoutWindow, InitializationMaximizedWindow)
+TEST_F(TestLayoutWindow, InitializationMaximizedWindow)
 {
   const Window xid = g_random_int();
   auto fake_window = AddFakeWindowToWM(xid);
@@ -91,7 +92,7 @@
   EXPECT_EQ(lwin.aspect_ratio, expected_geo.width / static_cast<float>(expected_geo.height));
 }
 
-TEST(TestLayoutWindow, InitializationMinimizedMaximizedWindow)
+TEST_F(TestLayoutWindow, InitializationMinimizedMaximizedWindow)
 {
   const Window xid = g_random_int();
   auto fake_window = AddFakeWindowToWM(xid);
@@ -119,6 +120,7 @@
     lwindows.push_back(std::make_shared<LayoutWindow>(xid));
   }
 
+  testwrapper::StandaloneWM wm;
   LayoutSystem ls;
   LayoutWindow::Vector lwindows;
 };

=== modified file 'tests/test_panel_menu_view.cpp'
--- tests/test_panel_menu_view.cpp	2013-01-29 14:48:21 +0000
+++ tests/test_panel_menu_view.cpp	2013-10-22 12:34:26 +0000
@@ -23,7 +23,7 @@
 #include "PanelStyle.h"
 #include "UnitySettings.h"
 #include "UBusMessages.h"
-#include "StandaloneWindowManager.h"
+#include "test_standalone_wm.h"
 #include "test_uscreen_mock.h"
 #include "test_utils.h"
 
@@ -34,10 +34,6 @@
 
 struct TestPanelMenuView : public testing::Test
 {
-  TestPanelMenuView()
-    : WM(dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default()))
-  {}
-
   struct MockPanelMenuView : public PanelMenuView
   {
     MOCK_METHOD0(QueueDraw, void());
@@ -72,7 +68,7 @@
   MockUScreen uscreen;
   Settings settings;
   panel::Style panelStyle;
-  StandaloneWindowManager* WM;
+  testwrapper::StandaloneWM WM;
   testing::NiceMock<MockPanelMenuView> menu_view;
 };
 

=== modified file 'tests/test_panel_view.cpp'
--- tests/test_panel_view.cpp	2013-08-08 14:43:50 +0000
+++ tests/test_panel_view.cpp	2013-10-22 12:34:26 +0000
@@ -23,11 +23,11 @@
 #include "PanelView.h"
 #include "unity-shared/MockableBaseWindow.h"
 #include "unity-shared/PanelStyle.h"
-#include "unity-shared/StandaloneWindowManager.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/UBusWrapper.h"
 #include "unity-shared/UnitySettings.h"
 
+#include "test_standalone_wm.h"
 #include "test_utils.h"
 
 namespace
@@ -41,14 +41,12 @@
   unity::UBusManager ubus_manager_;
   nux::ObjectPtr<unity::MockableBaseWindow> window_;
   nux::ObjectPtr<unity::PanelView> panel_view_;
-  unity::StandaloneWindowManager* WM;
+  unity::testwrapper::StandaloneWM WM;
 
   TestPanelView()
     : window_(new unity::MockableBaseWindow())
     , panel_view_(new unity::PanelView(window_.GetPointer(), std::make_shared<unity::indicator::DBusIndicators>()))
-    , WM (dynamic_cast<unity::StandaloneWindowManager*>(&unity::WindowManager::Default()))
   {}
-
 };
 
 TEST_F(TestPanelView, StoredDashWidth)

=== modified file 'tests/test_shortcut_modeller_compiz.cpp'
--- tests/test_shortcut_modeller_compiz.cpp	2013-08-14 20:38:32 +0000
+++ tests/test_shortcut_modeller_compiz.cpp	2013-10-22 12:34:26 +0000
@@ -21,7 +21,7 @@
 using namespace testing;
 
 #include "CompizShortcutModeller.h"
-#include "StandaloneWindowManager.h"
+#include "test_standalone_wm.h"
 using namespace unity;
 using namespace unity::shortcut;
 
@@ -31,8 +31,7 @@
 struct TestShortcutCompizModeller : Test
 {
   TestShortcutCompizModeller()
-    : WM(dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default()))
-    , modeller(std::make_shared<CompizModeller>())
+    : modeller(std::make_shared<CompizModeller>())
   {
     WM->SetViewportSize(2, 2);
   }
@@ -63,7 +62,7 @@
     ASSERT_EQ(std::find(cats.begin(), cats.end(), "Workspaces"), cats.end());
   }
 
-  StandaloneWindowManager* WM;
+  testwrapper::StandaloneWM WM;
   AbstractModeller::Ptr modeller;
 };
 

=== modified file 'tests/test_software_center_launcher_icon.cpp'
--- tests/test_software_center_launcher_icon.cpp	2013-10-09 02:41:02 +0000
+++ tests/test_software_center_launcher_icon.cpp	2013-10-22 12:34:26 +0000
@@ -67,6 +67,8 @@
       : SoftwareCenterLauncherIcon(app, aptdaemon_trans_id, icon_path)
     {}
 
+    void LauncherIconUnstick() { LauncherIcon::UnStick(); }
+
     using SoftwareCenterLauncherIcon::GetActualDesktopFileAfterInstall;
     using SoftwareCenterLauncherIcon::GetRemoteUri;
     using SoftwareCenterLauncherIcon::OnFinished;
@@ -93,6 +95,7 @@
 TEST_F(TestSoftwareCenterLauncherIcon, Construction)
 {
   EXPECT_FALSE(icon.IsVisible());
+  EXPECT_TRUE(icon.IsSticky());
   EXPECT_EQ(AbstractLauncherIcon::Position::FLOATING, icon.position());
   EXPECT_EQ("Waiting to install", icon.tooltip_text());
   EXPECT_EQ(PRE_INSTALL_ICON, icon.icon_name());
@@ -178,13 +181,16 @@
 
 TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedSticksIcon)
 {
-  ASSERT_FALSE(icon.IsSticky());
+  icon.LauncherIconUnstick();
+
   icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
   EXPECT_TRUE(icon.IsSticky());
 }
 
 TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedSavesIconPosition)
 {
+  icon.LauncherIconUnstick();
+
   bool saved = false;
   icon.position_saved.connect([&saved] {saved = true;});
   icon.OnFinished(glib::Variant(g_variant_new("(s)", "exit-success")));
@@ -194,6 +200,8 @@
 
 TEST_F(TestSoftwareCenterLauncherIcon, OnFinishedKeepsStickyStatus)
 {
+  icon.LauncherIconUnstick();
+
   bool saved = false;
   usc->sticky = true;
   icon.position_saved.connect([&saved] {saved = true;});
@@ -246,9 +254,9 @@
   auto launcher = CreateLauncher();
   launcher->monitor = GetParam();
   icon.SetCenter({1, 1, 0}, launcher->monitor());
-  EXPECT_TRUE(icon.Animate(launcher, 2, 2));
-  EXPECT_TRUE(icon.IsVisible());
-  EXPECT_EQ("", icon.icon_name());
+  ASSERT_TRUE(icon.Animate(launcher, 2, 2));
+  EXPECT_FALSE(icon.IsVisible());
+  EXPECT_TRUE(icon.icon_name().empty());
 
   for (unsigned i = 0; i < monitors::MAX; ++i)
     ASSERT_EQ(static_cast<int>(i) == launcher->monitor(), icon.IsVisibleOnMonitor(i));
@@ -264,6 +272,8 @@
 
   for (unsigned i = 0; i < monitors::MAX; ++i)
     ASSERT_TRUE(icon.IsVisibleOnMonitor(i));
+
+  EXPECT_TRUE(icon.IsVisible());
 }
 
 struct InstallProgress : TestSoftwareCenterLauncherIcon, WithParamInterface<int> {};

=== added file 'tests/test_standalone_wm.h'
--- tests/test_standalone_wm.h	1970-01-01 00:00:00 +0000
+++ tests/test_standalone_wm.h	2013-10-22 12:34:26 +0000
@@ -0,0 +1,60 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2013 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 (Treviño) <[e-mail]>
+ */
+
+#ifndef UNITY_TESTWRAPPER_STANDALONE_WM_H
+#define UNITY_TESTWRAPPER_STANDALONE_WM_H
+
+#include "StandaloneWindowManager.h"
+
+namespace unity
+{
+namespace testwrapper
+{
+struct StandaloneWM
+{
+  StandaloneWM()
+    : WM(StandaloneWM::Get())
+  {}
+
+  static StandaloneWindowManager* Get()
+  {
+    return dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default());
+  }
+
+  ~StandaloneWM()
+  {
+    WM->ResetStatus();
+  }
+
+  StandaloneWindowManager* operator->() const
+  {
+    return WM;
+  }
+
+  StandaloneWindowManager* WM;
+
+private:
+  StandaloneWM(StandaloneWM const&) = delete;
+  StandaloneWM& operator=(StandaloneWM const&) = delete;
+};
+
+} // unity namespace
+} // tests namespace
+
+#endif // UNITY_TESTWRAPPER_STANDALONE_WM_H

=== modified file 'tests/test_switcher_controller.h'
--- tests/test_switcher_controller.h	2013-06-26 17:10:45 +0000
+++ tests/test_switcher_controller.h	2013-10-22 12:34:26 +0000
@@ -28,12 +28,12 @@
 #include "test_utils.h"
 #include "DesktopLauncherIcon.h"
 #include "SimpleLauncherIcon.h"
-#include "StandaloneWindowManager.h"
 #include "SwitcherController.h"
 #include "SwitcherView.h"
 #include "TimeUtil.h"
 #include "unity-shared/UnitySettings.h"
 #include "mock-base-window.h"
+#include "test_standalone_wm.h"
 
 using namespace std::chrono;
 
@@ -53,6 +53,7 @@
 {
 public:
   FakeApplicationWindow(Window xid, uint64_t active_number = 0);
+  ~FakeApplicationWindow();
 
   virtual std::string type() const;
 
@@ -94,7 +95,7 @@
   // required to create hidden secret global variables before test objects
   unity::Settings unity_settings_;
 
-  unity::StandaloneWindowManager* WM;
+  unity::testwrapper::StandaloneWM WM;
   nux::animation::TickSource tick_source_;
   nux::animation::AnimationController animation_controller_;
   unity::testmocks::MockBaseWindow::Ptr mock_window_;

=== modified file 'tests/test_switcher_controller_class.cpp'
--- tests/test_switcher_controller_class.cpp	2013-10-14 16:45:07 +0000
+++ tests/test_switcher_controller_class.cpp	2013-10-22 12:34:26 +0000
@@ -28,15 +28,19 @@
 FakeApplicationWindow::FakeApplicationWindow(Window xid, uint64_t active_number)
   : xid_(xid)
 {
-  auto WM = dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default());
   auto standalone_window = std::make_shared<StandaloneWindow>(xid_);
   standalone_window->active_number = active_number;
-  WM->AddStandaloneWindow(standalone_window);
+  testwrapper::StandaloneWM::Get()->AddStandaloneWindow(standalone_window);
 
   title.SetGetterFunction([this] { return "FakeApplicationWindow"; });
   icon.SetGetterFunction([this] { return ""; });
 }
 
+FakeApplicationWindow::~FakeApplicationWindow()
+{
+  testwrapper::StandaloneWM::Get()->Close(xid_);
+}
+
 std::string FakeApplicationWindow::type() const { return "mock"; }
 
 Window FakeApplicationWindow::window_id() const { return xid_; }
@@ -75,8 +79,7 @@
  */
 //class TestSwitcherController : public testing::Test
 TestSwitcherController::TestSwitcherController()
-  : WM(dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default()))
-  , animation_controller_(tick_source_)
+  : animation_controller_(tick_source_)
   , mock_window_(new NiceMock<testmocks::MockBaseWindow>())
   , controller_(std::make_shared<Controller>([this] { return mock_window_; }))
 {

=== modified file 'tests/test_switcher_view.cpp'
--- tests/test_switcher_view.cpp	2013-07-12 22:27:13 +0000
+++ tests/test_switcher_view.cpp	2013-10-22 12:34:26 +0000
@@ -23,7 +23,7 @@
 #include "SwitcherModel.h"
 #include "SwitcherView.h"
 #include "MockLauncherIcon.h"
-#include "StandaloneWindowManager.h"
+#include "test_standalone_wm.h"
 #include "unity-shared/IconRenderer.h"
 #include "unity-shared/UnitySettings.h"
 
@@ -47,10 +47,6 @@
 
 struct TestSwitcherView : testing::Test
 {
-  TestSwitcherView()
-    : WM(dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default()))
-  {}
-
   struct MockSwitcherView : SwitcherView
   {
     MOCK_METHOD0(QueueDraw, void());
@@ -94,7 +90,7 @@
       return apps[0];
     }
 
-  StandaloneWindowManager* WM;
+  testwrapper::StandaloneWM WM;
   unity::Settings settings;
   testing::NiceMock<MockSwitcherView> switcher;
 };

=== modified file 'tests/test_window_buttons.cpp'
--- tests/test_window_buttons.cpp	2013-01-28 23:35:47 +0000
+++ tests/test_window_buttons.cpp	2013-10-22 12:34:26 +0000
@@ -22,7 +22,7 @@
 
 #include <Nux/Nux.h>
 #include "PanelStyle.h"
-#include "StandaloneWindowManager.h"
+#include "test_standalone_wm.h"
 #include "UnitySettings.h"
 #include "unity-shared/WindowButtons.h"
 #include "unity-shared/WindowButtonPriv.h"
@@ -34,10 +34,6 @@
 
 struct TestWindowButtons : public testing::Test
 {
-  TestWindowButtons()
-    : wm(dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default()))
-  {}
-
   StandaloneWindow::Ptr AddFakeWindowToWM(Window xid)
   {
     auto fake_window = std::make_shared<StandaloneWindow>(xid);
@@ -67,7 +63,7 @@
   Settings settings;
   panel::Style panel_style;
   testing::NiceMock<MockWindowButtons> wbuttons;
-  StandaloneWindowManager* wm = nullptr;
+  testwrapper::StandaloneWM wm;
 };
 
 TEST_F(TestWindowButtons, Construction)

=== modified file 'tests/test_xdnd_manager_imp.cpp'
--- tests/test_xdnd_manager_imp.cpp	2013-07-18 00:11:16 +0000
+++ tests/test_xdnd_manager_imp.cpp	2013-10-22 12:34:26 +0000
@@ -42,6 +42,7 @@
 
   MOCK_METHOD0(Collect, void(void));
   MOCK_METHOD0(Deactivate, void(void));
+  MOCK_METHOD1(GetData, std::string(std::string const& type));
 };
 
 class TestXdndManager : public Test {
@@ -52,19 +53,6 @@
     , xdnd_manager(xdnd_start_stop_notifier_, xdnd_collection_window_)
   {}
 
-  void SetUp()
-  {
-    // Evil hack to avoid crashes.
-    XEvent xevent;
-    xevent.type = ClientMessage;
-    xevent.xany.display = nux::GetGraphicsDisplay()->GetX11Display();
-    xevent.xclient.message_type = XInternAtom(xevent.xany.display, "XdndEnter", false);
-    xevent.xclient.format = 0;
-    xevent.xclient.data.l[1] = 5 >> 24;
-
-    nux::GetGraphicsDisplay()->ProcessXEvent(xevent, true);
-  }
-
   MockXdndStartStopNotifier::Ptr xdnd_start_stop_notifier_;
   MockXdndCollectionWindow::Ptr xdnd_collection_window_;
   unity::XdndManagerImp xdnd_manager;
@@ -72,25 +60,25 @@
 
 TEST_F(TestXdndManager, SignalDndStartedAndFinished)
 {
-  std::vector<std::string> mimes;
-  mimes.push_back("text/uri-list");
-  mimes.push_back("hello/world");
+  std::vector<std::string> mimes = {"text/uri-list", "hello/world"};
 
   auto emit_collected_signal = [&] () {
     xdnd_collection_window_->collected.emit(mimes);
   };
 
   EXPECT_CALL(*xdnd_collection_window_, Collect())
-    .Times(1)
     .WillOnce(Invoke(emit_collected_signal));
 
+  EXPECT_CALL(*xdnd_collection_window_, GetData("text/uri-list"))
+    .WillOnce(Return("file://dnd_file"));
+
   bool dnd_started_emitted = false;
   xdnd_manager.dnd_started.connect([&] (std::string const& /*data*/, int /*monitor*/) {
   	dnd_started_emitted = true;
   });
 
   xdnd_start_stop_notifier_->started.emit();
-  Utils::WaitUntil(dnd_started_emitted);
+  ASSERT_TRUE(dnd_started_emitted);
 
   EXPECT_CALL(*xdnd_collection_window_, Deactivate())
     .Times(1);
@@ -101,14 +89,12 @@
   });
 
   xdnd_start_stop_notifier_->finished.emit();
-  Utils::WaitUntil(dnd_finished_emitted);
+  EXPECT_TRUE(dnd_finished_emitted);
 }
 
 TEST_F(TestXdndManager, SignalDndStarted_InvalidMimes)
 {
-  std::vector<std::string> mimes;
-  mimes.push_back("hello/world");
-  mimes.push_back("invalid/mimes");
+  std::vector<std::string> mimes = {"invalid/mimes", "goodbye/world"};
 
   auto emit_collected_signal = [&] () {
     xdnd_collection_window_->collected.emit(mimes);
@@ -118,13 +104,38 @@
     .Times(1)
     .WillOnce(Invoke(emit_collected_signal));
 
-  bool dnd_started_emitted = false;
-  xdnd_manager.dnd_started.connect([&] (std::string const& /*data*/, int /*monitor*/) {
-    dnd_started_emitted = true;
-  });
-
-  xdnd_start_stop_notifier_->started.emit();
-
+  EXPECT_CALL(*xdnd_collection_window_, GetData(_)).Times(0);
+
+  bool dnd_started_emitted = false;
+  xdnd_manager.dnd_started.connect([&] (std::string const& /*data*/, int /*monitor*/) {
+    dnd_started_emitted = true;
+  });
+
+  xdnd_start_stop_notifier_->started.emit();
+
+  EXPECT_FALSE(dnd_started_emitted);
+}
+
+TEST_F(TestXdndManager, SignalDndStarted_InvalidData)
+{
+  std::vector<std::string> mimes = {"text/uri-list", "hello/world"};
+
+  auto emit_collected_signal = [&] () {
+    xdnd_collection_window_->collected.emit(mimes);
+  };
+
+  EXPECT_CALL(*xdnd_collection_window_, Collect())
+    .WillOnce(Invoke(emit_collected_signal));
+
+  EXPECT_CALL(*xdnd_collection_window_, GetData("text/uri-list"))
+    .WillOnce(Return(""));
+
+  bool dnd_started_emitted = false;
+  xdnd_manager.dnd_started.connect([&] (std::string const& /*data*/, int /*monitor*/) {
+    dnd_started_emitted = true;
+  });
+
+  xdnd_start_stop_notifier_->started.emit();
   EXPECT_FALSE(dnd_started_emitted);
 }
 

=== modified file 'unity-shared/StandaloneWindowManager.cpp'
--- unity-shared/StandaloneWindowManager.cpp	2013-09-14 09:56:10 +0000
+++ unity-shared/StandaloneWindowManager.cpp	2013-10-22 12:34:26 +0000
@@ -416,11 +416,9 @@
 }
 
 void StandaloneWindowManager::TerminateScale()
-{}
-
-void StandaloneWindowManager::SetScaleActive(bool scale_active)
 {
-  scale_active_ = scale_active;
+  scale_active_ = false;
+  scale_active_for_group_ = false;
 }
 
 bool StandaloneWindowManager::IsScaleActive() const
@@ -428,11 +426,6 @@
   return scale_active_;
 }
 
-void StandaloneWindowManager::SetScaleActiveForGroup(bool scale_active_for_group)
-{
-  scale_active_for_group_ = scale_active_for_group;
-}
-
 bool StandaloneWindowManager::IsScaleActiveForGroup() const
 {
   return scale_active_for_group_;
@@ -440,7 +433,7 @@
 
 void StandaloneWindowManager::InitiateExpo()
 {
-  expo_state_ = !expo_state_;
+  expo_state_ = true;
 }
 
 void StandaloneWindowManager::TerminateExpo()
@@ -458,11 +451,6 @@
   return false;
 }
 
-void StandaloneWindowManager::SetIsAnyWindowMoving(bool is_any_window_moving)
-{
-  is_any_window_moving_ = is_any_window_moving;
-}
-
 bool StandaloneWindowManager::IsAnyWindowMoving() const
 {
   return is_any_window_moving_;
@@ -627,6 +615,41 @@
 
 // Mock functions
 
+void StandaloneWindowManager::ResetStatus()
+{
+  for (auto const& win : GetStandaloneWindows())
+    Close(win->Xid());
+
+  expo_state_ = false;
+  in_show_desktop_ = false;
+  scale_active_ = false;
+  scale_active_for_group_ = false;
+  is_any_window_moving_ = false;
+  current_desktop_ = 0;
+  viewport_size_ = {2, 2};
+  current_vp_ = {0, 0};
+}
+
+void StandaloneWindowManager::SetScaleActiveForGroup(bool scale_active_for_group)
+{
+  scale_active_for_group_ = scale_active_for_group;
+}
+
+void StandaloneWindowManager::SetScaleActive(bool scale_active)
+{
+  scale_active_ = scale_active;
+}
+
+void StandaloneWindowManager::SetExpoActive(bool expo_active)
+{
+  expo_state_ = expo_active;
+}
+
+void StandaloneWindowManager::SetIsAnyWindowMoving(bool is_any_window_moving)
+{
+  is_any_window_moving_ = is_any_window_moving;
+}
+
 void StandaloneWindowManager::SetCurrentDesktop(unsigned desktop_id)
 {
   current_desktop_ = desktop_id;

=== modified file 'unity-shared/StandaloneWindowManager.h'
--- unity-shared/StandaloneWindowManager.h	2013-09-14 09:56:10 +0000
+++ unity-shared/StandaloneWindowManager.h	2013-10-22 12:34:26 +0000
@@ -162,11 +162,14 @@
 
   void SetScaleActive(bool scale_active);
   void SetScaleActiveForGroup(bool scale_active_for_group);
+  void SetExpoActive(bool expo_active);
   void SetCurrentDesktop(unsigned desktop_id);
 
   void SetCurrentViewport(nux::Point const& vp);
   void SetWorkareaGeometry(nux::Geometry const& geo);
 
+  void ResetStatus();
+
 protected:
   virtual void AddProperties(GVariantBuilder* builder);
 

=== modified file 'unity-shared/TimeUtil.h'
--- unity-shared/TimeUtil.h	2012-11-30 20:22:13 +0000
+++ unity-shared/TimeUtil.h	2013-10-22 12:34:26 +0000
@@ -18,13 +18,16 @@
  * Authored by: Alex Launi <[e-mail]>
  */
 
+#ifndef TIME_UTIL_H
+#define TIME_UTIL_H
+
 #include <time.h>
 #include <cstdint>
 
 typedef int64_t DeltaTime;
 
-namespace unity {
-
+namespace unity
+{
 class TimeUtil
 {
 public:
@@ -69,5 +72,45 @@
   }
 };
 
-
-}
+namespace time
+{
+  struct Spec
+  {
+    Spec()
+      : ts({0, 0})
+    {}
+
+    void Reset()
+    {
+      ts.tv_sec = 0;
+      ts.tv_nsec = 0;
+    }
+
+    void SetToNow()
+    {
+      clock_gettime(CLOCK_MONOTONIC, &ts);
+    }
+
+    DeltaTime TimeDelta(Spec const& other)
+    {
+      return TimeUtil::TimeDelta(&ts, &other.ts);
+    }
+
+    operator struct timespec() const
+    {
+      return ts;
+    }
+
+    const struct timespec* operator->() const
+    {
+      return &ts;
+    }
+
+  private:
+    struct timespec ts;
+  };
+}
+
+}
+
+#endif // TIME_UTIL_H

=== modified file 'unity-standalone/StandaloneUnity.cpp'
--- unity-standalone/StandaloneUnity.cpp	2013-08-08 14:43:50 +0000
+++ unity-standalone/StandaloneUnity.cpp	2013-10-22 12:34:26 +0000
@@ -62,6 +62,11 @@
 
 using namespace unity;
 
+struct StandaloneDndManager : XdndManager
+{
+  int Monitor() const { return 0; }
+};
+
 class UnityStandalone
 {
 public:
@@ -86,7 +91,7 @@
 
 void UnityStandalone::Init ()
 {
-  auto xdnd_manager = std::make_shared<XdndManager>();
+  auto xdnd_manager = std::make_shared<StandaloneDndManager>();
   auto edge_barriers = std::make_shared<ui::EdgeBarrierController>();
   launcher_controller = std::make_shared<launcher::Controller>(xdnd_manager, edge_barriers);
   panel_controller = std::make_shared<panel::Controller>(edge_barriers);
@@ -121,7 +126,7 @@
 
 void UnityStandaloneTV::Init()
 {
-  auto xdnd_manager = std::make_shared<XdndManager>();
+  auto xdnd_manager = std::make_shared<StandaloneDndManager>();
   auto edge_barriers = std::make_shared<ui::EdgeBarrierController>();
   launcher_controller = std::make_shared<launcher::Controller>(xdnd_manager, edge_barriers);
   dash_controller = std::make_shared<dash::Controller>();