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

[Marco Trevisan (Treviño)]

Releasing unity SRU1 for Xenial

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-05-14 23:01:37 +0000
+++ debian/changelog	2016-05-26 00:00:49 +0000
@@ -1,7 +1,35 @@
-unity (7.4.0-0ubuntu1) UNRELEASED; urgency=medium
+unity (7.4.0+16.04.20160526-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Marco Trevisan (Treviño) ]
   * Releasing Unity 7.4.0
 
+  [ Andrea Azzarone ]
+  * Properly remove SoftwareCenterLauncherIcon in case of failure. (LP:
+    #1553165)
+  * Update ExpoLauncherIcon in case the quicklist is used to switch vp.
+    (LP: #1525685)
+  * GnomeKeyGrabber: do not activate an action if it's a repeated one.
+    (LP: #1572241)
+  * Properly calculate array indexes to avoid crashes. (LP: #1570843)
+  * Fallback to "background" class in case no background is specified
+    for title bars and top panel. (LP: #1575527)
+  * Do not reset the shortcut for icons that have their own shortcut.
+    (LP: #1562847)
+
+  [ Marco Trevisan (Treviño) ]
+  * SwitcherView: close the mouse-selected application on middle-click
+    (LP: #1574689)
+  * UnityScreen, UnityWindow: cleanup a little the code, and ensure
+    overridden CompositeWindow functions get actually called
+  * SwitcherController: don't try to get a window from empty selections
+    (LP: #1580211)
+  * DashStyle: ensure LazyLoadTexture disconnects from signals on
+    destruction (LP: #1580212)
+
+  [ handsome_feng ]
+  * Change the x_offset of expo when launcher position changed. (LP:
+    #1562348, LP: #1573897)
+
  -- Marco Trevisan (Treviño) <[e-mail]>  Sun, 15 May 2016 01:00:09 +0200
 
 unity (7.4.0+16.04.20160415-0ubuntu1) xenial; urgency=medium

=== modified file 'launcher/ExpoLauncherIcon.cpp'
--- launcher/ExpoLauncherIcon.cpp	2015-11-20 11:35:08 +0000
+++ launcher/ExpoLauncherIcon.cpp	2016-05-26 00:00:49 +0000
@@ -127,8 +127,9 @@
         dbusmenu_menuitem_property_set_int(menu_item, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE, DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED);
       }
 
-      signals_.Add(new ItemSignal(menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, [h, v] (DbusmenuMenuitem*, int) {
+      signals_.Add(new ItemSignal(menu_item, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, [this, h, v] (DbusmenuMenuitem*, int) {
         WindowManager::Default().SetCurrentViewport({h, v});
+        UpdateIcon();
       }));
       result.push_back(menu_item);
     }

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2016-03-18 01:47:08 +0000
+++ launcher/LauncherController.cpp	2016-05-26 00:00:49 +0000
@@ -555,7 +555,7 @@
       icon->SetShortcut(std::to_string(shortcut % 10)[0]);
       ++shortcut;
     }
-    else
+    else if (isdigit(icon->GetShortcut()))
     {
       // reset shortcut
       icon->SetShortcut(0);

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2016-03-18 01:47:08 +0000
+++ launcher/LauncherIcon.cpp	2016-05-26 00:00:49 +0000
@@ -42,6 +42,8 @@
 #include <UnityCore/GLibWrapper.h>
 #include <UnityCore/Variant.h>
 
+#include <numeric>
+
 namespace unity
 {
 namespace launcher

=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
--- launcher/SoftwareCenterLauncherIcon.cpp	2016-03-18 01:47:08 +0000
+++ launcher/SoftwareCenterLauncherIcon.cpp	2016-05-26 00:00:49 +0000
@@ -133,7 +133,7 @@
   else
   {
     // failure condition, remove icon again
-    UnStick();
+    Remove();
   }
 
   aptdaemon_trans_.reset();

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2016-03-21 15:38:17 +0000
+++ launcher/SwitcherController.cpp	2016-05-26 00:00:49 +0000
@@ -453,10 +453,6 @@
   view_->background_color = WindowManager::Default().average_color();
   view_->monitor = obj_->monitor_;
   view_->hide_request.connect(sigc::mem_fun(this, &Controller::Impl::Hide));
-  view_->switcher_mouse_up.connect([this] (int icon_index, int button) {
-    if (button == 3)
-      InitiateDetail(true);
-  });
 
   view_->switcher_mouse_move.connect([this] (int icon_index) {
     if (icon_index >= 0)
@@ -690,7 +686,10 @@
       }
       else if (model_->SelectionIsActive())
       {
-        window = model_->SelectionWindows().front();
+        auto const& selection_windows = model_->SelectionWindows();
+
+        if (!selection_windows.empty())
+          window = selection_windows.front();
       }
     }
   }

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2016-03-21 15:38:17 +0000
+++ launcher/SwitcherView.cpp	2016-05-26 00:00:49 +0000
@@ -381,8 +381,6 @@
   int detail_icon_index = DetailIconIdexAt(mouse_pos.x, mouse_pos.y);
 
   last_detail_icon_selected_ = detail_icon_index;
-
-  switcher_mouse_down.emit(detail_icon_index, button);
 }
 
 void SwitcherView::HandleMouseDown(int x, int y, int button)
@@ -390,8 +388,6 @@
   int icon_index = IconIndexAt(x,y);
 
   last_icon_selected_ = icon_index;
-
-  switcher_mouse_down.emit(icon_index, button);
 }
 
 void SwitcherView::RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long /*key_flags*/)
@@ -413,8 +409,6 @@
   nux::Point const& mouse_pos = CalculateMouseMonitorOffset(x, y);
   int detail_icon_index = DetailIconIdexAt(mouse_pos.x, mouse_pos.y);
 
-  switcher_mouse_up.emit(detail_icon_index, button);
-
   if (button == 1)
   {
     if (detail_icon_index >= 0 && detail_icon_index == last_detail_icon_selected_)
@@ -437,14 +431,18 @@
 {
   int icon_index = IconIndexAt(x,y);
 
-  switcher_mouse_up.emit(icon_index, button);
-
-  if (button == 1)
+  if (button == 1 || button == 2 || button == 3)
   {
     if (icon_index >= 0 && icon_index == last_icon_selected_)
     {
       model_->Select(icon_index);
-      hide_request.emit(true);
+
+      if (button == 1)
+        hide_request.emit(true);
+      else if (button == 2)
+        switcher_close_current.emit();
+      else if (button == 3)
+        switcher_start_detail.emit();
     }
   }
 }

=== modified file 'launcher/SwitcherView.h'
--- launcher/SwitcherView.h	2015-11-02 18:28:31 +0000
+++ launcher/SwitcherView.h	2016-05-26 00:00:49 +0000
@@ -73,10 +73,6 @@
   int IconIndexAt(int x, int y) const;
   int DetailIconIdexAt(int x, int y) const;
 
-  /* void; int icon_index, int button*/
-  sigc::signal<void, int, int> switcher_mouse_down;
-  sigc::signal<void, int, int> switcher_mouse_up;
-
   /* void; int icon_index */
   sigc::signal<void, int> switcher_mouse_move;
 

=== modified file 'plugins/unityshell/src/WindowMinimizeSpeedController.cpp'
--- plugins/unityshell/src/WindowMinimizeSpeedController.cpp	2013-11-14 03:00:29 +0000
+++ plugins/unityshell/src/WindowMinimizeSpeedController.cpp	2016-05-26 00:00:49 +0000
@@ -19,6 +19,7 @@
  * not be able to re-use it if you want to use a different licence.
  */
 
+#include <cmath>
 #include <gio/gio.h>
 #include <NuxCore/Logger.h>
 

=== modified file 'plugins/unityshell/src/inputremover.cpp'
--- plugins/unityshell/src/inputremover.cpp	2016-03-09 17:25:16 +0000
+++ plugins/unityshell/src/inputremover.cpp	2016-05-26 00:00:49 +0000
@@ -354,7 +354,7 @@
 
   for (int i = 0; i < nInput; ++i)
   {
-    const unsigned int position = dataSize + (i * 4);
+    const unsigned int position = headerSize + (i * 4);
 
     data[position + 0] = input[i].x;
     data[position + 1] = input[i].y;

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2016-03-31 05:57:11 +0000
+++ plugins/unityshell/src/unityshell.cpp	2016-05-26 00:00:49 +0000
@@ -203,8 +203,7 @@
   , doShellRepaint(false)
   , didShellRepaint(false)
   , allowWindowPaint(false)
-  , _key_nav_mode_requested(false)
-  , _last_output(nullptr)
+  , last_output_(nullptr)
   , force_draw_countdown_(0)
   , firstWindowAboveShell(nullptr)
   , onboard_(nullptr)
@@ -215,12 +214,13 @@
   , first_menu_keypress_time_(0)
   , paint_panel_under_dash_(false)
   , scale_just_activated_(false)
-  , big_tick_(0)
   , screen_introspection_(screen)
   , ignore_redraw_request_(false)
   , dirty_helpers_on_this_frame_(false)
+  , is_desktop_active_(false)
+  , key_nav_mode_requested_(false)
+  , big_tick_(0)
   , back_buffer_age_(0)
-  , is_desktop_active_(false)
 {
   Timer timer;
 #ifndef USE_GLES
@@ -341,7 +341,7 @@
     tick_source_.reset(new na::TickSource);
     animation_controller_.reset(new na::AnimationController(*tick_source_));
 
-     wt->RedrawRequested.connect(sigc::mem_fun(this, &UnityScreen::onRedrawRequested));
+     wt->RedrawRequested.connect(sigc::mem_fun(this, &UnityScreen::OnRedrawRequested));
 
      unity_a11y_init(wt.get());
 
@@ -692,7 +692,7 @@
   /* In some unknown place inside nux drawing we change the viewport without
    * setting it back to the default one, so we need to restore it before allowing
    * compiz to take the scene */
-  auto* o = _last_output;
+  auto* o = last_output_;
   glViewport(o->x(), screen->height() - o->y2(), o->width(), o->height());
 
   glDepthRange(0, 1);
@@ -748,7 +748,7 @@
   if (WM.IsExpoActive())
     return;
 
-  CompOutput* output = _last_output;
+  CompOutput* output = last_output_;
 
   if (fullscreenRegion.contains(*output))
     return;
@@ -863,7 +863,7 @@
 
 void UnityScreen::paintDisplay()
 {
-  CompOutput *output = _last_output;
+  CompOutput *output = last_output_;
 
   DrawPanelUnderDash();
 
@@ -990,7 +990,7 @@
 
   auto const& output_dev = screen->currentOutputDev();
 
-  if (_last_output->id() != output_dev.id())
+  if (last_output_->id() != output_dev.id())
     return;
 
   auto graphics_engine = nux::GetGraphicsDisplay()->GetGraphicsEngine();
@@ -1485,7 +1485,7 @@
                    );
 
   allowWindowPaint = true;
-  _last_output = output;
+  last_output_ = output;
   paint_panel_under_dash_ = false;
 
   // CompRegion has no clear() method. So this is the fastest alternative.
@@ -1522,7 +1522,7 @@
    * this output.
    *
    * However, damaging nux has a side effect of notifying compiz
-   * through onRedrawRequested that we need to queue another frame.
+   * through OnRedrawRequested that we need to queue another frame.
    * In most cases that would be desirable, and in the case where
    * we did that in damageCutoff, it would not be a problem as compiz
    * does not queue up new frames for damage that can be processed
@@ -1687,7 +1687,7 @@
   wt->ForeignFrameEnded();
 
   if (animation_controller_->HasRunningAnimations())
-    onRedrawRequested();
+    OnRedrawRequested();
 
   for (auto it = ShowdesktopHandler::animating_windows.begin(); it != ShowdesktopHandler::animating_windows.end();)
   {
@@ -1813,7 +1813,7 @@
       else if (!screen->grabbed() && event->xfocus.mode == NotifyWhileGrabbed)
         wm.OnScreenGrabbed();
 
-      if (_key_nav_mode_requested)
+      if (key_nav_mode_requested_)
       {
         // Close any overlay that is open.
         if (launcher_controller_->IsOverlayOpen())
@@ -1821,7 +1821,7 @@
           dash_controller_->HideDash();
           hud_controller_->HideHud();
         }
-        _key_nav_mode_requested = false;
+        key_nav_mode_requested_ = false;
         launcher_controller_->KeyNavGrab();
       }
       break;
@@ -2343,7 +2343,7 @@
   else if (WM.IsExpoActive())
     WM.TerminateExpo();
 
-  _key_nav_mode_requested = true;
+  key_nav_mode_requested_ = true;
   return true;
 }
 
@@ -3542,7 +3542,7 @@
   LOG_INFO(logger) << "UnityScreen::InitNuxThread: " << timer.ElapsedSeconds() << "s";
 }
 
-void UnityScreen::onRedrawRequested()
+void UnityScreen::OnRedrawRequested()
 {
   if (!ignore_redraw_request_)
     cScreen->damagePending();
@@ -3623,7 +3623,17 @@
 
       int scale_offset = (launcher_options->hide_mode == LAUNCHER_HIDE_NEVER) ? 0 : launcher_controller_->launcher().GetWidth();
       CompOption::Value v(scale_offset);
-      screen->setOptionForPlugin("scale", "x_offset", v);
+      CompOption::Value bv(0);
+      if (Settings::Instance().launcher_position() == LauncherPosition::LEFT)
+      {
+        screen->setOptionForPlugin("scale", "x_offset", v);
+        screen->setOptionForPlugin("scale", "y_bottom_offset", bv);
+      }
+      else
+      {
+        screen->setOptionForPlugin("scale", "x_offset", bv);
+        screen->setOptionForPlugin("scale", "y_bottom_offset", v);
+      }
       break;
     }
     case UnityshellOptions::BacklightMode:
@@ -3834,11 +3844,19 @@
     }
 
     auto max_bounds = NuxGeometryFromCompRect(output.workArea());
-    if (launcher_controller_->options()->hide_mode != LAUNCHER_HIDE_NEVER && Settings::Instance().launcher_position() == LauncherPosition::LEFT)
+    if (launcher_controller_->options()->hide_mode != LAUNCHER_HIDE_NEVER)
     {
-      int monitor_width = unity_settings_.LauncherSize(monitor);
-      max_bounds.x += monitor_width;
-      max_bounds.width -= monitor_width;
+      if (Settings::Instance().launcher_position() == LauncherPosition::LEFT)
+      {
+        int monitor_width = unity_settings_.LauncherSize(monitor);
+        max_bounds.x += monitor_width;
+        max_bounds.width -= monitor_width;
+      }
+      else if (Settings::Instance().launcher_position() == LauncherPosition::BOTTOM)
+      {
+        int launcher_size = unity_settings_.LauncherSize(monitor);
+        max_bounds.height -= launcher_size;
+      }
     }
 
     nux::Geometry final_bounds;
@@ -4098,14 +4116,31 @@
       adjustment_x = launcher_size;
     shortcut_controller_->SetAdjustment(adjustment_x, panel_style_.PanelHeight(launcher->monitor));
 
+    CompOption::Value v(launcher_size);
     if (launcher_position == LauncherPosition::LEFT)
     {
-      CompOption::Value v(launcher_size);
-      screen->setOptionForPlugin("expo", "x_offset", v);
-
-      if (launcher_controller_->options()->hide_mode == LAUNCHER_HIDE_NEVER)
-        v.set(0);
-
+      screen->setOptionForPlugin("expo", "x_offset", v);
+
+      if (launcher_controller_->options()->hide_mode == LAUNCHER_HIDE_NEVER)
+        v.set(0);
+
+      screen->setOptionForPlugin("scale", "x_offset", v);
+
+      v.set(0);
+      screen->setOptionForPlugin("expo", "y_bottom_offset", v);
+      screen->setOptionForPlugin("scale", "y_bottom_offset", v);
+    }
+    else
+    {
+      screen->setOptionForPlugin("expo", "y_bottom_offset", v);
+
+      if (launcher_controller_->options()->hide_mode == LAUNCHER_HIDE_NEVER)
+        v.set(0);
+
+      screen->setOptionForPlugin("scale", "y_bottom_offset", v);
+
+      v.set(0);
+      screen->setOptionForPlugin("expo", "x_offset", v);
       screen->setOptionForPlugin("scale", "x_offset", v);
     }
   };
@@ -4124,6 +4159,10 @@
     check_launchers_size();
   });
 
+  Settings::Instance().launcher_position.changed.connect([this, check_launchers_size] (LauncherPosition const&) {
+    check_launchers_size();
+  });
+
   check_launchers_size();
 
   launcher_controller_->options()->scroll_inactive_icons = optionGetScrollInactiveIcons();
@@ -4243,6 +4282,7 @@
 {
   WindowInterface::setHandler(window);
   GLWindowInterface::setHandler(gWindow);
+  CompositeWindowInterface::setHandler(cWindow);
   ScaleWindowInterface::setHandler(ScaleWindow::get(window));
 
   PluginAdapter::Default().OnLeaveDesktop();
@@ -4608,7 +4648,7 @@
 void UnityWindow::paintThumbnail(nux::Geometry const& geo, float alpha, float parent_alpha, float scale_ratio, unsigned deco_height, bool selected)
 {
   GLMatrix matrix;
-  matrix.toScreenSpace(uScreen->_last_output, -DEFAULT_Z_CAMERA);
+  matrix.toScreenSpace(uScreen->last_output_, -DEFAULT_Z_CAMERA);
   last_bound = geo;
 
   GLWindowPaintAttrib attrib = gWindow->lastPaintAttrib();

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2016-03-31 03:59:33 +0000
+++ plugins/unityshell/src/unityshell.h	2016-05-26 00:00:49 +0000
@@ -2,7 +2,7 @@
 /* Compiz unity plugin
  * unity.h
  *
- * Copyright (c) 2010-11 Canonical Ltd.
+ * Copyright (c) 2010-16 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -120,11 +120,58 @@
   UnityScreen(CompScreen* s);
   ~UnityScreen();
 
-  /* We store these  to avoid unecessary calls to ::get */
-  CompScreen* screen;
-  CompositeScreen* cScreen;
-  GLScreen* gScreen;
-  ScaleScreen* sScreen;
+  switcher::Controller::Ptr switcher_controller();
+  launcher::Controller::Ptr launcher_controller();
+  lockscreen::Controller::Ptr lockscreen_controller();
+
+  void SetUpAndShowSwitcher(switcher::ShowMode show_mode = switcher::ShowMode::CURRENT_VIEWPORT);
+
+protected:
+  void damageCutoff() override;
+  void preparePaint(int ms) override;
+  void donePaint() override;
+
+  void handleCompizEvent(const char *pluginName, const char  *eventName, CompOption::Vector &o) override;
+  void damageRegion(const CompRegion &region) override;
+
+  /* paint on top of all windows if we could not find a window
+   * to paint underneath */
+  bool glPaintOutput(const GLScreenPaintAttrib&, const GLMatrix&, const CompRegion&, CompOutput*, unsigned int) override;
+
+  /* paint in the special case that the output is transformed */
+  void glPaintTransformedOutput(const GLScreenPaintAttrib&, const GLMatrix&, const CompRegion&, CompOutput*, unsigned int) override;
+
+  /* handle X11 events */
+  void handleEvent(XEvent*) override;
+  void addSupportedAtoms(std::vector<Atom>&) override;
+
+  /* handle showdesktop */
+  void enterShowDesktopMode() override;
+  void leaveShowDesktopMode(CompWindow *w) override;
+
+   /* window scaling */
+  bool layoutSlotsAndAssignWindows() override;
+  bool getMipmap() override { return false; }
+
+  /* Handle changes in the number of workspaces by showing the switcher
+   * or not showing the switcher */
+  bool setOptionForPlugin(const char* plugin, const char* name, CompOption::Value& v) override;
+
+  /* init plugin actions for screen */
+  bool initPluginForScreen(CompPlugin* p) override;
+
+  void outputChangeNotify() override;
+
+  CompAction::Vector& getActions() override;
+
+  std::string GetName() const override;
+  void AddProperties(debug::IntrospectionData&) override;
+
+private:
+  static void InitNuxThread(nux::NThread* thread, void* data);
+  void InitUnityComponents();
+  bool InitPluginActions();
+  void InitAltTabNextWindow();
 
   /* prepares nux for drawing */
   void nuxPrologue();
@@ -135,46 +182,7 @@
   void paintDisplay();
   void paintPanelShadow(CompRegion const& clip);
   void setPanelShadowMatrix(const GLMatrix& matrix);
-
   void updateBlurDamage();
-  void damageCutoff();
-  void preparePaint (int ms);
-  void donePaint ();
-
-  void RaiseInputWindows();
-
-  void
-  handleCompizEvent (const char         *pluginName,
-                     const char         *eventName,
-                     CompOption::Vector &o);
-
-  void damageRegion(const CompRegion &region);
-
-  /* paint on top of all windows if we could not find a window
-   * to paint underneath */
-  bool glPaintOutput(const GLScreenPaintAttrib&,
-                     const GLMatrix&,
-                     const CompRegion&,
-                     CompOutput*,
-                     unsigned int);
-
-  /* paint in the special case that the output is transformed */
-  void glPaintTransformedOutput(const GLScreenPaintAttrib&,
-                                const GLMatrix&,
-                                const CompRegion&,
-                                CompOutput*,
-                                unsigned int);
-
-  /* handle X11 events */
-  void handleEvent(XEvent*);
-  void addSupportedAtoms(std::vector<Atom>&);
-
-  /* handle showdesktop */
-  void enterShowDesktopMode ();
-  void leaveShowDesktopMode (CompWindow *w);
-
-   /* window scaling */
-  bool layoutSlotsAndAssignWindows();
 
   bool showMenuBarInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool showMenuBarTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options);
@@ -190,9 +198,7 @@
   bool setKeyboardFocusKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
 
   bool altTabInitiateCommon(CompAction* action, switcher::ShowMode mode);
-  bool altTabTerminateCommon(CompAction* action,
-                             CompAction::State state,
-                             CompOption::Vector& options);
+  bool altTabTerminateCommon(CompAction* action, CompAction::State state, CompOption::Vector& options);
 
   bool altTabForwardInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool altTabPrevInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
@@ -201,10 +207,9 @@
   bool altTabNextWindowInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool altTabPrevWindowInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
 
-  bool ShowHud();
-  /* handle hud key activations */
   bool ShowHudInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool ShowHudTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options);
+
   bool launcherSwitcherForwardInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool launcherSwitcherPrevInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool launcherSwitcherTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options);
@@ -214,56 +219,28 @@
   /* handle option changes and change settings inside of the
    * panel and dock views */
   void optionChanged(CompOption*, Options num);
-
-  /* Handle changes in the number of workspaces by showing the switcher
-   * or not showing the switcher */
-  bool setOptionForPlugin(const char* plugin, const char* name,
-                          CompOption::Value& v);
-
-  /* init plugin actions for screen */
-  bool initPluginForScreen(CompPlugin* p);
-
-  void outputChangeNotify();
+  void OnMinimizeDurationChanged();
+
   void NeedsRelayout();
   void ScheduleRelayout(guint timeout);
 
-  bool forcePaintOnTop ();
-
-  void SetUpAndShowSwitcher(switcher::ShowMode show_mode = switcher::ShowMode::CURRENT_VIEWPORT);
-
-  void OnMinimizeDurationChanged();
+  bool forcePaintOnTop();
 
   void OnLockScreenRequested();
   void OnScreenLocked();
   void OnScreenUnlocked();
   void SaveLockStamp(bool);
 
-  switcher::Controller::Ptr switcher_controller();
-  launcher::Controller::Ptr launcher_controller();
-  lockscreen::Controller::Ptr lockscreen_controller();
-
   bool DoesPointIntersectUnityGeos(nux::Point const& pt);
 
   ui::LayoutWindow::Ptr GetSwitcherDetailLayoutWindow(Window window) const;
 
-  CompAction::Vector& getActions();
-
-protected:
-  std::string GetName() const;
-  void AddProperties(debug::IntrospectionData&);
-
-private:
   enum CancelActionTarget
   {
     LAUNCHER_SWITCHER,
     SHORTCUT_HINT
   };
 
-  static void InitNuxThread(nux::NThread* thread, void* data);
-  void InitUnityComponents();
-  bool InitPluginActions();
-  void InitAltTabNextWindow();
-
   void SendExecuteCommand();
 
   void EnsureSuperKeybindings();
@@ -273,21 +250,22 @@
   void compizDamageNux(CompRegion const& region);
   void determineNuxDamage(CompRegion &nux_damage);
 
-  void onRedrawRequested();
   void Relayout();
+  void RaiseInputWindows();
 
   static void OnStartKeyNav(GVariant* data, void* value);
   static void OnExitKeyNav(GVariant* data, void* value);
 
   void restartLauncherKeyNav();
 
-  void OnDashRealized ();
-
+  bool ShowHud();
   void RaiseOSK();
 
+  void OnDashRealized();
   void OnLauncherStartKeyNav(GVariant* data);
   void OnLauncherEndKeyNav(GVariant* data);
   void OnSwitcherDetailChanged(bool detail);
+  void OnRedrawRequested();
 
   void OnInitiateSpread();
   void OnTerminateSpread();
@@ -307,20 +285,24 @@
 
   void DrawPanelUnderDash();
 
-  void FillShadowRectForOutput(CompRect &shadowRect,
-                               CompOutput const &output);
+  void FillShadowRectForOutput(CompRect &shadowRect, CompOutput const &output);
   unsigned CompizModifiersToNux(unsigned input) const;
   unsigned XModifiersToNux(unsigned input) const;
 
   void UpdateCloseWindowKey(CompAction::KeyBinding const&);
   void UpdateActivateIndicatorsKey();
 
-  bool getMipmap () override { return false; }
-
   void DamageBlurUpdateRegion(nux::Geometry const&);
 
   void ShowFirstRunHints();
   void SpreadAppWindows(bool anywhere);
+  bool queryForShader();
+
+  /* We store these  to avoid unecessary calls to ::get */
+  CompScreen* screen;
+  CompositeScreen* cScreen;
+  GLScreen* gScreen;
+  ScaleScreen* sScreen;
 
   std::unique_ptr<na::TickSource> tick_source_;
   std::unique_ptr<na::AnimationController> animation_controller_;
@@ -365,8 +347,8 @@
   /* Subscription for gestures that manipulate windows. */
   std::unique_ptr<nux::GesturesSubscription> gestures_sub_windows_;
 
-  bool                                  needsRelayout;
-  bool                                  super_keypressed_;
+  bool needsRelayout;
+  bool super_keypressed_;
   typedef std::shared_ptr<CompAction> CompActionPtr;
   typedef std::vector<CompActionPtr> ShortcutActions;
   ShortcutActions _shortcut_actions;
@@ -380,11 +362,10 @@
   GLTexture::List _shadow_texture;
 
   /* handle paint order */
-  bool    doShellRepaint;
-  bool    didShellRepaint;
-  bool    allowWindowPaint;
-  bool    _key_nav_mode_requested;
-  CompOutput* _last_output;
+  bool doShellRepaint;
+  bool didShellRepaint;
+  bool allowWindowPaint;
+  CompOutput* last_output_;
 
   /* a small count-down work-a-around
    * to force full redraws of the shell
@@ -400,16 +381,14 @@
 
   ::GLFramebufferObject *oldFbo;
 
-  bool   queryForShader ();
-
   int overlay_monitor_;
   CompScreen::GrabHandle grab_index_;
-  CompWindowList         fullscreen_windows_;
-  bool                   painting_tray_;
-  unsigned int           tray_paint_mask_;
-  unsigned int           last_scroll_event_;
-  int                    hud_keypress_time_;
-  int                    first_menu_keypress_time_;
+  CompWindowList fullscreen_windows_;
+  bool painting_tray_;
+  unsigned int tray_paint_mask_;
+  unsigned int last_scroll_event_;
+  int hud_keypress_time_;
+  int first_menu_keypress_time_;
 
   GLMatrix panel_shadow_matrix_;
 
@@ -418,9 +397,6 @@
 
   bool scale_just_activated_;
   WindowMinimizeSpeedController minimize_speed_controller_;
-
-  uint64_t big_tick_;
-
   debug::ScreenIntrospection screen_introspection_;
 
   UBusManager ubus_manager_;
@@ -430,13 +406,13 @@
 
   CompRegion buffered_compiz_damage_this_frame_;
   CompRegion buffered_compiz_damage_last_frame_;
-  bool       ignore_redraw_request_;
-  bool       dirty_helpers_on_this_frame_;
-
+  bool ignore_redraw_request_;
+  bool dirty_helpers_on_this_frame_;
+  bool is_desktop_active_;
+  bool key_nav_mode_requested_;
+  uint64_t big_tick_;
   unsigned int back_buffer_age_;
 
-  bool is_desktop_active_;
-
   friend class UnityWindow;
   friend class debug::ScreenIntrospection;
   friend class decoration::Manager;
@@ -445,6 +421,7 @@
 class UnityWindow :
   public WindowInterface,
   public GLWindowInterface,
+  public CompositeWindowInterface,
   public ShowdesktopHandlerWindowInterface,
   public compiz::WindowInputRemoverLockAcquireInterface,
   public WrapableHandler<ScaleWindowInterface, 4>,
@@ -457,98 +434,91 @@
   UnityWindow(CompWindow*);
   ~UnityWindow();
 
-  CompWindow* window;
-  CompositeWindow* cWindow;
-  GLWindow* gWindow;
-
-  nux::Geometry last_bound;
-
-  void minimize();
-  void unminimize();
-  bool minimized() const;
-  bool focus();
-  void activate();
-
-  void updateFrameRegion(CompRegion &region);
-  void getOutputExtents(CompWindowExtents& output);
+  void minimize() override;
+  void unminimize() override;
+  bool minimized() const override;
+  bool focus() override;
+  void activate() override;
+
+  //! Emited when CompWindowNotifyBeforeDestroy is received
+  sigc::signal<void> being_destroyed;
+
+protected:
+  void updateFrameRegion(CompRegion &region) override;
+  void getOutputExtents(CompWindowExtents& output) override;
 
   /* occlusion detection
    * and window hiding */
-  bool glPaint(GLWindowPaintAttrib const&, GLMatrix const&, CompRegion const&, unsigned mask);
+  bool glPaint(GLWindowPaintAttrib const&, GLMatrix const&, CompRegion const&, unsigned mask) override;
 
   /* basic window draw function */
-  bool glDraw(GLMatrix const&, GLWindowPaintAttrib const&, CompRegion const&, unsigned mask);
-
-  bool damageRect(bool initial, CompRect const&);
-
-  void updateIconPos (int &wx, int &wy, int x, int y, float width, float height);
-  void windowNotify(CompWindowNotify n);
-  void moveNotify(int x, int y, bool immediate);
-  void resizeNotify(int x, int y, int w, int h);
-  void stateChangeNotify(unsigned int lastState);
-
-  bool place(CompPoint& pos);
+  bool glDraw(GLMatrix const&, GLWindowPaintAttrib const&, CompRegion const&, unsigned mask) override;
+  bool damageRect(bool initial, CompRect const&) override;
+
+  void updateIconPos(int &wx, int &wy, int x, int y, float width, float height) override;
+  void windowNotify(CompWindowNotify n) override;
+  void moveNotify(int x, int y, bool immediate) override;
+  void resizeNotify(int x, int y, int w, int h) override;
+  void stateChangeNotify(unsigned int lastState) override;
+
+  bool place(CompPoint& pos) override;
+  void scalePaintDecoration(GLWindowPaintAttrib const&, GLMatrix const&, CompRegion const&, unsigned mask) override;
+
+  std::string GetName() const override;
+  void AddProperties(debug::IntrospectionData&) override;
+
+private:
+  typedef compiz::CompizMinimizedWindowHandler<UnityScreen, UnityWindow> UnityMinimizedHandler;
+  typedef std::shared_ptr<compiz_utils::PixmapTexture> PixmapTexturePtr;
+
+  void DoEnableFocus();
+  void DoDisableFocus();
+
+  bool IsOverrideRedirect();
+  bool IsManaged();
+  bool IsGrabbed();
+  bool IsDesktopOrDock();
+  bool IsSkipTaskbarOrPager();
+  bool IsHidden();
+  bool IsInShowdesktopMode();
+  bool IsShaded();
+  bool IsMinimized();
+  bool CanBypassLockScreen() const;
+  void DoOverrideFrameRegion(CompRegion &r);
+
+  void DoHide();
+  void DoNotifyHidden();
+  void DoShow();
+  void DoNotifyShown();
+
+  void OnInitiateSpread();
+  void OnTerminateSpread();
+
   CompPoint tryNotIntersectUI(CompPoint& pos);
   nux::Geometry GetScaledGeometry();
   nux::Geometry GetLayoutWindowGeometry();
 
-  void paintThumbnail(nux::Geometry const& bounding, float parent_alpha, float alpha, float scale_ratio, unsigned deco_height, bool selected);
-
   void enterShowDesktop();
   void leaveShowDesktop();
   bool HandleAnimations(unsigned int ms);
 
   bool handleEvent(XEvent *event);
-  void scalePaintDecoration(GLWindowPaintAttrib const&, GLMatrix const&, CompRegion const&, unsigned mask);
-
-  //! Emited when CompWindowNotifyBeforeDestroy is received
-  sigc::signal<void> being_destroyed;
-
-
-protected:
-  std::string GetName() const;
-  void AddProperties(debug::IntrospectionData&);
-
-private:
-  typedef compiz::CompizMinimizedWindowHandler<UnityScreen, UnityWindow> UnityMinimizedHandler;
-  typedef std::shared_ptr<compiz_utils::PixmapTexture> PixmapTexturePtr;
-
-  void DoEnableFocus ();
-  void DoDisableFocus ();
-
-  bool IsOverrideRedirect ();
-  bool IsManaged ();
-  bool IsGrabbed ();
-  bool IsDesktopOrDock ();
-  bool IsSkipTaskbarOrPager ();
-  bool IsHidden ();
-  bool IsInShowdesktopMode ();
-  bool IsShaded ();
-  bool IsMinimized ();
-  bool CanBypassLockScreen() const;
-  void DoOverrideFrameRegion (CompRegion &r);
-
-  void DoHide ();
-  void DoNotifyHidden ();
-  void DoShow ();
-  void DoNotifyShown ();
-
-  void OnInitiateSpread();
-  void OnTerminateSpread();
-
-  void DoAddDamage ();
-  ShowdesktopHandlerWindowInterface::PostPaintAction DoHandleAnimations (unsigned int ms);
-
-  void DoMoveFocusAway ();
-
-  void DoDeleteHandler ();
-
-  unsigned int GetNoCoreInstanceMask ();
-
-  compiz::WindowInputRemoverLock::Ptr GetInputRemover ();
+  void paintThumbnail(nux::Geometry const& bounding, float parent_alpha, float alpha, float scale_ratio, unsigned deco_height, bool selected);
+
+  void DoAddDamage();
+  ShowdesktopHandlerWindowInterface::PostPaintAction DoHandleAnimations(unsigned int ms);
+
+  void DoMoveFocusAway();
+
+  void DoDeleteHandler();
+
+  unsigned int GetNoCoreInstanceMask();
+
+  compiz::WindowInputRemoverLock::Ptr GetInputRemover();
 
   void RenderDecoration(compiz_utils::CairoContext const&, double aspect = 1.0f);
-  void RenderTitle(compiz_utils::CairoContext const&, int x, int y, int width, int height, double aspect = 1.0f);
+  void RenderTitle(compiz_utils::CairoContext const&, int x, int y, int width,
+                   int height, double aspect = 1.0f);
   void DrawTexture(GLTexture::List const& textures, GLWindowPaintAttrib const&,
                    GLMatrix const&, unsigned mask, int x, int y, double aspect = 1.0f);
 
@@ -565,7 +535,12 @@
   std::unique_ptr <UnityMinimizedHandler> mMinimizeHandler;
 
 private:
+  CompWindow* window;
+  CompositeWindow* cWindow;
+  GLWindow* gWindow;
+
   std::unique_ptr <ShowdesktopHandler> mShowdesktopHandler;
+  nux::Geometry last_bound;
   PixmapTexturePtr decoration_tex_;
   PixmapTexturePtr decoration_selected_tex_;
   std::string decoration_title_;
@@ -579,6 +554,7 @@
   glib::Source::UniquePtr focus_desktop_timeout_;
 
   friend class UnityScreen;
+  friend UnityMinimizedHandler;
 };
 
 

=== modified file 'tests/test_gnome_session_manager.cpp'
--- tests/test_gnome_session_manager.cpp	2015-11-23 09:24:10 +0000
+++ tests/test_gnome_session_manager.cpp	2016-05-26 00:00:49 +0000
@@ -256,9 +256,19 @@
 
   void TearDown()
   {
+    manager->have_other_open_sessions.changed.clear();
+    manager->is_locked.changed.clear();
+    manager->is_session_active.changed.clear();
+    manager->lock_requested.clear();
+    manager->unlock_requested.clear();
+    manager->prompt_lock_requested.clear();
+    manager->locked.clear();
+    manager->unlocked.clear();
     manager->logout_requested.clear();
     manager->reboot_requested.clear();
     manager->shutdown_requested.clear();
+    manager->presence_status_changed.clear();
+    manager->screensaver_requested.clear();
     manager->cancel_requested.clear();
     shell_proxy_->DisconnectSignal();
 

=== modified file 'tests/test_switcher_controller.cpp'
--- tests/test_switcher_controller.cpp	2015-11-04 09:42:55 +0000
+++ tests/test_switcher_controller.cpp	2016-05-26 00:00:49 +0000
@@ -278,7 +278,7 @@
   Mock::VerifyAndClearExpectations(mock_window_.GetPointer());
 }
 
-TEST_F(TestSwitcherController, TestRightClickedReceived)
+TEST_F(TestSwitcherController, TestDetailActivationRequest)
 {
   controller_->Show(ShowMode::ALL, SortMode::LAUNCHER_ORDER, icons_);
 
@@ -287,8 +287,7 @@
 
   ASSERT_FALSE(model->detail_selection());
 
-  view->switcher_mouse_up.emit(-1, 3);
-  view->switcher_mouse_down.emit(-1, 3);
+  view->switcher_start_detail.emit();
 
   ASSERT_TRUE(model->detail_selection());
 }

=== modified file 'unity-shared/DashStyle.cpp'
--- unity-shared/DashStyle.cpp	2016-03-31 05:53:05 +0000
+++ unity-shared/DashStyle.cpp	2016-05-26 00:00:49 +0000
@@ -95,7 +95,7 @@
   *height = cairo_image_surface_get_height(surface) / h_scale;
 }
 
-class LazyLoadTexture
+class LazyLoadTexture : public sigc::trackable
 {
 public:
   LazyLoadTexture(std::string const& filename, int size = -1);

=== modified file 'unity-shared/DecorationStyle.cpp'
--- unity-shared/DecorationStyle.cpp	2016-02-09 17:14:55 +0000
+++ unity-shared/DecorationStyle.cpp	2016-05-26 00:00:49 +0000
@@ -369,6 +369,7 @@
   void AddContextClasses(Side s, WidgetState ws, GtkStyleContext* ctx = nullptr)
   {
     ctx = ctx ? ctx : ctx_;
+    gtk_style_context_add_class(ctx, "background");
     gtk_style_context_add_class(ctx, "gnome-panel-menu-bar");
     if (s == Side::TOP) { gtk_style_context_add_class(ctx, "header-bar"); }
     gtk_style_context_add_class(ctx, GetBorderClass(s).c_str());

=== modified file 'unity-shared/DecorationStyle.h'
--- unity-shared/DecorationStyle.h	2016-02-25 14:16:17 +0000
+++ unity-shared/DecorationStyle.h	2016-05-26 00:00:49 +0000
@@ -25,6 +25,7 @@
 #include <cairo/cairo.h>
 
 #include <memory>
+#include <vector>
 
 struct _GtkStyleContext;
 

=== modified file 'unity-shared/GnomeKeyGrabber.cpp'
--- unity-shared/GnomeKeyGrabber.cpp	2015-12-13 10:35:58 +0000
+++ unity-shared/GnomeKeyGrabber.cpp	2016-05-26 00:00:49 +0000
@@ -232,8 +232,11 @@
   {
     action.setState(CompAction::StateInitKey);
     action.setInitiate([this, action_id](CompAction* action, CompAction::State state, CompOption::Vector& options) {
-      LOG_DEBUG(logger) << "pressed \"" << action->keyToString() << "\"";
-      ActivateDBusAction(*action, action_id, 0, CompOption::getIntOptionNamed(options, "time"));
+      if (!CompOption::getBoolOptionNamed(options, "is_repeated"))
+      {
+        LOG_DEBUG(logger) << "pressed \"" << action->keyToString() << "\"";
+        ActivateDBusAction(*action, action_id, 0, CompOption::getIntOptionNamed(options, "time"));
+      }
       return true;
     });
   }

=== modified file 'unity-shared/PanelStyle.cpp'
--- unity-shared/PanelStyle.cpp	2016-03-31 05:37:15 +0000
+++ unity-shared/PanelStyle.cpp	2016-05-26 00:00:49 +0000
@@ -85,6 +85,7 @@
   gtk_widget_path_iter_set_name(widget_path.get(), -1, PANEL_STYLE_CSS_NAME.c_str());
 
   gtk_style_context_set_path(style_context_, widget_path.get());
+  gtk_style_context_add_class(style_context_, "background");
   gtk_style_context_add_class(style_context_, "gnome-panel-menu-bar");
   gtk_style_context_add_class(style_context_, "unity-panel");