Merge lp:~3v1n0/unity/switcher-no-inputwin-5.0 into lp:unity/5.0

[Marco Trevisan (Treviño)]

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.

Backported branches lp:~3v1n0/unity/switcher-noinputwin, lp:~3v1n0/unity/bigger-switcher-pips, lp:~thomir/unity/fix-hud-closing and lp:~brandontschaefer/unity/alt+f4-closes-hud to unity-5.0.

[Brandon Schaefer (brandontschaefer)]

Sweet, looks good to me!

review: Approve

=== 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-04-23 02:51:28 +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-04-23 02:51:28 +0000 differ
=== 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-04-23 02:51:28 +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/HudView.cpp'
--- plugins/unityshell/src/HudView.cpp	2012-08-20 14:52:48 +0000
+++ plugins/unityshell/src/HudView.cpp	2013-04-23 02:51:28 +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-04-23 02:51:28 +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/SwitcherController.cpp'
--- plugins/unityshell/src/SwitcherController.cpp	2012-06-25 23:18:15 +0000
+++ plugins/unityshell/src/SwitcherController.cpp	2013-04-23 02:51:28 +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-04-23 02:51:28 +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-04-23 02:51:28 +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-03-18 21:20:01 +0000
+++ plugins/unityshell/src/WindowManager.h	2013-04-23 02:51:28 +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/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-04-04 18:37:52 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-04-23 02:51:28 +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)
   {
@@ -2995,9 +3028,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-04 18:18:50 +0000
+++ plugins/unityshell/src/unityshell.h	2013-04-23 02:51:28 +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 '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-04-23 02:51:28 +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-04-23 02:51:28 +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):