Merge lp:~brandontschaefer/unity/switcher-alt+f4-fix into lp:unity

[Brandon Schaefer]

The switcher now focuses it's own window, instead of leaving it to the current one. Now Alt+F4 does not work while the switcher is active.

=== Problem ===
When the switcher starts it does not take the focus from the current window. This means if you press Alt+F4 it will close that program, but when you exit from the switcher it will restart that application.

=== Fix ===
The fix is to take the switchers view window and give it focus. If the switcher is cancled then restore focus to the previous window. Else, do what the switcher normally does.

=== Test ===
AP test included.

[Brandon Schaefer (brandontschaefer)]

All switcher AP test pass locally.

Ran 24 tests in 185.487s

OK (skipped=1)

[Thomi Richards (thomir-deactivatedaccount)]

Hi,

171 + self.keyboard.press_and_release("Alt+F4")
172 + [win] = [w for w in app.get_windows()]
173 +
174 + self.assertThat(win.is_valid, Equals(True))

This will also pass even if the code is broken and we run it on the jenkins machine. It's a bit ugly, but I'd like to see a "sleep(10)" just before the assert, with a comment saying why we need it.

Otherwise looks good to me.

Cheers

review: Needs Fixing (quality)

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve (quality)

[Andrea Azzarone (azzar1)]

LGTM

review: Approve

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2012-06-15 02:03:31 +0000
+++ launcher/SwitcherController.cpp	2012-06-25 21:40:25 +0000
@@ -159,8 +159,11 @@
 
   ConstructView();
 
+  ubus_manager_.SendMessage(UBUS_SWITCHER_START, NULL);
+
   if (view_window_) {
     view_window_->ShowWindow(true);
+    view_window_->PushToFront();
     view_window_->SetOpacity(1.0f);
   }
 }
@@ -179,6 +182,7 @@
     view_window_->SetLayout(main_layout_);
     view_window_->SetBackgroundColor(nux::Color(0x00000000));
     view_window_->SetGeometry(workarea_);
+    view_window_->EnableInputWindow(true, "Switcher", false, false);
   }
 }
 
@@ -240,6 +244,8 @@
     }
   }
 
+  ubus_manager_.SendMessage(UBUS_SWITCHER_END, g_variant_new_boolean(!accept_state));
+
   sources_.Remove(VIEW_CONSTRUCT_IDLE);
   sources_.Remove(SHOW_TIMEOUT);
   sources_.Remove(DETAIL_TIMEOUT);
@@ -254,6 +260,8 @@
   {
     view_window_->SetOpacity(0.0f);
     view_window_->ShowWindow(false);
+    view_window_->PushToBack();
+    view_window_->EnableInputWindow(false);
   }
 
   ubus_manager_.SendMessage(UBUS_SWITCHER_SHOWN, g_variant_new("(bi)", false, monitor_));
@@ -385,6 +393,11 @@
   return view_->ExternalTargets();
 }
 
+guint Controller::GetSwitcherInputWindowId() const
+{
+  return view_window_->GetInputWindowId();
+}
+
 bool Controller::CompareSwitcherItemsPriority(AbstractLauncherIcon::Ptr first,
                                               AbstractLauncherIcon::Ptr second)
 {
 
=== modified file 'launcher/SwitcherController.h'
--- launcher/SwitcherController.h	2012-06-15 02:03:31 +0000
+++ launcher/SwitcherController.h	2012-06-25 21:40:25 +0000
@@ -90,6 +90,8 @@
 
   ui::LayoutWindowList ExternalRenderTargets ();
 
+  guint GetSwitcherInputWindowId() const;
+
 protected:
   // Introspectable methods
   std::string GetName() const;
 
=== modified file 'launcher/SwitcherModel.cpp'
--- launcher/SwitcherModel.cpp	2012-06-01 02:38:55 +0000
+++ launcher/SwitcherModel.cpp	2012-06-25 21:40:25 +0000
@@ -171,7 +171,7 @@
 
   if (detail_selection_index > DetailXids().size() - 1)
     return 0;
- 
+
   return DetailXids()[detail_selection_index];
 }
 
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-06-15 02:03:31 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-06-25 21:40:25 +0000
@@ -353,6 +353,12 @@
      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));
+
      auto init_plugins_cb = sigc::mem_fun(this, &UnityScreen::initPluginActions);
      sources_.Add(std::make_shared<glib::Idle>(init_plugins_cb, glib::Source::Priority::DEFAULT));
 
@@ -1909,6 +1915,27 @@
 
 void UnityScreen::OnLauncherEndKeyNav(GVariant* data)
 {
+  RestoreWindow(data);
+}
+
+void UnityScreen::OnSwitcherStart(GVariant* data)
+{
+  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)
 
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-06-15 02:03:31 +0000
+++ plugins/unityshell/src/unityshell.h	2012-06-25 21:40:25 +0000
@@ -228,6 +228,11 @@
   void OnLauncherStartKeyNav(GVariant* data);
   void OnLauncherEndKeyNav(GVariant* data);
 
+  void OnSwitcherStart(GVariant* data);
+  void OnSwitcherEnd(GVariant* data);
+
+  void RestoreWindow(GVariant* data);
+
   void InitHints();
 
   void OnPanelStyleChanged();
 
=== modified file 'tests/autopilot/unity/tests/test_switcher.py'
--- tests/autopilot/unity/tests/test_switcher.py	2012-06-20 21:39:36 +0000
+++ tests/autopilot/unity/tests/test_switcher.py	2012-06-25 21:40:25 +0000
@@ -52,10 +52,10 @@
         """Starting switcher in details mode must show the focused window title."""
         app = self.start_app("Text Editor")
         sleep(1)
-        self.switcher.initiate(SwitcherMode.DETAIL)
-        self.addCleanup(self.switcher.terminate)
 
         [title] = [w.title for w in app.get_windows() if w.is_focused]
+        self.switcher.initiate(SwitcherMode.DETAIL)
+        self.addCleanup(self.switcher.terminate)
 
         self.assertThat(self.switcher.controller.view.label, Eventually(Equals(title)))
 
@@ -190,6 +190,22 @@
             self.addCleanup(self.switcher.terminate)
             self.assertThat(self.switcher.controller.monitor, Eventually(Equals(monitor)))
 
+    def test_switcher_alt_f4_is_disabled(self):
+        """Tests that alt+f4 does not work while switcher is active."""
+
+        app = self.start_app("Text Editor")
+        sleep(1)
+
+        self.switcher.initiate(SwitcherMode.DETAIL)
+        self.addCleanup(self.switcher.terminate)
+
+        self.keyboard.press_and_release("Alt+F4")
+        [win] = [w for w in app.get_windows()]
+
+        # Need the sleep to allow the window time to close, for jenkins!
+        sleep(10)
+        self.assertThat(win.is_valid, Equals(True))
+
 
 class SwitcherWindowsManagementTests(SwitcherTestCase):
     """Test the switcher window management."""
 
=== modified file 'unity-shared/UBusMessages.h'
--- unity-shared/UBusMessages.h	2012-05-06 23:48:38 +0000
+++ unity-shared/UBusMessages.h	2012-06-25 21:40:25 +0000
@@ -35,7 +35,7 @@
 #define UBUS_DASH_ABOUT_TO_SHOW "DASH_ABOUT_TO_SHOW"
 
 // Signal sent when an overlay interface is shown, includes a gvariant
-// gvariant format is (sb), (interface-name, can_maximize?) 
+// gvariant format is (sb), (interface-name, can_maximize?)
 #define UBUS_OVERLAY_FORMAT_STRING "(sbi)"
 #define UBUS_OVERLAY_HIDDEN "OVERLAY_HIDDEN"
 #define UBUS_OVERLAY_SHOWN "OVERLAY_SHOWN"
@@ -88,6 +88,8 @@
 
 // Signals sent when the switcher is shown, hidden or changes selection
 #define UBUS_SWITCHER_SHOWN             "SWITCHER_SHOWN"
+#define UBUS_SWITCHER_START             "SWITCHER_SHOWN_START"
+#define UBUS_SWITCHER_END               "SWITCHER_SHOWN_END"
 #define UBUS_SWITCHER_SELECTION_CHANGED "SWITCHER_SELECTION_CHANGED"
 
 #endif // UBUS_MESSAGES_H