Merge lp:~unity-team/unity/x-sru3 into lp:unity/7.4

[Marco Trevisan (Treviño)]

Releasing Unity Xenial SRU3.

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-05-14 23:01:37 +0000
+++ CMakeLists.txt	2016-08-01 13:05:54 +0000
@@ -425,3 +425,9 @@
          ADDITIONAL_MAKE_CLEAN_FILES api-doc)
 
 endif (DOXYGEN_FOUND STREQUAL "YES")
+
+#
+# Upstart
+#
+configure_file(unity7.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity7.conf)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity7.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-07-15 10:14:41 +0000
+++ debian/changelog	2016-08-01 13:05:54 +0000
@@ -1,3 +1,38 @@
+unity (7.4.0+16.04.20160715-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Andrea Azzarone ]
+  * FileManagerLauncherIcon: Don't trust the Quirk::VISIBLE in the ctor.
+    (LP: #1599133)
+  * [TrashLauncherIcon] Create GFileMonitor in an idle to avoid blocking
+    calls. (LP: #1602720)
+  * [LockSceen] Remove numlock warning. (LP: #1526322)
+  * Make sure initiate and terminate callbacks are not empty before
+    calling them. (LP: #1605012)
+  * Properly destroy close_button_ to properly disconnect lambda. (LP:
+    #1605010)
+  * Use the standard notification-device-eject in the "device eject"
+    notification. This allows us to scale it properly on high-dpi
+    setups. (LP: #1605231)
+  * Add tools to enforce unityshell plugin for the current profile and
+    add "move" and "resize" plugins as requirements. (LP: #1506023, LP:
+    #1605007, LP: #1604657)
+
+  [ Marco Trevisan (Treviño) ]
+  * Unity script: use result from unity_support_test to check the right
+    COMPIZ_CONFIG_PROFILE to use (LP: #1602377)
+  * LockScreenAcceleratorController: ensure callbacks are valid before
+    calling them (LP: #1605012)
+
+  [ Eleni Maria Stea ]
+  * DecoratedWindow: Added shadows for shaped windows (LP: 1608418)
+
+  [ Marco Trevisan (Treviño) ]
+  * DecoratedWindow: Cleanup shadows for shaped windows, reduce
+    recomputation (LP: #1608418)
+  * UnityWindowView: don't try to deference close_button_ if its' null
+
+ -- Andrea Azzarone <[e-mail]>  Mon, 01 Aug 2016 10:34:14 +0200
+
 unity (7.4.0+16.04.20160715-0ubuntu1) xenial; urgency=medium
 
   [ Eleni Maria Stea ]
 
=== modified file 'debian/control'
--- debian/control	2016-03-21 15:38:17 +0000
+++ debian/control	2016-08-01 13:05:54 +0000
@@ -18,6 +18,7 @@
                libbamf3-dev (>= 0.5.3~bzr0),
                libboost-dev,
                libcairo2-dev,
+               libcompizconfig0-dev,
                libdbus-1-dev,
                libdbusmenu-glib-dev (>= 0.3.91),
                libdee-dev (>= 1.2.6),
 
=== modified file 'debian/libunity-core-6.0-9.install'
--- debian/libunity-core-6.0-9.install	2016-02-09 01:26:22 +0000
+++ debian/libunity-core-6.0-9.install	2016-08-01 13:05:54 +0000
@@ -3,7 +3,7 @@
 usr/share/ccsm
 usr/share/gnome-control-center/
 usr/share/unity
+usr/share/upstart/sessions/unity7.conf
 debian/unity-crashdb.conf etc/apport/crashdb.conf.d/
 debian/source_unity.py usr/share/apport/package-hooks
-debian/unity7.conf usr/share/upstart/sessions
 tools/convert-files/* usr/lib/compiz/migration/
 
=== modified file 'debian/unity-services.install'
--- debian/unity-services.install	2016-02-09 01:26:22 +0000
+++ debian/unity-services.install	2016-08-01 13:05:54 +0000
@@ -1,3 +1,3 @@
 usr/lib/*/unity/*service
-usr/share/upstart
+usr/share/upstart/sessions/unity-panel-service*.conf
 usr/share/man/*/unity-panel-service.1
 
=== modified file 'debian/unity.install'
--- debian/unity.install	2016-02-09 01:26:22 +0000
+++ debian/unity.install	2016-08-01 13:05:54 +0000
@@ -1,6 +1,7 @@
 etc/pam.d
 usr/bin
 usr/lib/*/compiz/libunity*.so
+usr/lib/*/unity/unity-active-plugins-safety-check
 usr/share/man/*/unity.1
 usr/share/compiz
 usr/share/locale
 
=== modified file 'decorations/CMakeLists.txt'
--- decorations/CMakeLists.txt	2014-03-27 19:32:34 +0000
+++ decorations/CMakeLists.txt	2016-08-01 13:05:54 +0000
@@ -35,6 +35,7 @@
      DecorationsMenuDropdown.cpp
      DecorationsForceQuitDialog.cpp
      DecorationsDataPool.cpp
+     DecorationsShape.cpp
      )
 
 add_library (decorations-lib STATIC ${DECORATION_SOURCES})
 
=== modified file 'decorations/DecoratedWindow.cpp'
--- decorations/DecoratedWindow.cpp	2016-04-01 00:50:30 +0000
+++ decorations/DecoratedWindow.cpp	2016-08-01 13:05:54 +0000
@@ -38,6 +38,7 @@
 namespace
 {
 const std::string MENUS_PANEL_NAME = "WindowLIM";
+const int SHADOW_BLUR_MARGIN_FACTOR = 2;
 }
 
 Window::Impl::Impl(Window* parent, CompWindow* win)
@@ -492,6 +493,12 @@
   return deco_elements_ & cu::DecorationElement::SHADOW;
 }
 
+bool Window::Impl::ShapedShadowDecorated() const
+{
+  return deco_elements_ & cu::DecorationElement::SHADOW &&
+         deco_elements_ & cu::DecorationElement::SHAPED;
+}
+
 bool Window::Impl::FullyDecorated() const
 {
   return deco_elements_ & cu::DecorationElement::BORDER;
@@ -504,6 +511,14 @@
 
 GLTexture* Window::Impl::ShadowTexture() const
 {
+  if (shaped_shadow_pixmap_)
+    return shaped_shadow_pixmap_->texture();
+
+  return SharedShadowTexture();
+}
+
+GLTexture* Window::Impl::SharedShadowTexture() const
+{
   auto const& mi = manager_->impl_;
   if (active() || parent_->scaled())
     return mi->active_shadow_pixmap_->texture();
@@ -569,10 +584,22 @@
     if (!last_shadow_rect_.isEmpty())
       last_shadow_rect_.setGeometry(0, 0, 0, 0);
 
-    return;
-  }
+    shaped_shadow_pixmap_.reset();
+  }
+  else if (deco_elements_ & cu::DecorationElement::SHAPED)
+  {
+    ComputeShapedShadowQuad();
+  }
+  else
+  {
+    shaped_shadow_pixmap_.reset();
+    ComputeGenericShadowQuads();
+  }
+}
 
-  const auto* texture = ShadowTexture();
+void Window::Impl::ComputeGenericShadowQuads()
+{
+  const auto* texture = SharedShadowTexture();
 
   if (!texture || !texture->width() || !texture->height())
     return;
@@ -676,6 +703,68 @@
   }
 }
 
+cu::PixmapTexture::Ptr Window::Impl::BuildShapedShadowTexture(nux::Size const& size, unsigned radius, nux::Color const& color, Shape const& shape) {
+  nux::CairoGraphics img(CAIRO_FORMAT_ARGB32, size.width, size.height);
+  auto* img_ctx = img.GetInternalContext();
+
+  for (auto const& rect : shape.GetRectangles())
+  {
+    cairo_rectangle(img_ctx, rect.x + radius * SHADOW_BLUR_MARGIN_FACTOR - shape.XOffset(), rect.y + radius * SHADOW_BLUR_MARGIN_FACTOR - shape.YOffset(), rect.width, rect.height);
+    cairo_set_source_rgba(img_ctx, color.red, color.green, color.blue, color.alpha);
+    cairo_fill(img_ctx);
+  }
+
+  img.BlurSurface(radius);
+
+  cu::CairoContext shadow_ctx(size.width, size.height);
+  cairo_set_source_surface(shadow_ctx, img.GetSurface(), 0, 0);
+  cairo_paint(shadow_ctx);
+
+  return shadow_ctx;
+}
+
+void Window::Impl::ComputeShapedShadowQuad()
+{
+  nux::Color color = active() ? manager_->active_shadow_color() : manager_->inactive_shadow_color();
+  unsigned int radius = active() ? manager_->active_shadow_radius() : manager_->inactive_shadow_radius();
+
+  Shape shape(win_->id());
+  auto const& border = win_->borderRect();
+  auto const& shadow_offset = manager_->shadow_offset();
+
+  // Ideally it would be shape.getWidth + radius * 2 but Cairographics::BlurSurface
+  // isn't bounded by the radius and we need to compensate by using a larger texture.
+  int width = shape.Width() + radius * 2 * SHADOW_BLUR_MARGIN_FACTOR;
+  int height = shape.Height() + radius * 2 * SHADOW_BLUR_MARGIN_FACTOR;
+
+  if (width != last_shadow_rect_.width() || height != last_shadow_rect_.height())
+    shaped_shadow_pixmap_ = BuildShapedShadowTexture({width, height}, radius, color, shape);
+
+  const auto* texture = shaped_shadow_pixmap_->texture();
+
+  if (!texture || !texture->width() || !texture->height())
+    return;
+
+  int x = border.x() + shadow_offset.x - radius * 2 + shape.XOffset();
+  int y = border.y() + shadow_offset.y - radius * 2 + shape.YOffset();
+
+  auto* quad = &shadow_quads_[Quads::Pos(0)];
+  quad->box.setGeometry(x, y, width, height);
+  quad->matrix = texture->matrix();
+  quad->matrix.x0 = -COMP_TEX_COORD_X(quad->matrix, quad->box.x1());
+  quad->matrix.y0 = -COMP_TEX_COORD_Y(quad->matrix, quad->box.y1());
+
+  CompRect shaped_shadow_rect(x, y, width, height);
+  if (shaped_shadow_rect != last_shadow_rect_)
+  {
+    auto const& win_region = win_->region();
+    quad->region = CompRegion(quad->box) - win_region;
+
+    last_shadow_rect_ = shaped_shadow_rect;
+    win_->updateWindowOutputExtents();
+  }
+}
+
 void Window::Impl::Paint(GLMatrix const& transformation,
                          GLWindowPaintAttrib const& attrib,
                          CompRegion const& region, unsigned mask)
@@ -714,14 +803,18 @@
 
   glwin_->vertexBuffer()->begin();
 
-  for (unsigned i = 0; i < shadow_quads_.size(); ++i)
+  unsigned int num_quads = ShapedShadowDecorated() ? 1 : shadow_quads_.size();
+  for (unsigned int i = 0; i < num_quads; ++i)
   {
     auto& quad = shadow_quads_[Quads::Pos(i)];
     glwin_->glAddGeometry(quad.matrices, quad.region, clip_region);
   }
 
   if (glwin_->vertexBuffer()->end())
-    glwin_->glDrawTexture(ShadowTexture(), transformation, attrib, mask);
+  {
+    if (GLTexture* texture = ShadowTexture())
+      glwin_->glDrawTexture(texture, transformation, attrib, mask);
+  }
 
   for (auto const& dtex : bg_textures_)
   {
@@ -746,6 +839,9 @@
 
 void Window::Impl::RedrawDecorations()
 {
+  if (!win_->isMapped())
+    return;
+
   dirty_geo_ = true;
   cwin_->damageOutputExtents();
 }
 
=== modified file 'decorations/DecoratedWindow.h'
--- decorations/DecoratedWindow.h	2015-08-07 18:54:07 +0000
+++ decorations/DecoratedWindow.h	2016-08-01 13:05:54 +0000
@@ -21,6 +21,7 @@
 #define UNITY_DECORATED_WINDOW
 
 #include "Introspectable.h"
+#include <NuxCore/Property.h>
 #include <memory>
 
 class CompRegion;
 
=== modified file 'decorations/DecorationsManager.cpp'
--- decorations/DecorationsManager.cpp	2016-03-09 17:28:36 +0000
+++ decorations/DecorationsManager.cpp	2016-08-01 13:05:54 +0000
@@ -20,9 +20,9 @@
 #include "DecorationsPriv.h"
 
 #include <core/atoms.h>
-#include <NuxGraphics/CairoGraphics.h>
 #include <UnityCore/DBusIndicators.h>
 #include <X11/Xatom.h>
+
 #include "WindowManager.h"
 
 namespace unity
 
=== modified file 'decorations/DecorationsPriv.h'
--- decorations/DecorationsPriv.h	2016-04-01 00:50:30 +0000
+++ decorations/DecorationsPriv.h	2016-08-01 13:05:54 +0000
@@ -23,6 +23,7 @@
 #include <unordered_map>
 #include <NuxCore/NuxCore.h>
 #include <NuxCore/Rect.h>
+#include <NuxGraphics/CairoGraphics.h>
 #include <UnityCore/ConnectionManager.h>
 #include <UnityCore/Indicators.h>
 #include <core/core.h>
@@ -30,6 +31,7 @@
 #include <composite/composite.h>
 #include <X11/extensions/shape.h>
 
+#include "DecorationsShape.h"
 #include "DecorationsDataPool.h"
 #include "DecorationsManager.h"
 #include "DecorationsInputMixer.h"
@@ -88,6 +90,7 @@
   bool IsMaximized() const;
   bool FullyDecorated() const;
   bool ShadowDecorated() const;
+  bool ShapedShadowDecorated() const;
   void RedrawDecorations();
   void Damage();
   void SetupAppMenu();
@@ -117,14 +120,18 @@
   void SyncMenusGeometries() const;
   bool ShouldBeDecorated() const;
   GLTexture* ShadowTexture() const;
+  GLTexture* SharedShadowTexture() const;
   unsigned ShadowRadius() const;
   std::string const& GetMenusPanelID() const;
 
   void ComputeShadowQuads();
+  void ComputeGenericShadowQuads();
+  void ComputeShapedShadowQuad();
   void UpdateDecorationTextures();
   void UpdateWindowEdgesGeo();
   void UpdateForceQuitDialogPosition();
   void RenderDecorationTexture(Side, nux::Geometry const&);
+  cu::PixmapTexture::Ptr BuildShapedShadowTexture(nux::Size const&, unsigned radius, nux::Color const&, Shape const&);
   void Paint(GLMatrix const&, GLWindowPaintAttrib const&, CompRegion const&, unsigned mask);
   void Draw(GLMatrix const&, GLWindowPaintAttrib const&, CompRegion const&, unsigned mask);
 
@@ -155,6 +162,7 @@
   std::string last_title_;
   std::string panel_id_;
   std::vector<cu::SimpleTextureQuad> bg_textures_;
+  cu::PixmapTexture::Ptr shaped_shadow_pixmap_;
   std::shared_ptr<ForceQuitDialog> force_quit_;
   InputMixer::Ptr input_mixer_;
   Layout::Ptr top_layout_;
 
=== added file 'decorations/DecorationsShape.cpp'
--- decorations/DecorationsShape.cpp	1970-01-01 00:00:00 +0000
+++ decorations/DecorationsShape.cpp	2016-08-01 13:05:54 +0000
@@ -0,0 +1,107 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2016 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: Eleni Maria Stea <[e-mail]>
+ */
+
+#include "DecorationsShape.h"
+
+#include <core/core.h>
+#include <NuxCore/Logger.h>
+#include <X11/extensions/shape.h>
+
+namespace unity
+{
+namespace decoration
+{
+namespace
+{
+DECLARE_LOGGER(logger, "unity.decoration.shape");
+}
+
+Shape::Shape(Window xid)
+{
+  Bool buse, cuse;
+  int bx, by, cx, cy;
+  unsigned int bw, bh, cw, ch;
+  Display *dpy = screen->dpy();
+
+  XShapeQueryExtents(dpy, xid, &buse, &bx, &by, &bw, &bh, &cuse, &cx, &cy, &cw, &ch);
+
+  int kind;
+
+  if (buse)
+  {
+    width_ = bw;
+    height_ = bh;
+    xoffs_ = bx;
+    yoffs_ = by;
+    kind = ShapeBounding;
+  }
+  else if (cuse)
+  {
+    width_ = cw;
+    height_ = ch;
+    xoffs_ = cx;
+    yoffs_ = cy;
+    kind = ShapeClip;
+  }
+  else
+  {
+    LOG_ERROR(logger) << "XShapeQueryExtend returned no extents";
+    return;
+  }
+
+  int rect_count, rect_order;
+  std::unique_ptr<XRectangle[], int(*)(void*)> rectangles(XShapeGetRectangles(dpy, xid, kind, &rect_count, &rect_order), XFree);
+
+  if (!rectangles)
+  {
+    LOG_ERROR(logger) << "Failed to get shape rectangles";
+    return;
+  }
+
+  for (int i = 0; i < rect_count; ++i)
+    rectangles_.push_back(rectangles[i]);
+}
+
+std::vector<XRectangle> const& Shape::GetRectangles() const
+{
+  return rectangles_;
+}
+
+int Shape::Width() const
+{
+  return width_;
+}
+
+int Shape::Height() const
+{
+  return height_;
+}
+
+int Shape::XOffset() const
+{
+  return xoffs_;
+}
+
+int Shape::YOffset() const
+{
+  return yoffs_;
+}
+
+} // decoration namespace
+} // unity namespace
 
=== added file 'decorations/DecorationsShape.h'
--- decorations/DecorationsShape.h	1970-01-01 00:00:00 +0000
+++ decorations/DecorationsShape.h	2016-08-01 13:05:54 +0000
@@ -0,0 +1,54 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2016 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: Eleni Maria Stea <[e-mail]>
+ */
+
+#ifndef DECORATIONS_SHAPE_H_
+#define DECORATIONS_SHAPE_H_
+
+#include <X11/Xlib.h>
+#include <vector>
+
+namespace unity
+{
+namespace decoration
+{
+class Shape
+{
+public:
+  Shape(Window);
+
+  int Width() const;
+  int Height() const;
+  int XOffset() const;
+  int YOffset() const;
+
+  std::vector<XRectangle> const& GetRectangles() const;
+
+private:
+  int width_;
+  int height_;
+  int xoffs_;
+  int yoffs_;
+
+  std::vector<XRectangle> rectangles_;
+};
+
+} // decoration namespace
+} // unity namespace
+
+#endif //DECORATIONS_SHAPE_H_
 
=== modified file 'launcher/DeviceNotificationDisplay.h'
--- launcher/DeviceNotificationDisplay.h	2012-08-22 09:03:25 +0000
+++ launcher/DeviceNotificationDisplay.h	2016-08-01 13:05:54 +0000
@@ -36,7 +36,7 @@
 
   virtual ~DeviceNotificationDisplay() {}
 
-  virtual void Display(std::string const& icon_name, std::string const& volume_name) = 0;
+  virtual void Display(std::string const& volume_name) = 0;
 };
 
 }
 
=== modified file 'launcher/DeviceNotificationDisplayImp.cpp'
--- launcher/DeviceNotificationDisplayImp.cpp	2015-04-22 23:54:26 +0000
+++ launcher/DeviceNotificationDisplayImp.cpp	2016-08-01 13:05:54 +0000
@@ -20,49 +20,27 @@
 #include "config.h"
 #include <glib/gi18n-lib.h>
 #include <libnotify/notify.h>
-#include <sigc++/sigc++.h>
 #include <UnityCore/GLibWrapper.h>
 
 #include "DeviceNotificationDisplayImp.h"
-#include "unity-shared/IconLoader.h"
 
 namespace unity
 {
 namespace launcher
 {
 
-namespace
-{
-const unsigned icon_size = 48;
-}
-
 //
 // Start private implementation
 //
 class DeviceNotificationDisplayImp::Impl
 {
 public:
-  void Show(std::string const& icon_name, std::string const& volume_name)
-  {
-    IconLoader::GetDefault().LoadFromGIconString(icon_name, -1, icon_size,
-                                                 sigc::bind(sigc::mem_fun(this, &Impl::ShowNotificationWhenIconIsReady), volume_name));
-  }
-
-  void ShowNotificationWhenIconIsReady(std::string const& icon_name,
-                                       int max_width,
-                                       int max_height,
-                                       glib::Object<GdkPixbuf> const& pixbuf,
-                                       std::string const& volume_name)
+  void Show(std::string const& volume_name)
   {
     glib::Object<NotifyNotification> notification(notify_notification_new(volume_name.c_str(),
                                                                          _("The drive has been successfully ejected"),
-                                                                          nullptr));
-
+                                                                          "notification-device-eject"));
     notify_notification_set_hint(notification, "x-canonical-private-synchronous", g_variant_new_boolean(TRUE));
-
-    if (pixbuf)
-      notify_notification_set_image_from_pixbuf(notification, pixbuf);
-
     notify_notification_show(notification, nullptr);
   }
 };
@@ -78,9 +56,9 @@
 DeviceNotificationDisplayImp::~DeviceNotificationDisplayImp()
 {}
 
-void DeviceNotificationDisplayImp::Display(std::string const& icon_name, std::string const& volume_name)
+void DeviceNotificationDisplayImp::Display(std::string const& volume_name)
 {
-  pimpl->Show(icon_name, volume_name);
+  pimpl->Show(volume_name);
 }
 
 }
 
=== modified file 'launcher/DeviceNotificationDisplayImp.h'
--- launcher/DeviceNotificationDisplayImp.h	2012-08-22 09:03:25 +0000
+++ launcher/DeviceNotificationDisplayImp.h	2016-08-01 13:05:54 +0000
@@ -33,7 +33,7 @@
   DeviceNotificationDisplayImp();
   virtual ~DeviceNotificationDisplayImp();
 
-  virtual void Display(std::string const& icon_name, std::string const& volume_name);
+  virtual void Display(std::string const& volume_name);
 
 private:
   class Impl;
 
=== modified file 'launcher/FileManagerLauncherIcon.cpp'
--- launcher/FileManagerLauncherIcon.cpp	2016-07-05 10:21:45 +0000
+++ launcher/FileManagerLauncherIcon.cpp	2016-08-01 13:05:54 +0000
@@ -46,6 +46,9 @@
   // We disconnect from ApplicationLauncherIcon app signals, as we manage them manually
   signals_conn_.Clear();
 
+  SetQuirk(Quirk::VISIBLE, false);
+  SkipQuirkAnimation(Quirk::VISIBLE);
+
   signals_conn_.Add(app_->desktop_file.changed.connect([this](std::string const& desktop_file) {
     LOG_DEBUG(logger) << tooltip_text() << " desktop_file now " << desktop_file;
     UpdateDesktopFile();
@@ -74,7 +77,6 @@
       _source_manager.Remove(ICON_REMOVE_TIMEOUT);
   }));
 
-
   UpdateStorageWindows();
 }
 
@@ -120,7 +122,7 @@
 
   for (auto const& app_win : ApplicationLauncherIcon::GetManagedWindows())
   {
-    if (IsLocationManaged(file_manager_->LocationForWindow(app_win)))
+    if (WindowManager::Default().IsWindowMapped(app_win->window_id()) && IsLocationManaged(file_manager_->LocationForWindow(app_win)))
       fm_windows.push_back(app_win);
   }
 
 
=== modified file 'launcher/TrashLauncherIcon.cpp'
--- launcher/TrashLauncherIcon.cpp	2015-12-11 15:15:47 +0000
+++ launcher/TrashLauncherIcon.cpp	2016-08-01 13:05:54 +0000
@@ -55,23 +55,27 @@
   SkipQuirkAnimation(Quirk::VISIBLE);
   SetShortcut('t');
 
-  glib::Object<GFile> location(g_file_new_for_uri(TRASH_URI.c_str()));
-
-  glib::Error err;
-  trash_monitor_ = g_file_monitor_directory(location, G_FILE_MONITOR_NONE, cancellable_, &err);
-  g_file_monitor_set_rate_limit(trash_monitor_, 1000);
-
-  if (err)
-  {
-    LOG_ERROR(logger) << "Could not create file monitor for trash uri: " << err;
-  }
-  else
-  {
-    glib_signals_.Add<void, GFileMonitor*, GFile*, GFile*, GFileMonitorEvent>(trash_monitor_, "changed",
-    [this] (GFileMonitor*, GFile*, GFile*, GFileMonitorEvent) {
-      UpdateTrashIcon();
-    });
-  }
+  _source_manager.AddIdle([this]{
+    glib::Object<GFile> location(g_file_new_for_uri(TRASH_URI.c_str()));
+
+    glib::Error err;
+    trash_monitor_ = g_file_monitor_directory(location, G_FILE_MONITOR_NONE, cancellable_, &err);
+    g_file_monitor_set_rate_limit(trash_monitor_, 1000);
+
+    if (err)
+    {
+      LOG_ERROR(logger) << "Could not create file monitor for trash uri: " << err;
+    }
+    else
+    {
+      glib_signals_.Add<void, GFileMonitor*, GFile*, GFile*, GFileMonitorEvent>(trash_monitor_, "changed",
+      [this] (GFileMonitor*, GFile*, GFile*, GFileMonitorEvent) {
+        UpdateTrashIcon();
+      });
+    }
+
+    return false;
+  });
 
   UpdateTrashIcon();
   UpdateStorageWindows();
 
=== modified file 'launcher/VolumeLauncherIcon.cpp'
--- launcher/VolumeLauncherIcon.cpp	2016-02-25 13:42:10 +0000
+++ launcher/VolumeLauncherIcon.cpp	2016-08-01 13:05:54 +0000
@@ -108,7 +108,7 @@
 
     auto conn = std::make_shared<sigc::connection>();
     *conn = volume_->ejected.connect([this, conn] {
-      notification_->Display(volume_->GetIconName(), volume_->GetName());
+      notification_->Display(volume_->GetName());
       conn->disconnect();
     });
     connections_.Add(*conn);
 
=== modified file 'lockscreen/LockScreenAcceleratorController.cpp'
--- lockscreen/LockScreenAcceleratorController.cpp	2016-07-05 10:22:08 +0000
+++ lockscreen/LockScreenAcceleratorController.cpp	2016-08-01 13:05:54 +0000
@@ -194,10 +194,20 @@
   CompOption::Vector options;
 
   if (action.state() & CompAction::StateInitKey)
-    action.initiate()(&action, 0, options);
+  {
+    auto const& initiate_cb = action.initiate();
+
+    if (!initiate_cb.empty())
+      initiate_cb(&action, 0, options);
+  }
 
   if (action.state() & CompAction::StateTermKey)
-    action.terminate()(&action, CompAction::StateTermTapped, options);
+  {
+    auto const& terminate_cb = action.terminate();
+
+    if (!terminate_cb.empty())
+      terminate_cb(&action, CompAction::StateTermTapped, options);
+  }
 }
 
 Accelerators::Ptr const& AcceleratorController::GetAccelerators() const
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2016-07-05 10:22:42 +0000
+++ plugins/unityshell/src/unityshell.cpp	2016-08-01 13:05:54 +0000
@@ -3013,9 +3013,9 @@
       wAttrib.opacity = 0.0;
       int old_index = gWindow->glPaintGetCurrentIndex();
       gWindow->glPaintSetCurrentIndex(MAXSHORT);
+      deco_win_->Paint(matrix, wAttrib, region, mask);
       bool ret = gWindow->glPaint(wAttrib, matrix, region, mask);
       gWindow->glPaintSetCurrentIndex(old_index);
-      deco_win_->Paint(matrix, wAttrib, region, mask);
       return ret;
     }
   }
@@ -3357,6 +3357,7 @@
       PluginAdapter::Default().UpdateShowDesktopState();
       break;
     case CompWindowNotifyBeforeDestroy:
+      deco_win_->Undecorate();
       being_destroyed.emit();
       break;
     case CompWindowNotifyMinimize:
 
=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2016-04-05 13:23:27 +0000
+++ plugins/unityshell/unityshell.xml.in	2016-08-01 13:05:54 +0000
@@ -39,6 +39,8 @@
                 <plugin>compiztoolbox</plugin>
                 <plugin>scale</plugin>
                 <plugin>expo</plugin>
+                <plugin>move</plugin>
+                <plugin>resize</plugin>
             </requirement>
             <conflict>
                 <plugin>decor</plugin>
 
=== modified file 'tests/test_mock_devices.h'
--- tests/test_mock_devices.h	2016-01-24 14:35:49 +0000
+++ tests/test_mock_devices.h	2016-08-01 13:05:54 +0000
@@ -101,7 +101,7 @@
   typedef std::shared_ptr<MockDeviceNotificationDisplay> Ptr;
   typedef testing::NiceMock<MockDeviceNotificationDisplay> Nice;
 
-  MOCK_METHOD2(Display, void(std::string const& icon_name, std::string const& volume_name));
+  MOCK_METHOD1(Display, void(std::string const& volume_name));
 };
 
 } // anonymous namespace
 
=== modified file 'tests/test_unity_window_view.cpp'
--- tests/test_unity_window_view.cpp	2016-03-31 02:03:55 +0000
+++ tests/test_unity_window_view.cpp	2016-08-01 13:05:54 +0000
@@ -82,12 +82,18 @@
   view.closable = true;
   ASSERT_NE(view.close_button_, nullptr);
 
+  auto weak_ptr = nux::ObjectWeakPtr<IconTexture>(view.close_button_);
+  ASSERT_TRUE(weak_ptr.IsValid());
+
   EXPECT_EQ(view.close_button_->texture(), view.style()->GetTexture(view.scale, WindowTextureType::CLOSE_ICON));
   EXPECT_EQ(view.close_button_->GetParentObject(), &view);
 
   int padding = view.style()->GetCloseButtonPadding().CP(view.scale);
   EXPECT_EQ(view.close_button_->GetBaseX(), padding);
   EXPECT_EQ(view.close_button_->GetBaseY(), padding);
+
+  view.closable = false;
+  ASSERT_FALSE(weak_ptr.IsValid());
 }
 
 TEST_F(TestUnityWindowView, CloseButtonStates)
 
=== modified file 'tests/test_volume_launcher_icon.cpp'
--- tests/test_volume_launcher_icon.cpp	2016-01-24 14:35:49 +0000
+++ tests/test_volume_launcher_icon.cpp	2016-08-01 13:05:54 +0000
@@ -481,7 +481,7 @@
   auto menuitem = GetMenuItemAtIndex(5);
 
   EXPECT_CALL(*volume_, Eject());
-  EXPECT_CALL(*notifications_, Display(volume_->GetIconName(), volume_->GetName()));
+  EXPECT_CALL(*notifications_, Display(volume_->GetName()));
 
   ASSERT_STREQ(dbusmenu_menuitem_property_get(menuitem, DBUSMENU_MENUITEM_PROP_LABEL), "Eject");
   EXPECT_TRUE(dbusmenu_menuitem_property_get_bool(menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE));
@@ -573,7 +573,7 @@
     .WillRepeatedly(Return(true));
 
   EXPECT_CALL(*volume_, Eject());
-  EXPECT_CALL(*notifications_, Display(volume_->GetIconName(), volume_->GetName()));
+  EXPECT_CALL(*notifications_, Display(volume_->GetName()));
   icon_->EjectAndShowNotification();
 }
 
 
=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2016-02-09 01:26:22 +0000
+++ tools/CMakeLists.txt	2016-08-01 13:05:54 +0000
@@ -6,3 +6,25 @@
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/unity.cmake ${CMAKE_BINARY_DIR}/bin/unity)
 install(FILES ${CMAKE_BINARY_DIR}/bin/unity PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
 GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+#
+# unity-active-plugins-safety-check
+#
+pkg_check_modules(UAPSC_DEPS REQUIRED libcompizconfig)
+
+set(CFLAGS
+    ${UAPSC_DEPS_CFLAGS}
+    ${UAPSC_DEPS_CFLAGS_OTHER}
+    )
+
+string (REPLACE ";" " " CFLAGS "${CFLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CFLAGS}")
+
+set(LIBS ${UAPSC_DEPS_LIBRARIES})
+
+set(LIB_PATHS ${UAPSC_DEPS_LIBRARY_DIRS})
+link_directories(${LIB_PATHS})
+
+add_executable(unity-active-plugins-safety-check unity_active_plugins_safety_check.cpp)
+target_link_libraries(unity-active-plugins-safety-check ${LIBS})
+install(TARGETS unity-active-plugins-safety-check DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity/)
 
=== modified file 'tools/unity.cmake'
--- tools/unity.cmake	2016-04-08 18:13:40 +0000
+++ tools/unity.cmake	2016-08-01 13:05:54 +0000
@@ -59,6 +59,12 @@
 
     os.environ['COMPIZ_CONFIG_PROFILE'] = 'ubuntu'
 
+    try:
+      if subprocess.call('/usr/lib/nux/unity_support_test -f'.split()) > 0:
+        os.environ['COMPIZ_CONFIG_PROFILE'] = 'ubuntu-lowgfx'
+    except:
+      pass
+
     if not 'DISPLAY' in os.environ:
         # take an optimistic chance and warn about it :)
         print("WARNING: no DISPLAY variable set, setting it to :0")
 
=== added file 'tools/unity_active_plugins_safety_check.cpp'
--- tools/unity_active_plugins_safety_check.cpp	1970-01-01 00:00:00 +0000
+++ tools/unity_active_plugins_safety_check.cpp	2016-08-01 13:05:54 +0000
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2016 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: Andrea Azzarone <[e-mail]>
+ */
+
+#include <ccs.h>
+#include <gio/gio.h>
+
+#include <iostream>
+#include <string>
+
+extern const CCSInterfaceTable ccsDefaultInterfaceTable;
+
+void PluginSetActiveWithDeps(CCSContext* context, std::string const& plugin_name)
+{
+  if (plugin_name.empty())
+    return;
+
+  auto plugin = ccsFindPlugin(context, plugin_name.c_str());
+
+  if (!plugin)
+    return;
+
+  auto reqs = ccsPluginGetRequiresPlugins(plugin);
+  for (auto req = reqs; req; req = req->next)
+  {
+    if (req->data && req->data->value)
+    {
+      std::string name = req->data->value;
+      PluginSetActiveWithDeps(context, name.c_str());
+    }
+  }
+
+  if (!ccsPluginIsActive(context, plugin_name.c_str())) {
+    std::cout << "Setting plugin '" << plugin_name << "' to active" << std::endl;
+    ccsPluginSetActive(plugin, true);
+  }
+
+  auto conflicts = ccsPluginGetConflictPlugins(plugin);
+  for (auto con = conflicts; con; con = con->next)
+  {
+    if (con->data && con->data->value)
+    {
+      std::string name = con->data->value;
+      auto plugin = ccsFindPlugin(context, name.c_str());
+
+      if (ccsPluginIsActive(context, name.c_str()))
+      {
+        std::cout << "Setting plugin '" << name << "' to non-active" << std::endl;
+        ccsPluginSetActive(plugin, false);
+      }
+    }
+  }
+}
+
+int main()
+{
+  auto context = ccsContextNew (0, &ccsDefaultInterfaceTable);
+
+  if (!context)
+    return -1;
+
+  PluginSetActiveWithDeps(context, "unityshell");
+
+  ccsWriteChangedSettings(context);
+  g_settings_sync();
+  ccsFreeContext(context);
+
+  return 0;
+}
 
=== modified file 'unity-shared/CompizUtils.cpp'
--- unity-shared/CompizUtils.cpp	2015-11-02 14:58:01 +0000
+++ unity-shared/CompizUtils.cpp	2016-08-01 13:05:54 +0000
@@ -211,11 +211,10 @@
     }
   }
 
-  if (region.boundingRect() != win->geometry()) // Shaped windows
-    return elements;
+  elements |= DecorationElement::SHADOW;
 
-  if (rectangular)
-    elements |= DecorationElement::SHADOW;
+  if (!rectangular)
+    elements |= DecorationElement::SHAPED;
 
   if (!win->overrideRedirect() &&
       (win->type() & DECORABLE_WINDOW_TYPES) &&
 
=== modified file 'unity-shared/CompizUtils.h'
--- unity-shared/CompizUtils.h	2015-11-02 14:58:01 +0000
+++ unity-shared/CompizUtils.h	2016-08-01 13:05:54 +0000
@@ -133,7 +133,8 @@
   NONE = 0,
   EDGE = (1 << 0),
   SHADOW = (1 << 1),
-  BORDER = (1 << 2),
+  SHAPED = (1 << 2),
+  BORDER = (1 << 3),
   FULL = EDGE|SHADOW|BORDER
 };
 }
 
=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2016-03-18 18:58:26 +0000
+++ unity-shared/PluginAdapter.cpp	2016-08-01 13:05:54 +0000
@@ -630,7 +630,7 @@
   CompWindow* window = m_Screen->findWindow(window_id);
   if (window)
     return window->mapNum () > 0;
-  return true;
+  return false;
 }
 
 bool PluginAdapter::IsWindowVisible(Window window_id) const
 
=== modified file 'unity-shared/TextInput.cpp'
--- unity-shared/TextInput.cpp	2016-03-31 05:57:11 +0000
+++ unity-shared/TextInput.cpp	2016-08-01 13:05:54 +0000
@@ -104,7 +104,6 @@
   , scale(1.0)
   , bg_layer_(new nux::ColorLayer(nux::Color(0xff595853), true))
   , caps_lock_on(false)
-  , num_lock_on(false)
   , last_width_(-1)
   , last_height_(-1)
 {
@@ -146,9 +145,8 @@
 
   // Caps lock warning
   warning_ = new IconTexture(LoadWarningIcon(DEFAULT_ICON_SIZE.CP(scale)));
-  warning_->SetVisible(caps_lock_on() || num_lock_on());
+  warning_->SetVisible(caps_lock_on());
   layout_->AddView(warning_, 0, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
-  num_lock_on.changed.connect(sigc::mem_fun(this, &TextInput::OnLockStateChanged));
   caps_lock_on.changed.connect(sigc::mem_fun(this, &TextInput::OnLockStateChanged));
 
   show_lock_warnings.changed.connect(sigc::hide(sigc::mem_fun(this, &TextInput::CheckLocks)));
@@ -249,7 +247,6 @@
 {
   GdkKeymap* keymap = gdk_keymap_get_default();
   caps_lock_on = gdk_keymap_get_caps_lock_state(keymap) ? true : false;
-  num_lock_on = gdk_keymap_get_num_lock_state(keymap) ? true : false;
 }
 
 void TextInput::OnLockStateChanged(bool)
@@ -260,8 +257,8 @@
     return;
   }
 
-  warning_->SetVisible(caps_lock_on() || num_lock_on());
-  warning_->SetOpacity((num_lock_on() && !caps_lock_on()) ? 0.3 : 1.0);
+  warning_->SetVisible(caps_lock_on());
+  warning_->SetOpacity(1.0);
   warning_tooltip_.Release();
   QueueRelayout();
   QueueDraw();
@@ -345,18 +342,10 @@
 
   pango_layout_set_height(layout, -1); //avoid wrap lines
 
-  if (caps_lock_on() && num_lock_on())
-  {
-    pango_layout_set_text(layout, _("Caps lock and Num lock are on"), -1);
-  }
-  else if (caps_lock_on())
+  if (caps_lock_on())
   {
     pango_layout_set_text(layout, _("Caps lock is on"), -1);
   }
-  else if (num_lock_on())
-  {
-    pango_layout_set_text(layout, _("Num lock is on"), -1);
-  }
 
   nux::Size extents;
   pango_layout_get_pixel_size(layout, &extents.width, &extents.height);
 
=== modified file 'unity-shared/TextInput.h'
--- unity-shared/TextInput.h	2016-03-31 05:57:11 +0000
+++ unity-shared/TextInput.h	2016-08-01 13:05:54 +0000
@@ -124,7 +124,6 @@
   SearchBarSpinner* spinner_;
 
   nux::Property<bool> caps_lock_on;
-  nux::Property<bool> num_lock_on;
   int last_width_;
   int last_height_;
 
 
=== modified file 'unity-shared/UnityWindowView.cpp'
--- unity-shared/UnityWindowView.cpp	2016-07-05 10:22:42 +0000
+++ unity-shared/UnityWindowView.cpp	2016-08-01 13:05:54 +0000
@@ -145,7 +145,12 @@
 {
   if (!closable)
   {
-    close_button_ = nullptr;
+    if (close_button_)
+    {
+      close_button_->UnParentObject();
+      close_button_ = nullptr;
+    }
+
     return;
   }
 
 
=== renamed file 'debian/unity7.conf' => 'unity7.conf.in'
--- debian/unity7.conf	2016-07-05 10:22:49 +0000
+++ unity7.conf.in	2016-08-01 13:05:54 +0000
@@ -21,6 +21,9 @@
 
   echo "Using compiz profile '$compiz_profile'"
   initctl set-env -g COMPIZ_CONFIG_PROFILE="$compiz_profile"
+  export COMPIZ_CONFIG_PROFILE="$compiz_profile"
+
+  ${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-active-plugins-safety-check
 end script
 
 respawn