Merge lp:~timo-jyrinki/unity/ubuntu.5200 into lp:~ubuntu-desktop/unity/precise

[Timo Jyrinki]

* New upstream release.
     - ResultRendererTile: fix a crash if row.renderer<TextureContainer*>()
       is null (LP: #926658)
     - Fix unity launcher vanishes when switching to mirrored displays
       (LP: #991637)
     - Fix window decorations being drawn when they should not be.
       This fixes icaclient window "dancing" (LP: #1083186) and
       hides decoration in a test case with Steam (LP: #1122478)
     - [multimonitor] Dash - Opening dash or HUD on one screen removes panel
       shadow on the other (LP: #892718)
     - Press Alt+F1, panel’s shadow dissapear (LP: #942965)
   * Cherry-pick a manual test for decorations fix

For didrocks.

[Didier Roche-Tolomelli (didrocks)]

And looking good! sponsored :)

review: Approve

=== modified file 'AUTHORS'
--- AUTHORS	2012-11-12 12:20:38 +0000
+++ AUTHORS	2013-05-07 13:13:46 +0000
@@ -114,6 +114,7 @@
  Thomi Richards <[e-mail]>, Ted Gould <[e-mail]>
  Thomi Richards <[e-mail]>, Thomi Richards <[e-mail]>
  Thomi Richards <[e-mail]>, Tim Penhey <[e-mail]>
+ Timo Jyrinki <[e-mail]>
  Tim Penhey <[e-mail]>
  Tim Penhey <[e-mail]>, Gordon Allott <[e-mail]>
  Tim Penhey <[e-mail]>, Jason Smith <[e-mail]>
 
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-11-12 12:20:38 +0000
+++ CMakeLists.txt	2013-05-07 13:13:46 +0000
@@ -8,7 +8,7 @@
 #
 set (PROJECT_NAME "unity")
 set (UNITY_MAJOR 5)
-set (UNITY_MINOR 18)
+set (UNITY_MINOR 20)
 set (UNITY_MICRO 0)
 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
 set (UNITY_API_VERSION "5.0")
 
=== modified file 'ChangeLog'
--- ChangeLog	2012-11-12 12:20:38 +0000
+++ ChangeLog	2013-05-07 13:13:46 +0000
@@ -1,3 +1,75 @@
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityWindow: properly draw the panel shadow when a Nux window is focused or during WS switch
+	
+	If a nux window is the active one, compiz won't draw it, so the code that is doing the
+	panelShadow drawing is excluded. We need to make sure that this will be executed
+	also in this case.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityShell: paint the panel shadow only if we don't have a mask set
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	UnityWindow: properly draw the panel shadow when a Nux window is focused or during WS switch
+	
+	If a nux window is the active one, compiz won't draw it, so the code that is doing the panelShadow drawing is excluded. We need to make sure that this will be executed also in this case.
+
[phone]  Łukasz 'sil2100' Zemczak  <[e-mail]>
+
+	Partial backport of Unity trunk revno. 2901 to fix where window decorations are being drawn when they should not be (LP: #1122478) (LP: #1083186).
+
[phone]  Chris Townsend  <[e-mail]>
+
+	Fix issue whare a window created without decorations would have decorations when maximizing and minimizing the window very quicly.  This fix was taken from upstream Unity.
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport fix for 991637.
+	
+	Merged branch lp:~andyrock/unity/fix-991637-5.0
+
[phone]  Andrea Azzarone  <[e-mail]>
+
+	Backport fix for 991637.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ResultRendererTile: fix a crash if row.renderer<TextureContainer*>() is null
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	test_service_lens: 12.04 has not preview support, fix compilation
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ResultRendererTile: Fix compilation issue.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	merging with lp:unity/5.0
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	ResultRendererTile: don't crash in LoadIcon if row.renderer<TextureContainer*>() is null
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	Change TimeUtil to use int64, so the buffer wont overflow within our lifetimes.. Fixes: https://bugs.launchpad.net/bugs/806248. Approved by Łukasz Zemczak.
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fix header
+
[phone]  Brandon Schaefer  <[e-mail]>
+
+	* Fix TimeUtil and int32 buffer overflow, now uses an int64
+
[phone]  Timo Jyrinki  <[e-mail]>
+
+	Release\ 5.18.0
+
 2012-10-18  Andrea Azzarone  <[e-mail]>
 
 	Use linear filtering to draw icons (when needed).. Fixes: https://bugs.launchpad.net/bugs/1036231. Approved by Marco Trevisan (Treviño).
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-01-28 13:01:55 +0000
+++ debian/changelog	2013-05-07 13:13:46 +0000
@@ -1,3 +1,20 @@
+unity (5.20.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - ResultRendererTile: fix a crash if row.renderer<TextureContainer*>()
+      is null (LP: #926658)
+    - Fix unity launcher vanishes when switching to mirrored displays
+      (LP: #991637)
+    - Fix window decorations being drawn when they should not be. 
+      This fixes icaclient window "dancing" (LP: #1083186) and 
+      hides decoration in a test case with Steam (LP: #1122478)
+    - [multimonitor] Dash - Opening dash or HUD on one screen removes panel
+      shadow on the other (LP: #892718)
+    - Press Alt+F1, panel’s shadow dissapear (LP: #942965)
+  * Cherry-pick a manual test for decorations fix
+
+ -- Timo Jyrinki <[e-mail]>  Fri, 12 Apr 2013 11:38:40 +0300
+
 unity (5.18.0-0ubuntu2) precise; urgency=low
 
   [ Brandon Schaefer ]
 
=== modified file 'manual-tests/WindowButtons.txt'
--- manual-tests/WindowButtons.txt	2012-04-13 22:03:13 +0000
+++ manual-tests/WindowButtons.txt	2013-05-07 13:13:46 +0000
@@ -9,3 +9,17 @@
 
 Expected Result:
  * The close window button should be shown as disabled (grayed)
+
+
+Custom window buttons and decorations always on desired windows
+---------------------------------------------------------------
+
+Actions:
+ * Start Steam on Ubuntu
+ * Maximize the Steam window
+ * Minimize the Steam window
+ * Un-minimize the Steam window
+ * Restore the Steam window
+
+Expected Result:
+ * Make sure that Steam does not have Ubuntu window decorations
 
=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2012-09-11 10:38:44 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2013-05-07 13:13:46 +0000
@@ -185,7 +185,7 @@
       launchers[i] = nux::ObjectPtr<Launcher>(CreateLauncher(i));
     }
 
-    int monitor = (num_launchers == 1) ? primary : i;
+    int monitor = (num_launchers == 1 && num_monitors > 1) ? primary : i;
 
     if (launchers[i]->monitor() != monitor)
     {
 
=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
--- plugins/unityshell/src/PanelMenuView.cpp	2012-04-27 11:42:56 +0000
+++ plugins/unityshell/src/PanelMenuView.cpp	2013-05-07 13:13:46 +0000
@@ -1083,7 +1083,7 @@
       // if we've just started tracking this window and it is maximized, let's
       // make sure it's undecorated just in case it slipped by us earlier
       // (I'm looking at you, Chromium!)
-      if (_is_maximized && wm->IsWindowDecorated(xid))
+      if (_is_maximized && wm->HasWindowDecorations(xid))
       {
         wm->Undecorate(xid);
         _maximized_set.insert(xid);
@@ -1222,7 +1222,7 @@
   }
 
   // update the state of the window in the _decor_map
-  _decor_map[xid] = WindowManager::Default()->IsWindowDecorated(xid);
+  _decor_map[xid] = WindowManager::Default()->HasWindowDecorations(xid);
 
   if (_decor_map[xid])
     WindowManager::Default()->Undecorate(xid);
@@ -1716,7 +1716,7 @@
     {
       Window xid = bamf_window_get_xid(window);
 
-      _decor_map[xid] = WindowManager::Default()->IsWindowDecorated(xid);
+      _decor_map[xid] = WindowManager::Default()->HasWindowDecorations(xid);
 
       if (_decor_map[xid])
         WindowManager::Default()->Undecorate(xid);
 
=== modified file 'plugins/unityshell/src/PluginAdapter.cpp'
--- plugins/unityshell/src/PluginAdapter.cpp	2012-07-18 15:25:17 +0000
+++ plugins/unityshell/src/PluginAdapter.cpp	2013-05-07 13:13:46 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2012 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
@@ -42,7 +42,6 @@
 #define MWM_HINTS_FUNCTIONS     (1L << 0)
 #define MWM_HINTS_DECORATIONS   (1L << 1)
 #define MWM_HINTS_UNDECORATED_UNITY 0x80
-#define _XA_MOTIF_WM_HINTS    "_MOTIF_WM_HINTS"
 
 /* static */
 PluginAdapter*
@@ -151,13 +150,17 @@
 void
 PluginAdapter::NotifyNewDecorationState(guint32 xid)
 {
-  bool wasTracked = (_window_decoration_state.find (xid) != _window_decoration_state.end ());
+  auto deco_state_it = _window_decoration_state.find(xid);
+  bool wasTracked = (deco_state_it != _window_decoration_state.end());
   bool wasDecorated = false;
 
   if (wasTracked)
+  {
     wasDecorated = _window_decoration_state[xid];
+    _window_decoration_state.erase(deco_state_it);
+  }
 
-  bool decorated = IsWindowDecorated (xid);
+  bool decorated = HasWindowDecorations(xid);
 
   if (decorated == wasDecorated)
     return;
@@ -415,44 +418,74 @@
   return false;
 }
 
-bool
-PluginAdapter::IsWindowDecorated(guint32 xid)
+unsigned long
+PluginAdapter::GetMwnDecorations(Window window_id) const
 {
   Display* display = m_Screen->dpy();
-  Window win = xid;
-  Atom hints_atom = None;
   MotifWmHints* hints = NULL;
   Atom type = None;
   gint format;
   gulong nitems;
   gulong bytes_after;
-  bool ret = true;
-
-  hints_atom = XInternAtom(display, _XA_MOTIF_WM_HINTS, false);
-
-  if (XGetWindowProperty(display, win, hints_atom, 0,
+  unsigned long decorations = 0;
+
+  if (XGetWindowProperty(display, window_id, Atoms::mwmHints, 0,
                          sizeof(MotifWmHints) / sizeof(long), False,
-                         hints_atom, &type, &format, &nitems, &bytes_after,
+                         Atoms::mwmHints, &type, &format, &nitems, &bytes_after,
                          (guchar**)&hints) != Success)
-    return false;
+  {
+    return decorations;
+  }
+
+  decorations |= (MwmDecorAll | MwmDecorTitle);
 
   if (!hints)
-    return ret;
+    return decorations;
 
   /* Check for the presence of the high bit
    * if present, it means that we undecorated
    * this window, so don't mark it as undecorated */
-  if (type == hints_atom && format != 0 &&
-      hints->flags & MWM_HINTS_DECORATIONS)
+  if (type == Atoms::mwmHints && format != 0 && hints->flags & MWM_HINTS_DECORATIONS)
   {
-    /* Must have both bits set */
-    _window_decoration_state[xid] = ret =
-          (hints->decorations & (MwmDecorAll | MwmDecorTitle))  ||
-          (hints->decorations & MWM_HINTS_UNDECORATED_UNITY);
+    decorations = hints->decorations;
   }
 
   XFree(hints);
-  return ret;
+  return decorations;
+}
+
+bool
+PluginAdapter::HasWindowDecorations(guint32 xid) const
+{
+  Window window_id = xid;
+  auto deco_state_it = _window_decoration_state.find(window_id);
+
+  if (deco_state_it != _window_decoration_state.end())
+    return deco_state_it->second;
+
+  unsigned long decorations = GetMwnDecorations(window_id);
+
+  /* Must have both bits set */
+  bool decorated = (decorations & (MwmDecorAll | MwmDecorTitle)) ||
+                   (decorations & MWM_HINTS_UNDECORATED_UNITY);
+
+  _window_decoration_state[window_id] = decorated;
+  return decorated;
+}
+
+bool
+PluginAdapter::IsWindowDecorated(guint32 xid)
+{
+  Window window_id = xid;
+
+  bool decorated = GetMwnDecorations(window_id) & (MwmDecorAll | MwmDecorTitle);
+
+  if (decorated && GetCardinalProperty(window_id, Atoms::frameExtents).empty())
+  {
+    decorated = false;
+  }
+
+  return decorated;
 }
 
 bool
@@ -1023,7 +1056,6 @@
 PluginAdapter::SetMwmWindowHints(Window xid, MotifWmHints* new_hints)
 {
   Display* display = m_Screen->dpy();
-  Atom hints_atom = None;
   MotifWmHints* data = NULL;
   MotifWmHints* hints = NULL;
   Atom type = None;
@@ -1031,18 +1063,16 @@
   gulong nitems;
   gulong bytes_after;
 
-  hints_atom = XInternAtom(display, _XA_MOTIF_WM_HINTS, false);
-
   if (XGetWindowProperty(display,
                          xid,
-                         hints_atom, 0, sizeof(MotifWmHints) / sizeof(long),
+                         Atoms::mwmHints, 0, sizeof(MotifWmHints) / sizeof(long),
                          False, AnyPropertyType, &type, &format, &nitems,
                          &bytes_after, (guchar**)&data) != Success)
   {
     return;
   }
 
-  if (type != hints_atom || !data)
+  if (type != Atoms::mwmHints || !data)
   {
     hints = new_hints;
   }
@@ -1064,7 +1094,7 @@
 
   XChangeProperty(display,
                   xid,
-                  hints_atom, hints_atom, 32, PropModeReplace,
+                  Atoms::mwmHints, Atoms::mwmHints, 32, PropModeReplace,
                   (guchar*)hints, sizeof(MotifWmHints) / sizeof(long));
 
   if (data)
@@ -1074,6 +1104,9 @@
 void
 PluginAdapter::Decorate(guint32 xid)
 {
+  if (!HasWindowDecorations(xid))
+    return;
+
   MotifWmHints hints = { 0 };
 
   hints.flags = MWM_HINTS_DECORATIONS;
@@ -1085,6 +1118,9 @@
 void
 PluginAdapter::Undecorate(guint32 xid)
 {
+  if (!IsWindowDecorated(xid))
+    return;
+
   MotifWmHints hints = { 0 };
 
   /* Set the high bit to indicate that we undecorated this
@@ -1319,3 +1355,29 @@
          .add("expo_active", IsExpoActive())
          .add("viewport_switch_running", IsViewPortSwitchStarted());
 }
+
+std::vector<long> PluginAdapter::GetCardinalProperty(Window window_id, Atom atom) const
+{
+  Atom type;
+  int result, format;
+  unsigned long n_items, bytes_after;
+  long *buf = nullptr;
+
+  result = XGetWindowProperty(m_Screen->dpy(), window_id, atom, 0L, 65536, False,
+                              XA_CARDINAL, &type, &format, &n_items, &bytes_after,
+                              reinterpret_cast<unsigned char **>(&buf));
+
+  std::unique_ptr<long[], int(*)(void*)> buffer(buf, XFree);
+
+  if (result == Success && type == XA_CARDINAL && format == 32 && buffer && n_items > 0)
+  {
+    std::vector<long> values(n_items);
+
+    for (unsigned i = 0; i < n_items; ++i)
+      values[i] = buffer[i];
+
+    return values;
+  }
+
+  return std::vector<long>();
+}
 
=== modified file 'plugins/unityshell/src/PluginAdapter.h'
--- plugins/unityshell/src/PluginAdapter.h	2012-04-27 11:42:56 +0000
+++ plugins/unityshell/src/PluginAdapter.h	2013-05-07 13:13:46 +0000
@@ -1,6 +1,6 @@
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /*
- * Copyright (C) 2010 Canonical Ltd
+ * Copyright (C) 2010-2012 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
@@ -125,6 +125,7 @@
   bool IsWindowClosable(guint32 xid);
   bool IsWindowMinimizable(guint32 xid);
   bool IsWindowMaximizable(guint32 xid);
+  bool HasWindowDecorations(guint32 xid) const;
 
   void Restore(guint32 xid);
   void RestoreAt(guint32 xid, int x, int y);
@@ -174,6 +175,9 @@
 
   bool CheckWindowIntersection(nux::Geometry const& region, CompWindow* window);
   void SetMwmWindowHints(Window xid, MotifWmHints* new_hints);
+  unsigned long GetMwnDecorations(Window xid) const;
+
+  std::vector<long> GetCardinalProperty(Window xid, Atom atom) const;
 
   CompScreen* m_Screen;
   MultiActionList m_ExpoActionList;
@@ -193,7 +197,7 @@
   bool _in_show_desktop;
   CompWindow* _last_focused_window;
 
-  std::map<guint32, unsigned int> _window_decoration_state;
+  mutable std::map<guint32, unsigned int> _window_decoration_state;
 
   static PluginAdapter* _default;
 };
 
=== modified file 'plugins/unityshell/src/ResultRendererTile.cpp'
--- plugins/unityshell/src/ResultRendererTile.cpp	2012-04-25 12:09:59 +0000
+++ plugins/unityshell/src/ResultRendererTile.cpp	2013-05-07 13:13:46 +0000
@@ -21,14 +21,10 @@
  */
 
 
-#include <sstream>     // for ostringstream
 #include "ResultRendererTile.h"
 
-#include <boost/algorithm/string.hpp>
-
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
-#include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include <NuxCore/Logger.h>
@@ -51,6 +47,7 @@
 namespace
 {
 nux::logging::Logger logger("unity.dash.results");
+const std::string DEFAULT_GICON = ". GThemedIcon text-x-preview";
 
 const int FONT_SIZE = 10;
 }
@@ -230,7 +227,7 @@
 
 void ResultRendererTile::Preload(Result& row)
 {
-  if (row.renderer<TextureContainer*>() == nullptr)
+  if (!row.renderer<TextureContainer*>())
   {
     row.set_renderer(new TextureContainer());
     LoadIcon(row);
@@ -240,17 +237,25 @@
 
 void ResultRendererTile::Unload(Result& row)
 {
-  TextureContainer *container = row.renderer<TextureContainer*>();
-  delete container;
+  delete row.renderer<TextureContainer*>();
   row.set_renderer<TextureContainer*>(nullptr);
 }
 
 void ResultRendererTile::LoadIcon(Result& row)
 {
+  auto container = row.renderer<TextureContainer*>();
+
+  if (!container)
+  {
+    LOG_ERROR(logger) << "No valid container for Result " << row.name() << " with URI "
+                      << row.uri();
+    return;
+  }
+
   Style& style = Style::Instance();
   std::string const& icon_hint = row.icon_hint;
-#define DEFAULT_GICON ". GThemedIcon text-x-preview"
   std::string icon_name;
+
   if (G_UNLIKELY(neko))
   {
     int tmp1 = style.GetTileIconSize() + (rand() % 16) - 8;
@@ -266,28 +271,25 @@
     icon_name = !icon_hint.empty() ? icon_hint : DEFAULT_GICON;
   }
 
-
-
-  GIcon*  icon = g_icon_new_for_string(icon_name.c_str(), NULL);
-  TextureContainer* container = row.renderer<TextureContainer*>();
-
-  IconLoader::IconLoaderCallback slot = sigc::bind(sigc::mem_fun(this, &ResultRendererTile::IconLoaded), icon_hint, row);
-
-  if (g_strrstr(icon_name.c_str(), "://"))
+  auto slot = sigc::bind(sigc::mem_fun(this, &ResultRendererTile::IconLoaded), icon_hint, row);
+
+  if (icon_name.find("://") != std::string::npos)
   {
     container->slot_handle = IconLoader::GetDefault().LoadFromURI(icon_name, style.GetTileIconSize(), slot);
   }
-  else if (G_IS_ICON(icon))
-  {
-    container->slot_handle = IconLoader::GetDefault().LoadFromGIconString(icon_name, style.GetTileIconSize(), slot);
-  }
   else
   {
-    container->slot_handle = IconLoader::GetDefault().LoadFromIconName(icon_name, style.GetTileIconSize(), slot);
+    glib::Object<GIcon> icon(g_icon_new_for_string(icon_name.c_str(), nullptr));
+
+    if (G_IS_ICON(icon.RawPtr()))
+    {
+      container->slot_handle = IconLoader::GetDefault().LoadFromGIconString(icon_name, style.GetTileIconSize(), slot);
+    }
+    else
+    {
+      container->slot_handle = IconLoader::GetDefault().LoadFromIconName(icon_name, style.GetTileIconSize(), slot);
+    }
   }
-
-  if (icon != NULL)
-    g_object_unref(icon);
 }
 
 nux::BaseTexture* ResultRendererTile::CreateTextureCallback(std::string const& texid,
 
=== modified file 'plugins/unityshell/src/WindowManager.cpp'
--- plugins/unityshell/src/WindowManager.cpp	2012-07-18 15:25:17 +0000
+++ plugins/unityshell/src/WindowManager.cpp	2013-05-07 13:13:46 +0000
@@ -58,6 +58,11 @@
     return true;
   }
 
+  bool HasWindowDecorations(guint32 xid) const
+  {
+    return true;
+  }
+
   bool IsWindowOnCurrentDesktop(guint32 xid)
   {
     return true;
 
=== modified file 'plugins/unityshell/src/WindowManager.h'
--- plugins/unityshell/src/WindowManager.h	2012-07-18 15:25:17 +0000
+++ plugins/unityshell/src/WindowManager.h	2013-05-07 13:13:46 +0000
@@ -61,6 +61,7 @@
   virtual bool IsWindowClosable(guint32 xid) = 0;
   virtual bool IsWindowMinimizable(guint32 xid) = 0;
   virtual bool IsWindowMaximizable(guint32 xid) = 0;
+  virtual bool HasWindowDecorations(guint32 xid) const = 0;
 
   virtual void ShowDesktop() = 0;
 
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-11-12 12:20:38 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-05-07 13:13:46 +0000
@@ -592,18 +592,8 @@
 
   // compiz doesn't use the same method of tracking monitors as our toolkit
   // we need to make sure we properly associate with the right monitor
-  int current_monitor = -1;
-  auto monitors = UScreen::GetDefault()->GetMonitors();
-  int i = 0;
-  for (auto monitor : monitors)
-  {
-    if (monitor.x == output->x() && monitor.y == output->y())
-    {
-      current_monitor = i;
-      break;
-    }
-    i++;
-  }
+  auto const& uscreen = UScreen::GetDefault();
+  int current_monitor = uscreen->GetMonitorAtPosition(output->x(), output->y());
 
   if (!(launcher_controller_->IsOverlayOpen() && current_monitor == dash_monitor_)
       && panel_controller_->opacity() > 0.0f)
@@ -671,18 +661,8 @@
 
   // compiz doesn't use the same method of tracking monitors as our toolkit
   // we need to make sure we properly associate with the right monitor
-  int current_monitor = -1;
-  auto monitors = UScreen::GetDefault()->GetMonitors();
-  int i = 0;
-  for (auto monitor : monitors)
-  {
-    if (monitor.x == output->x() && monitor.y == output->y())
-    {
-      current_monitor = i;
-      break;
-    }
-    i++;
-  }
+  auto const& uscreen = UScreen::GetDefault();
+  int current_monitor = uscreen->GetMonitorAtPosition(output->x(), output->y());
 
   if (!(launcher_controller_->IsOverlayOpen() && current_monitor == dash_monitor_)
       && panel_controller_->opacity() > 0.0f)
@@ -2345,7 +2325,7 @@
   return "Unity";
 }
 
-bool isNuxWindow (CompWindow* value)
+bool isNuxWindow(CompWindow* value)
 {
   std::vector<Window> const& xwns = nux::XInputWindow::NativeHandleList();
   auto id = value->id();
@@ -2394,13 +2374,21 @@
    * fully covers the shell on its output. It does not include regular windows
    * stacked above the shell like DnD icons or Onboard etc.
    */
-  if (isNuxWindow(window))
+  if (G_UNLIKELY(is_nux_window_))
   {
     if (mask & PAINT_WINDOW_OCCLUSION_DETECTION_MASK)
     {
       uScreen->nuxRegion += window->geometry();
       uScreen->nuxRegion -= uScreen->fullscreenRegion;
     }
+
+    if (window->id() == screen->activeWindow() &&
+        !(mask & PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK))
+    {
+      if (!mask)
+        uScreen->paintPanelShadow(matrix);
+    }
+
     return false;  // Ensure nux windows are never painted by compiz
   }
   else if (mask & PAINT_WINDOW_OCCLUSION_DETECTION_MASK)
@@ -2483,8 +2471,7 @@
   if (uScreen->doShellRepaint &&
       !uScreen->forcePaintOnTop () &&
       window == uScreen->firstWindowAboveShell &&
-      !uScreen->fullscreenRegion.contains(window->geometry())
-     )
+      !uScreen->fullscreenRegion.contains(window->geometry()))
   {
 #ifdef USE_GLES
     uScreen->paintDisplay();
@@ -3154,6 +3141,7 @@
   , mMinimizeHandler()
   , mShowdesktopHandler(nullptr)
   , focusdesktop_handle_(0)
+  , is_nux_window_(isNuxWindow(window))
 {
   WindowInterface::setHandler(window);
   GLWindowInterface::setHandler(gWindow);
 
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-09-11 10:38:44 +0000
+++ plugins/unityshell/src/unityshell.h	2013-05-07 13:13:46 +0000
@@ -434,8 +434,8 @@
   unsigned int GetNoCoreInstanceMask ();
 
   compiz::WindowInputRemoverLock::Ptr GetInputRemover ();
-
   compiz::WindowInputRemoverLock::Weak input_remover_;
+  bool is_nux_window_;
 };
 
 
 
=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2012-07-26 13:12:26 +0000
+++ tests/test_launcher_controller.cpp	2013-05-07 13:13:46 +0000
@@ -111,6 +111,16 @@
   }
 }
 
+TEST_F(TestLauncherController, MirroredMultimonitorSingleLauncherOnExternalMonitor)
+{
+  // See lp bug 991637
+  lc.multiple_launchers = false;
+  uscreen.SetPrimary(1);
+
+  ASSERT_EQ(lc.launchers().size(), 1);
+  ASSERT_EQ(lc.launcher().monitor(), 0);
+}
+
 TEST_F(TestLauncherController, MultimonitorSwitchToMultipleLaunchers)
 {
   lc.multiple_launchers = false;
 
=== modified file 'tests/test_service_lens.c'
--- tests/test_service_lens.c	2011-12-08 08:48:10 +0000
+++ tests/test_service_lens.c	2013-05-07 13:13:46 +0000
@@ -8,7 +8,6 @@
 static void add_filters(ServiceLens *self);
 static void on_search_changed(UnityScope* scope, UnityLensSearch *lens_search, UnitySearchType search_type, GCancellable *canc, ServiceLens* self);
 static UnityActivationResponse* on_activate_uri(UnityScope* scope, const char* uri, ServiceLens* self);
-static UnityPreview* on_preview_uri(UnityScope* scope, const char* uri, ServiceLens *self);
 
 struct _ServiceLensPrivate
 {
@@ -59,8 +58,6 @@
                    G_CALLBACK(on_search_changed), self);
   g_signal_connect(priv->scope, "activate-uri",
                    G_CALLBACK(on_activate_uri), self);
-  g_signal_connect(priv->scope, "preview-uri",
-                   G_CALLBACK(on_preview_uri), self);
 
   /* Get ready to export and export */
   unity_lens_add_local_scope(priv->lens, priv->scope);
@@ -183,18 +180,6 @@
   return unity_activation_response_new(UNITY_HANDLED_TYPE_HIDE_DASH, "");
 }
 
-static UnityPreview*
-on_preview_uri(UnityScope* scope, const char* uri, ServiceLens *self)
-{
-  gchar *genres[] = {"awesome"};
-  return (UnityPreview*)unity_track_preview_new(1, "Animus Vox",
-                                                "The Glitch Mob", "Drink The Sea", 
-                                                404, genres, 1,
-                                                "file://music/the/track", "Play",
-                                                "", "play://music/the/track",
-                                                "preview://music/the/track", "pause://music/the/track");
-}
-
 ServiceLens*
 service_lens_new()
 {