Merge lp:unity/5.0 into lp:~ubuntu-desktop/unity/precise

[Chris J Arges]

[ Brandon Schaefer ]
  * Change TimeUtil to use int64, so the buffer wont overflow within
    our lifetimes. (LP: #806248)

[Timo Jyrinki (timo-jyrinki)]

Looks correct and already released to Ubuntu 12.10 users.

review: Approve

[Timo Jyrinki (timo-jyrinki)]

A more proper one at https://code.launchpad.net/~timo-jyrinki/unity/ubuntu.lp806248-fix-int32-buffer-overflow-5.0/+merge/145178 which includes Chris's changelog entry.

review: Disapprove

[lp:unity/5.0]

2413. By Marco Trevisan (Treviño) on 2013-01-31

ResultRendererTile: fix a crash if row.renderer<TextureContainer*>() is null

2414. By Andrea Azzarone on 2013-02-18

Backport fix for 991637.

Merged branch lp:~andyrock/unity/fix-991637-5.0

2415. By Łukasz Zemczak on 2013-04-03

Partial backport of Unity trunk revno. 2901 to fix where window decorations are being drawn when they should not be (LP: #1122478) (LP: #1083186).

2416. By Marco Trevisan (Treviño) on 2013-04-04

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.

2417. By Timo Jyrinki on 2013-04-12

Release\ 5.20.0

2418. By Łukasz Zemczak on 2013-04-12

Add a manual test checking the fix for LP: #1122478. We need a manual-test because there is no infrastructure for real testing.. Fixes: . Approved by Christopher Townsend.

2419. By Marco Trevisan (Treviño) on 2013-04-23

SwitcherController: use again the SwitcherView as non-input window

Otherwise it could only lead to focusing troubles.
Added utilities to manage the WindowManager default close-window keybinding and using
it in our views.

2420. By Christopher Townsend on 2013-06-21

Fixes issue where minimizing a full screen window would not draw the Launcher and Panel after minimization. This is a backport of lp:unity revno. 3320.

2421. By Brandon Schaefer on 2013-07-11

We needs to set the focus of the base windows to the Dash/Hud (which ever one is focused), so XIM will accept events to those windows. Allowing XIM to work when this branch lands: lp:~brandontschaefer/nux/xim-support-12-04-SRU

2422. By Christopher Townsend on 2013-07-11

Check to see if the window is supposed to have decorations instead of the window actually being decorated when Undecorate() is called. This fixes a race condition where windows opened maximized upon login would sometimes have extra decorations. (LP: #1195730)

2423. By Stephen M. Webb on 2013-09-02

DashStyle: removed debug output thatcould cause a potential security problem (lp: #1051921)

2424. By Andrew Gaul <email address hidden> on 2013-09-20

PanelService: Disconnect signals connected in on_entry_added

This addresses a memory leak observed in lp:1203607

2425. By Christopher Townsend on 2013-10-17

Reference the menu in the accessible object. Backport of revno. 2775 of lp:unity. (LP: #913324)

Unmerged revisions

2425. By Christopher Townsend on 2013-10-17

Reference the menu in the accessible object. Backport of revno. 2775 of lp:unity. (LP: #913324)

2424. By Andrew Gaul <email address hidden> on 2013-09-20

PanelService: Disconnect signals connected in on_entry_added

This addresses a memory leak observed in lp:1203607

2423. By Stephen M. Webb on 2013-09-02

DashStyle: removed debug output thatcould cause a potential security problem (lp: #1051921)

2422. By Christopher Townsend on 2013-07-11

Check to see if the window is supposed to have decorations instead of the window actually being decorated when Undecorate() is called. This fixes a race condition where windows opened maximized upon login would sometimes have extra decorations. (LP: #1195730)

2421. By Brandon Schaefer on 2013-07-11

We needs to set the focus of the base windows to the Dash/Hud (which ever one is focused), so XIM will accept events to those windows. Allowing XIM to work when this branch lands: lp:~brandontschaefer/nux/xim-support-12-04-SRU

2420. By Christopher Townsend on 2013-06-21

Fixes issue where minimizing a full screen window would not draw the Launcher and Panel after minimization. This is a backport of lp:unity revno. 3320.

2419. By Marco Trevisan (Treviño) on 2013-04-23

SwitcherController: use again the SwitcherView as non-input window

Otherwise it could only lead to focusing troubles.
Added utilities to manage the WindowManager default close-window keybinding and using
it in our views.

=== added file 'plugins/unityshell/resources/launcher_pip_large_ltr.png'
 Binary files plugins/unityshell/resources/launcher_pip_large_ltr.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/launcher_pip_large_ltr.png	2013-10-17 21:01:26 +0000 differ
=== added file 'plugins/unityshell/resources/launcher_pip_large_rtl.png'
 Binary files plugins/unityshell/resources/launcher_pip_large_rtl.png	1970-01-01 00:00:00 +0000 and plugins/unityshell/resources/launcher_pip_large_rtl.png	2013-10-17 21:01:26 +0000 differ
=== modified file 'plugins/unityshell/src/DashController.cpp'
--- plugins/unityshell/src/DashController.cpp	2012-07-18 15:25:17 +0000
+++ plugins/unityshell/src/DashController.cpp	2013-10-17 21:01:26 +0000
@@ -272,18 +272,18 @@
   }
 
   view_->AboutToShow();
+  visible_ = true;
 
   window_->ShowWindow(true);
-  window_->PushToFront();
   window_->EnableInputWindow(true, "Dash", true, false);
-  window_->SetInputFocus();
+  FocusInput();
+
   window_->CaptureMouseDownAnyWhereElse(true);
   window_->QueueDraw();
 
   nux::GetWindowCompositor().SetKeyFocusArea(view_->default_focus());
 
   need_show_ = false;
-  visible_ = true;
 
   StartShowHideTimeline();
 
@@ -292,6 +292,15 @@
   ubus_manager_.SendMessage(UBUS_OVERLAY_SHOWN, info);
 }
 
+void Controller::FocusInput()
+{
+  if (visible_)
+  {
+    window_->PushToFront();
+    window_->SetInputFocus();
+  }
+}
+
 void Controller::HideDash(bool restore)
 {
   if (!visible_)
@@ -364,6 +373,11 @@
   return TRUE;
 }
 
+bool Controller::IsVisible() const
+{
+  return visible_;
+}
+
 void Controller::OnActivateRequest(GVariant* variant)
 {
   EnsureDash();
 
=== modified file 'plugins/unityshell/src/DashController.h'
--- plugins/unityshell/src/DashController.h	2012-04-12 13:23:29 +0000
+++ plugins/unityshell/src/DashController.h	2013-10-17 21:01:26 +0000
@@ -58,6 +58,9 @@
 
   void HideDash(bool restore_focus = true);
 
+  void FocusInput();
+  bool IsVisible() const;
+
 protected:
   std::string GetName() const;
   void AddProperties(GVariantBuilder* builder);
 
=== modified file 'plugins/unityshell/src/DashStyle.cpp'
--- plugins/unityshell/src/DashStyle.cpp	2012-06-06 13:18:59 +0000
+++ plugins/unityshell/src/DashStyle.cpp	2013-10-17 21:01:26 +0000
@@ -1504,7 +1504,6 @@
 
   // blur and blend overlay onto initial image-surface
   Blur(blurred_cr, blurSize);
-  //cairo_surface_write_to_png(surface, "/tmp/overlay-surface.png");
   cairo_set_source_surface(cr, surface, 0.0, 0.0);
   old = SetBlendMode(cr, mode);
   cairo_paint_with_alpha(cr, opacity);
@@ -1724,8 +1723,6 @@
               42.0 + 10.0,
               alignment);
 
-  cairo_surface_write_to_png(cairo_get_target(cr), "/tmp/wut.png");
-
   return true;
 }
 
 
=== modified file 'plugins/unityshell/src/DashView.cpp'
--- plugins/unityshell/src/DashView.cpp	2012-06-28 08:49:20 +0000
+++ plugins/unityshell/src/DashView.cpp	2013-10-17 21:01:26 +0000
@@ -33,6 +33,7 @@
 #include "DashSettings.h"
 #include "UBusMessages.h"
 #include "KeyboardUtil.h"
+#include "WindowManager.h"
 
 namespace unity
 {
@@ -494,7 +495,7 @@
   });
 
   // global search done is handled by the home lens, no need to connect to it
-  // BUT, we will special case global search finished coming from 
+  // BUT, we will special case global search finished coming from
   // the applications lens, because we want to be able to launch applications
   // immediately without waiting for the search finished signal which will
   // be delayed by all the lenses we're searching
@@ -808,6 +809,10 @@
                                  unsigned long x11_key_code,
                                  unsigned long special_keys_state)
 {
+  // Only care about states of Alt, Ctrl, Super, Shift, not the lock keys
+  special_keys_state &= (nux::NUX_STATE_ALT | nux::NUX_STATE_CTRL |
+                         nux::NUX_STATE_SUPER | nux::NUX_STATE_SHIFT);
+
   // Do what nux::View does, but if the event isn't a key navigation,
   // designate the text entry to process it.
 
@@ -841,15 +846,15 @@
     // Not sure if Enter should be a navigation key
     direction = KEY_NAV_ENTER;
     break;
-  case NUX_VK_F4:
-    // Maybe we should not do it here, but it needs to be checked where
-    // we are able to know if alt is pressed.
-    if (special_keys_state & NUX_STATE_ALT)
-    {
-      ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
-    }
-    break;
   default:
+    auto const& close_key = WindowManager::Default()->close_window_key();
+
+    if (close_key.first == special_keys_state && close_key.second == x11_key_code)
+    {
+      ubus_manager_.SendMessage(UBUS_PLACE_VIEW_CLOSE_REQUEST);
+      return nullptr;
+    }
+
     direction = KEY_NAV_NONE;
   }
 
 
=== modified file 'plugins/unityshell/src/HudController.cpp'
--- plugins/unityshell/src/HudController.cpp	2012-06-19 16:58:14 +0000
+++ plugins/unityshell/src/HudController.cpp	2013-10-17 21:01:26 +0000
@@ -359,17 +359,17 @@
   LOG_DEBUG(logger) << "Taking application icon: " << focused_app_icon_;
   SetIcon(focused_app_icon_);
 
+  visible_ = true;
+
   window_->ShowWindow(true);
-  window_->PushToFront();
   window_->EnableInputWindow(true, "Hud", true, false);
-  window_->SetInputFocus();
+  FocusInput();
   window_->CaptureMouseDownAnyWhereElse(true);
   view_->CaptureMouseDownAnyWhereElse(true);
   window_->QueueDraw();
 
   view_->ResetToDefault();
   need_show_ = true;
-  visible_ = true;
 
   StartShowHideTimeline();
   view_->SetWindowGeometry(window_->GetAbsoluteGeometry(), window_->GetGeometry());
@@ -384,6 +384,15 @@
   window_->SetEnterFocusInputArea(view_->default_focus());
 }
 
+void Controller::FocusInput()
+{
+  if (visible_)
+  {
+    window_->PushToFront();
+    window_->SetInputFocus();
+  }
+}
+
 void Controller::HideHud(bool restore)
 {
   LOG_DEBUG (logger) << "hiding the hud";
 
=== modified file 'plugins/unityshell/src/HudController.h'
--- plugins/unityshell/src/HudController.h	2012-06-15 18:09:57 +0000
+++ plugins/unityshell/src/HudController.h	2013-10-17 21:01:26 +0000
@@ -59,6 +59,8 @@
   void HideHud(bool restore_focus = true);
   bool IsVisible();
 
+  void FocusInput();
+
 protected:
   // Introspectable
   std::string GetName() const;
 
=== modified file 'plugins/unityshell/src/HudView.cpp'
--- plugins/unityshell/src/HudView.cpp	2012-08-20 14:52:48 +0000
+++ plugins/unityshell/src/HudView.cpp	2013-10-17 21:01:26 +0000
@@ -29,6 +29,7 @@
 
 #include "UBusMessages.h"
 #include "DashStyle.h"
+#include "WindowManager.h"
 
 namespace unity
 {
@@ -563,6 +564,10 @@
       unsigned long x11_key_code,
       unsigned long special_keys_state)
 {
+  // Only care about states of Alt, Ctrl, Super, Shift, not the lock keys
+  special_keys_state &= (nux::NUX_STATE_ALT | nux::NUX_STATE_CTRL |
+                         nux::NUX_STATE_SUPER | nux::NUX_STATE_SHIFT);
+
   nux::KeyNavDirection direction = nux::KEY_NAV_NONE;
   switch (x11_key_code)
   {
@@ -590,6 +595,14 @@
     direction = nux::KEY_NAV_ENTER;
     break;
   default:
+    auto const& close_key = WindowManager::Default()->close_window_key();
+
+    if (close_key.first == special_keys_state && close_key.second == x11_key_code)
+    {
+      ubus.SendMessage(UBUS_HUD_CLOSE_REQUEST);
+      return nullptr;
+    }
+
     direction = nux::KEY_NAV_NONE;
     break;
   }
 
=== modified file 'plugins/unityshell/src/IconRenderer.cpp'
--- plugins/unityshell/src/IconRenderer.cpp	2012-10-17 17:46:12 +0000
+++ plugins/unityshell/src/IconRenderer.cpp	2013-10-17 21:01:26 +0000
@@ -188,6 +188,8 @@
 nux::BaseTexture* progress_bar_fill = 0;
 nux::BaseTexture* pip_ltr = 0;
 nux::BaseTexture* pip_rtl = 0;
+nux::BaseTexture* large_pip_ltr = 0;
+nux::BaseTexture* large_pip_rtl = 0;
 nux::BaseTexture* arrow_ltr = 0;
 nux::BaseTexture* arrow_rtl = 0;
 nux::BaseTexture* arrow_empty_ltr = 0;
@@ -871,8 +873,8 @@
   if (running > 0)
   {
     int scale = 1;
-
     int markerX;
+
     if (pip_style == OUTSIDE_TILE)
     {
       markerX = geo.x;
@@ -880,8 +882,7 @@
     else
     {
       auto bounds = arg.icon->GetTransform(ui::IconTextureSource::TRANSFORM_TILE, monitor);
-      markerX = bounds[0].x + 2;
-      scale = 2;
+      markerX = bounds[0].x + 1;
     }
 
     nux::TexCoordXForm texxform;
@@ -902,26 +903,47 @@
 
     if (!arg.running_on_viewport)
     {
+      scale = (pip_style == OUTSIDE_TILE) ? 1 : 2;
       markers[0] = markerCenter;
       texture = local::arrow_empty_ltr;
     }
     else if (running == 1)
     {
+      scale = (pip_style == OUTSIDE_TILE) ? 1 : 2;
       markers[0] = markerCenter;
       texture = local::arrow_ltr;
     }
     else if (running == 2)
     {
-      markers[0] = markerCenter - 2 * scale;
-      markers[1] = markerCenter + 2 * scale;
-      texture = local::pip_ltr;
+      if (pip_style == OUTSIDE_TILE)
+      {
+        texture = local::pip_ltr;
+        markers[0] = markerCenter - 2;
+        markers[1] = markerCenter + 2;
+      }
+      else
+      {
+        texture = local::large_pip_ltr;
+        markers[0] = markerCenter - 4;
+        markers[1] = markerCenter + 4;
+      }
     }
     else
     {
-      markers[0] = markerCenter - 4 * scale;
-      markers[1] = markerCenter;
-      markers[2] = markerCenter + 4 * scale;
-      texture = local::pip_ltr;
+      if (pip_style == OUTSIDE_TILE)
+      {
+        texture = local::pip_ltr;
+        markers[0] = markerCenter - 4;
+        markers[1] = markerCenter;
+        markers[2] = markerCenter + 4;
+      }
+      else
+      {
+        texture = local::large_pip_ltr;
+        markers[0] = markerCenter - 8;
+        markers[1] = markerCenter;
+        markers[2] = markerCenter + 8;
+      }
     }
 
 
@@ -1218,10 +1240,12 @@
   squircle_shine = load_texture(PKGDATADIR"/squircle_shine_54.png");
 
   pip_ltr = load_texture(PKGDATADIR"/launcher_pip_ltr.png");
+  large_pip_ltr = load_texture(PKGDATADIR"/launcher_pip_large_ltr.png");
   arrow_ltr = load_texture(PKGDATADIR"/launcher_arrow_ltr.png");
   arrow_empty_ltr = load_texture(PKGDATADIR"/launcher_arrow_outline_ltr.png");
 
   pip_rtl = load_texture(PKGDATADIR"/launcher_pip_rtl.png");
+  large_pip_rtl = load_texture(PKGDATADIR"/launcher_pip_large_rt.png");
   arrow_rtl = load_texture(PKGDATADIR"/launcher_arrow_rtl.png");
   arrow_empty_rtl = load_texture(PKGDATADIR"/launcher_arrow_outline_rtl.png");
 
@@ -1248,6 +1272,8 @@
   progress_bar_fill->UnReference();
   pip_ltr->UnReference();
   pip_rtl->UnReference();
+  large_pip_ltr->UnReference();
+  large_pip_rtl->UnReference();
   arrow_ltr->UnReference();
   arrow_rtl->UnReference();
   arrow_empty_ltr->UnReference();
 
=== modified file 'plugins/unityshell/src/PluginAdapter.cpp'
--- plugins/unityshell/src/PluginAdapter.cpp	2013-04-12 08:54:24 +0000
+++ plugins/unityshell/src/PluginAdapter.cpp	2013-10-17 21:01:26 +0000
@@ -1118,7 +1118,7 @@
 void
 PluginAdapter::Undecorate(guint32 xid)
 {
-  if (!IsWindowDecorated(xid))
+  if (!HasWindowDecorations(xid))
     return;
 
   MotifWmHints hints = { 0 };
 
=== modified file 'plugins/unityshell/src/SwitcherController.cpp'
--- plugins/unityshell/src/SwitcherController.cpp	2012-07-18 15:25:17 +0000
+++ plugins/unityshell/src/SwitcherController.cpp	2013-10-17 21:01:26 +0000
@@ -40,7 +40,7 @@
 }
 
 Controller::Controller(unsigned int load_timeout)
-  :  timeout_length(75)
+  :  timeout_length(50)
   ,  detail_on_timeout(true)
   ,  detail_timeout_length(500)
   ,  initial_detail_timeout_length(1500)
@@ -91,12 +91,15 @@
 void Controller::Show(ShowMode show, SortMode sort, bool reverse,
                       std::vector<AbstractLauncherIcon::Ptr> results)
 {
+  if (results.empty() || visible_)
+    return;
+
   if (sort == SortMode::FOCUS_ORDER)
   {
     std::sort(results.begin(), results.end(), CompareSwitcherItemsPriority);
   }
 
-  model_.reset(new SwitcherModel(results));
+  model_ = std::make_shared<SwitcherModel>(results);
   AddChild(model_.get());
   model_->selection_changed.connect(sigc::mem_fun(this, &Controller::OnModelSelectionChanged));
   model_->only_detail_on_viewport = (show == ShowMode::CURRENT_VIEWPORT);
@@ -192,7 +195,8 @@
 
   ubus_manager_.SendMessage(UBUS_SWITCHER_START);
 
-  if (view_window_) {
+  if (view_window_)
+  {
     view_window_->ShowWindow(true);
     view_window_->PushToFront();
     view_window_->SetOpacity(1.0f);
@@ -218,7 +222,6 @@
     view_window_->SetLayout(main_layout_);
     view_window_->SetBackgroundColor(nux::Color(0x00000000));
     view_window_->SetGeometry(workarea_);
-    view_window_->EnableInputWindow(true, "Switcher", false, false);
   }
 }
 
@@ -303,7 +306,6 @@
     view_window_->SetOpacity(0.0f);
     view_window_->ShowWindow(false);
     view_window_->PushToBack();
-    view_window_->EnableInputWindow(false);
   }
 
   if (show_timer_)
 
=== modified file 'plugins/unityshell/src/SwitcherController.h'
--- plugins/unityshell/src/SwitcherController.h	2012-06-25 23:18:15 +0000
+++ plugins/unityshell/src/SwitcherController.h	2013-10-17 21:01:26 +0000
@@ -29,7 +29,6 @@
 #include "SwitcherView.h"
 #include "UBusWrapper.h"
 
-#include <boost/shared_ptr.hpp>
 #include <sigc++/sigc++.h>
 
 #include <Nux/Nux.h>
 
=== modified file 'plugins/unityshell/src/SwitcherModel.h'
--- plugins/unityshell/src/SwitcherModel.h	2012-08-15 18:26:01 +0000
+++ plugins/unityshell/src/SwitcherModel.h	2013-10-17 21:01:26 +0000
@@ -27,7 +27,7 @@
 
 #include "Introspectable.h"
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <sigc++/sigc++.h>
 
 namespace unity
@@ -39,7 +39,7 @@
 {
 
 public:
-  typedef boost::shared_ptr<SwitcherModel> Ptr;
+  typedef std::shared_ptr<SwitcherModel> Ptr;
 
   typedef std::vector<launcher::AbstractLauncherIcon::Ptr> Base;
   typedef Base::iterator iterator;
 
=== modified file 'plugins/unityshell/src/WindowManager.h'
--- plugins/unityshell/src/WindowManager.h	2013-04-12 08:54:24 +0000
+++ plugins/unityshell/src/WindowManager.h	2013-10-17 21:01:26 +0000
@@ -20,6 +20,7 @@
 #define WINDOW_MANAGER_H
 
 #include <Nux/Nux.h>
+#include <NuxCore/Property.h>
 #include <gdk/gdkx.h>
 #include <core/core.h>
 
@@ -110,6 +111,9 @@
   virtual bool saveInputFocus() = 0;
   virtual bool restoreInputFocus() = 0;
 
+  // Nux Modifiers, Nux Keycode (= X11 KeySym)
+  nux::Property<std::pair<unsigned, unsigned>> close_window_key;
+
   // Signals
   sigc::signal<void, guint32> window_mapped;
   sigc::signal<void, guint32> window_unmapped;
 
=== modified file 'plugins/unityshell/src/unity-util-accessible.cpp'
--- plugins/unityshell/src/unity-util-accessible.cpp	2012-01-04 01:54:41 +0000
+++ plugins/unityshell/src/unity-util-accessible.cpp	2013-10-17 21:01:26 +0000
@@ -324,9 +324,9 @@
   }
 
   atk_event->string = NULL;
-  if (event->text && event->text[0])
+  if (event->dtext && event->dtext[0])
   {
-    key_unichar = g_utf8_get_char(event->text);
+    key_unichar = g_utf8_get_char(event->dtext);
 
     if (g_unichar_validate(key_unichar) && g_unichar_isgraph(key_unichar))
     {
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-04-12 08:54:24 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-10-17 21:01:26 +0000
@@ -351,12 +351,6 @@
      ubus_manager_.RegisterInterest(UBUS_LAUNCHER_END_KEY_SWTICHER,
                    sigc::mem_fun(this, &UnityScreen::OnLauncherEndKeyNav));
 
-     ubus_manager_.RegisterInterest(UBUS_SWITCHER_START,
-                   sigc::mem_fun(this, &UnityScreen::OnSwitcherStart));
-
-     ubus_manager_.RegisterInterest(UBUS_SWITCHER_END,
-                   sigc::mem_fun(this, &UnityScreen::OnSwitcherEnd));
-
      g_idle_add_full (G_PRIORITY_DEFAULT, &UnityScreen::initPluginActions, this, NULL);
      super_keypressed_ = false;
 
@@ -944,7 +938,7 @@
   {
     /* Create a new keybinding for the Escape key and the current modifiers,
      * compiz will take of the ref-counting of the repeated actions */
-    KeyCode escape = XKeysymToKeycode(screen->dpy(), XStringToKeysym("Escape"));
+    KeyCode escape = XKeysymToKeycode(screen->dpy(), XK_Escape);
     CompAction::KeyBinding binding(escape, modifiers);
 
     CompActionPtr &escape_action = _escape_actions[target];
@@ -1604,6 +1598,16 @@
           break;
         }
       }
+      else if (switcher_controller_->Visible())
+      {
+        auto const& close_key = PluginAdapter::Default()->close_window_key();
+
+        if (key_sym == close_key.second && XModifiersToNux(event->xkey.state) == close_key.first)
+        {
+          switcher_controller_->Hide(false);
+          skip_other_plugins = true;
+        }
+      }
 
       if (result > 0)
       {
@@ -1673,10 +1677,9 @@
   }
 
   if (!skip_other_plugins &&
-      screen->otherGrabExist("deco", "move", "switcher", "resize", NULL) &&
-      !switcher_controller_->Visible())
+      screen->otherGrabExist("deco", "move", "switcher", "resize", "unity-switcher", nullptr))
   {
-    wt->ProcessForeignEvent(event, NULL);
+    wt->ProcessForeignEvent(event, nullptr);
   }
 }
 
@@ -2105,41 +2108,10 @@
 
 void UnityScreen::OnLauncherEndKeyNav(GVariant* data)
 {
-  RestoreWindow(data);
-}
-
-void UnityScreen::OnSwitcherStart(GVariant* data)
-{
-  if (switcher_controller_->Visible())
-  {
-    newFocusedWindow = screen->findWindow(switcher_controller_->GetSwitcherInputWindowId());
-
-    if (switcher_controller_->GetSwitcherInputWindowId() != screen->activeWindow())
-      PluginAdapter::Default()->saveInputFocus();
-
-    if (newFocusedWindow)
-      newFocusedWindow->moveInputFocusTo();
-  }
-}
-
-void UnityScreen::OnSwitcherEnd(GVariant* data)
-{
-  RestoreWindow(data);
-}
-
-void UnityScreen::RestoreWindow(GVariant* data)
-{
-  bool preserve_focus = false;
-
-  if (data)
-  {
-    preserve_focus = g_variant_get_boolean(data);
-  }
-
   // Return input-focus to previously focused window (before key-nav-mode was
   // entered)
-  if (preserve_focus)
-    PluginAdapter::Default ()->restoreInputFocus ();
+  if (data && g_variant_get_boolean(data))
+    PluginAdapter::Default()->restoreInputFocus();
 }
 
 bool UnityScreen::ShowHud()
@@ -2226,9 +2198,70 @@
   return ShowHud();
 }
 
+unsigned UnityScreen::CompizModifiersToNux(unsigned input) const
+{
+  unsigned modifiers = 0;
+
+  if (input & CompAltMask)
+  {
+    input &= ~CompAltMask;
+    input |= Mod1Mask;
+  }
+
+  if (modifiers & CompSuperMask)
+  {
+    input &= ~CompSuperMask;
+    input |= Mod4Mask;
+  }
+
+  return XModifiersToNux(input);
+}
+
+unsigned UnityScreen::XModifiersToNux(unsigned input) const
+{
+  unsigned modifiers = 0;
+
+  if (input & Mod1Mask)
+    modifiers |= nux::KEY_MODIFIER_ALT;
+
+  if (input & ShiftMask)
+    modifiers |= nux::KEY_MODIFIER_SHIFT;
+
+  if (input & ControlMask)
+    modifiers |= nux::KEY_MODIFIER_CTRL;
+
+  if (input & Mod4Mask)
+    modifiers |= nux::KEY_MODIFIER_SUPER;
+
+  return modifiers;
+}
+
+void UnityScreen::UpdateCloseWindowKey(CompAction::KeyBinding const& keybind)
+{
+  KeySym keysym = XkbKeycodeToKeysym(screen->dpy(), keybind.keycode(), 0, 0);
+  unsigned modifiers = CompizModifiersToNux(keybind.modifiers());
+
+  WindowManager::Default()->close_window_key = std::make_pair(modifiers, keysym);
+}
+
 gboolean UnityScreen::initPluginActions(gpointer data)
 {
-  CompPlugin* p = CompPlugin::find("expo");
+  CompPlugin* p = CompPlugin::find("core");
+  auto self = static_cast<UnityScreen*>(data);
+
+  if (p)
+  {
+    for (CompOption& option : p->vTable->getOptions())
+    {
+      if (option.name() == "close_window_key")
+      {
+        self->UpdateCloseWindowKey(option.value().action().key());
+        break;
+      }
+    }
+  }
+
+  p = CompPlugin::find("expo");
 
   if (p)
   {
@@ -2398,7 +2431,7 @@
                               PAINT_WINDOW_TRANSFORMED_MASK |
                               PAINT_WINDOW_NO_CORE_INSTANCE_MASK;
     if (!(mask & nonOcclusionBits) &&
-        (window->state() & CompWindowStateFullscreenMask))
+        (window->state() & CompWindowStateFullscreenMask && !window->minimized()))
         // And I've been advised to test other things, but they don't work:
         // && (attrib.opacity == OPAQUE)) <-- Doesn't work; Only set in glDraw
         // && !window->alpha() <-- Doesn't work; Opaque windows often have alpha
@@ -2639,12 +2672,17 @@
   if (n == CompWindowNotifyFocusChange)
   {
     UnityScreen* us = UnityScreen::get(screen);
-    CompWindow *lw;
 
-    if (us->launcher_controller_->IsOverlayOpen())
+    if (us)
     {
-      lw = screen->findWindow(us->launcher_controller_->LauncherWindowId(0));
-      lw->moveInputFocusTo();
+      if (us->dash_controller_->IsVisible())
+      {
+        us->dash_controller_->FocusInput();
+      }
+      else if(us->hud_controller_->IsVisible())
+      {
+        us->hud_controller_->FocusInput();
+      }
     }
   }
 }
@@ -2995,9 +3033,16 @@
   bool status = screen->setOptionForPlugin(plugin, name, v);
   if (status)
   {
-    if (strcmp(plugin, "core") == 0 && strcmp(name, "hsize") == 0)
+    if (strcmp(plugin, "core") == 0)
     {
-      launcher_controller_->UpdateNumWorkspaces(screen->vpSize().width() * screen->vpSize().height());
+      if (strcmp(name, "hsize") == 0 || strcmp(name, "vsize") == 0)
+      {
+        launcher_controller_->UpdateNumWorkspaces(screen->vpSize().width() * screen->vpSize().height());
+      }
+      else if (strcmp(name, "close_window_key") == 0)
+      {
+        UpdateCloseWindowKey(v.action().key());
+      }
     }
   }
   return status;
 
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2013-04-12 08:54:24 +0000
+++ plugins/unityshell/src/unityshell.h	2013-10-17 21:01:26 +0000
@@ -232,15 +232,15 @@
   void OnLauncherStartKeyNav(GVariant* data);
   void OnLauncherEndKeyNav(GVariant* data);
 
-  void OnSwitcherStart(GVariant* data);
-  void OnSwitcherEnd(GVariant* data);
-
-  void RestoreWindow(GVariant* data);
-
   void InitHints();
 
   void OnPanelStyleChanged();
 
+  unsigned CompizModifiersToNux(unsigned input) const;
+  unsigned XModifiersToNux(unsigned input) const;
+
+  void UpdateCloseWindowKey(CompAction::KeyBinding const&);
+
   dash::Settings dash_settings_;
   dash::Style    dash_style_;
   panel::Style   panel_style_;
 
=== modified file 'services/panel-indicator-entry-accessible.c'
--- services/panel-indicator-entry-accessible.c	2012-03-23 12:26:38 +0000
+++ services/panel-indicator-entry-accessible.c	2013-10-17 21:01:26 +0000
@@ -30,6 +30,7 @@
 struct _PanelIndicatorEntryAccessiblePrivate
 {
   IndicatorObjectEntry *entry;
+  GtkMenu              *menu;
   PanelService         *service;
   gint                  x;
   gint                  y;
@@ -111,6 +112,25 @@
 }
 
 static void
+panel_indicator_entry_accessible_dispose (GObject *object)
+{
+  PanelIndicatorEntryAccessible *piea;
+
+  g_return_if_fail (PANEL_IS_INDICATOR_ENTRY_ACCESSIBLE (object));
+
+  piea = PANEL_INDICATOR_ENTRY_ACCESSIBLE (object);
+
+  if (piea->priv != NULL)
+    {
+      piea->priv->entry = NULL;
+      g_clear_object(&piea->priv->menu);
+    }
+
+  G_OBJECT_CLASS (panel_indicator_entry_accessible_parent_class)->dispose (object);
+  return;
+}
+
+static void
 panel_indicator_entry_accessible_finalize (GObject *object)
 {
   PanelIndicatorEntryAccessible *piea;
@@ -136,6 +156,7 @@
 
   /* GObject */
   object_class = G_OBJECT_CLASS (klass);
+  object_class->dispose = panel_indicator_entry_accessible_dispose;
   object_class->finalize = panel_indicator_entry_accessible_finalize;
 
   /* AtkObject */
@@ -225,6 +246,10 @@
 
   piea = PANEL_INDICATOR_ENTRY_ACCESSIBLE (accessible);
   piea->priv->entry = (IndicatorObjectEntry *) data;
+  if (piea->priv->entry->menu != NULL)
+    {
+      piea->priv->menu = g_object_ref(piea->priv->entry->menu);
+    }
 
   if (GTK_IS_LABEL (piea->priv->entry->label))
     {
@@ -253,7 +278,7 @@
 
   piea = PANEL_INDICATOR_ENTRY_ACCESSIBLE (accessible);
 
-  if (piea->priv->entry->parent_object && GTK_IS_MENU (piea->priv->entry->menu))
+  if (piea->priv->entry != NULL && piea->priv->entry->parent_object && piea->priv->menu != NULL && GTK_IS_MENU (piea->priv->menu))
     n_children = 1;
 
   return n_children;
 
=== modified file 'services/panel-service.c'
--- services/panel-service.c	2012-04-27 11:42:56 +0000
+++ services/panel-service.c	2013-10-17 21:01:26 +0000
@@ -609,6 +609,16 @@
           gpointer key, value;
 
           entry = l->data;
+
+           if (GTK_IS_LABEL (entry->label))
+            {
+              g_signal_handlers_disconnect_by_data (entry->label, indicator);
+            }
+          if (GTK_IS_IMAGE (entry->image))
+            {
+              g_signal_handlers_disconnect_by_data (entry->image, indicator);
+            }
+
           entry_id = get_indicator_entry_id_by_entry (entry);
           g_hash_table_remove (self->priv->id2entry_hash, entry_id);
           g_free (entry_id);
@@ -635,6 +645,7 @@
       g_object_ref_sink (G_OBJECT (indicator));
     }
 
+  g_signal_handlers_disconnect_by_data (indicator, self);
   g_object_unref (G_OBJECT (indicator));
 }
 
@@ -882,6 +893,15 @@
    * FIXME this in libappmenu.so to avoid to send an "entry-removed" signal
    * when switching the focus from a window to one of its dialog children */
 
+  if (GTK_IS_LABEL (entry->label))
+    {
+      g_signal_handlers_disconnect_by_data (entry->label, object);
+    }
+  if (GTK_IS_IMAGE (entry->image))
+    {
+      g_signal_handlers_disconnect_by_data (entry->image, object);
+    }
+
   gchar *entry_id = get_indicator_entry_id_by_entry (entry);
   g_hash_table_remove (self->priv->id2entry_hash, entry_id);
   g_free (entry_id);
 
=== modified file 'tests/autopilot/autopilot/tests/test_dash.py'
--- tests/autopilot/autopilot/tests/test_dash.py	2012-06-27 01:19:32 +0000
+++ tests/autopilot/autopilot/tests/test_dash.py	2013-10-17 21:01:26 +0000
@@ -60,6 +60,15 @@
         self.keyboard.press_and_release("Alt+F4")
         self.assertThat(self.dash.visible, Eventually(Equals(False)))
 
+    def test_alt_f4_close_dash_with_capslock_on(self):
+        """Dash must close on Alt+F4 even when the capslock is turned on."""
+        self.keyboard.press_and_release("Caps_Lock")
+        self.addCleanup(self.keyboard.press_and_release, "Caps_Lock")
+
+        self.dash.ensure_visible()
+        self.keyboard.press_and_release("Alt+F4")
+        self.assertThat(self.dash.visible, Eventually(Equals(False)))
+
     def test_dash_closes_on_spread(self):
         """This test shows that when the spread is initiated, the dash closes."""
         self.dash.ensure_visible()
 
=== modified file 'tests/autopilot/autopilot/tests/test_hud.py'
--- tests/autopilot/autopilot/tests/test_hud.py	2012-06-25 22:02:54 +0000
+++ tests/autopilot/autopilot/tests/test_hud.py	2013-10-17 21:01:26 +0000
@@ -266,6 +266,15 @@
 
         self.assertThat(self.hud.visible, Eventually(Equals(False)))
 
+    def test_alt_f4_close_hud_with_capslock_on(self):
+        """Hud must close on Alt+F4 even when the capslock is turned on."""
+        self.keyboard.press_and_release("Caps_Lock")
+        self.addCleanup(self.keyboard.press_and_release, "Caps_Lock")
+
+        self.hud.ensure_visible()
+        self.keyboard.press_and_release("Alt+F4")
+        self.assertThat(self.hud.visible, Eventually(Equals(False)))
+
 
 class HudLauncherInteractionsTests(HudTestsBase):