Merge lp:~brandontschaefer/unity/switcher-alt+f4-disabled-SRU into lp:unity/5.0

[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.

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve (quality)

=== modified file 'plugins/unityshell/src/SwitcherController.cpp'
--- plugins/unityshell/src/SwitcherController.cpp	2012-06-05 14:17:55 +0000
+++ plugins/unityshell/src/SwitcherController.cpp	2012-06-25 23:29:18 +0000
@@ -95,7 +95,7 @@
   {
     std::sort(results.begin(), results.end(), CompareSwitcherItemsPriority);
   }
-  
+
   model_.reset(new SwitcherModel(results));
   AddChild(model_.get());
   model_->selection_changed.connect(sigc::mem_fun(this, &Controller::OnModelSelectionChanged));
@@ -187,11 +187,14 @@
 {
   if (!visible_)
     return;
-  
+
   ConstructView();
 
+  ubus_manager_.SendMessage(UBUS_SWITCHER_START);
+
   if (view_window_) {
     view_window_->ShowWindow(true);
+    view_window_->PushToFront();
     view_window_->SetOpacity(1.0f);
   }
 }
@@ -215,6 +218,7 @@
     view_window_->SetLayout(main_layout_);
     view_window_->SetBackgroundColor(nux::Color(0x00000000));
     view_window_->SetGeometry(workarea_);
+    view_window_->EnableInputWindow(true, "Switcher", false, false);
   }
 }
 
@@ -280,6 +284,8 @@
     }
   }
 
+  ubus_manager_.SendMessage(UBUS_SWITCHER_END, g_variant_new_boolean(!accept_state));
+
   if (view_idle_timer_)
   {
     g_source_remove(view_idle_timer_);
@@ -296,6 +302,8 @@
   {
     view_window_->SetOpacity(0.0f);
     view_window_->ShowWindow(false);
+    view_window_->PushToBack();
+    view_window_->EnableInputWindow(false);
   }
 
   if (show_timer_)
@@ -435,15 +443,20 @@
   return view_->ExternalTargets();
 }
 
+guint Controller::GetSwitcherInputWindowId() const
+{
+  return view_window_->GetInputWindowId();
+}
+
 bool Controller::CompareSwitcherItemsPriority(AbstractLauncherIcon::Ptr first,
                                               AbstractLauncherIcon::Ptr second)
 {
   if (first->GetIconType() == second->GetIconType())
     return first->SwitcherPriority() > second->SwitcherPriority();
-    
+
   if (first->GetIconType() == AbstractLauncherIcon::IconType::TYPE_DESKTOP)
 	return true;
-	
+
   if (second->GetIconType() == AbstractLauncherIcon::IconType::TYPE_DESKTOP)
 	return false;
   return first->GetIconType() < second->GetIconType();

=== modified file 'plugins/unityshell/src/SwitcherController.h'
--- plugins/unityshell/src/SwitcherController.h	2012-04-14 18:15:54 +0000
+++ plugins/unityshell/src/SwitcherController.h	2012-06-25 23:29:18 +0000
@@ -95,6 +95,8 @@
 
   ui::LayoutWindowList ExternalRenderTargets ();
 
+  guint GetSwitcherInputWindowId() const;
+
 protected:
   // Introspectable methods
   std::string GetName() const;

=== modified file 'plugins/unityshell/src/UBusMessages.h'
--- plugins/unityshell/src/UBusMessages.h	2012-04-17 22:09:41 +0000
+++ plugins/unityshell/src/UBusMessages.h	2012-06-25 23:29:18 +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_START"
+#define UBUS_SWITCHER_END               "SWITCHER_END"
 #define UBUS_SWITCHER_SELECTION_CHANGED "SWITCHER_SELECTION_CHANGED"
 
 #endif // UBUS_MESSAGES_H

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-05-23 13:43:03 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-06-25 23:29:18 +0000
@@ -350,6 +350,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));
+
      g_idle_add_full (G_PRIORITY_DEFAULT, &UnityScreen::initPluginActions, this, NULL);
      super_keypressed_ = false;
 
@@ -1931,6 +1937,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-04-24 21:26:55 +0000
+++ plugins/unityshell/src/unityshell.h	2012-06-25 23:29:18 +0000
@@ -229,6 +229,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/autopilot/tests/test_switcher.py'
--- tests/autopilot/autopilot/tests/test_switcher.py	2012-04-16 01:03:10 +0000
+++ tests/autopilot/autopilot/tests/test_switcher.py	2012-06-25 23:29:18 +0000
@@ -210,6 +210,21 @@
             self.assertThat(self.switcher.get_monitor(), Equals(monitor))
             self.switcher.terminate()
 
+    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()
+
+        self.keyboard.press_and_release("Alt+F4")
+        [win] = [w for w in app.get_windows()]
+        self.switcher.terminate()
+
+        # Need the sleep to allow the window time to close, for jenkins!
+        sleep(10)
+        self.assertThat(win.is_valid, Equals(True))
+
 
 class SwitcherWindowsManagementTests(AutopilotTestCase):
     """Test the switcher window management."""