Merge lp:~brandontschaefer/unity/lp1086988-fix-x-focus-dash-hud-xim into lp:unity

[Brandon Schaefer]

The Dash/HUD have X focus when open now, instead of the launcher.

=== Problem ===
When the Dash or Hud was open, the launcher would have X focus. This means events generated by X would think the launcher is focused. This causes problems when trying to use XIM, as it think the Launcher is generating events not the Dash or Hud, so XIM fails to work.

=== Fix ===
Make it re focus the key input for the dash or hud when an external application is opened when the Dash/Hud is open.

=== Test ===
Removing the explicit skip in XIM tests, as they all pass now, and skip correctly if no gcin is found.

Video showing hime (An input method) in action.
http://ubuntuone.com/7lZkpPRRJklEsMMJJ4HWcX

[Andrea Azzarone (azzar1)]

Works here.

review: Approve

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2012-12-11 23:36:53 +0000
+++ dash/DashController.cpp	2012-12-13 01:36:21 +0000
@@ -308,6 +308,19 @@
 
   view_->AboutToShow();
 
+  FocusWindow();
+
+  need_show_ = false;
+  visible_ = true;
+
+  StartShowHideTimeline();
+
+  GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE, monitor_);
+  ubus_manager_.SendMessage(UBUS_OVERLAY_SHOWN, info);
+}
+
+void Controller::FocusWindow()
+{
   window_->ShowWindow(true);
   window_->PushToFront();
   if (!Settings::Instance().is_standalone) // in standalone mode, we do not need an input window. we are one.
@@ -317,18 +330,9 @@
     window_->UpdateInputWindowGeometry();
   }
   window_->SetInputFocus();
-  window_->CaptureMouseDownAnyWhereElse(true);
   window_->QueueDraw();
 
   nux::GetWindowCompositor().SetKeyFocusArea(view_->default_focus());
-
-  need_show_ = false;
-  visible_ = true;
-
-  StartShowHideTimeline();
-
-  GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE, monitor_);
-  ubus_manager_.SendMessage(UBUS_OVERLAY_SHOWN, info);
 }
 
 void Controller::HideDash(bool restore)
@@ -427,6 +431,15 @@
                                   .add("monitor", monitor_);
 }
 
+void Controller::ReFocusKeyInput()
+{
+  if (visible_)
+  {
+    window_->PushToFront();
+    window_->SetInputFocus();
+  }
+}
+
 bool Controller::IsVisible() const
 {
   return visible_;
 
=== modified file 'dash/DashController.h'
--- dash/DashController.h	2012-12-11 23:36:53 +0000
+++ dash/DashController.h	2012-12-13 01:36:21 +0000
@@ -61,6 +61,8 @@
   void HideDash(bool restore_focus = true);
   void ShowDash();
 
+  void ReFocusKeyInput();
+
   bool IsVisible() const;
   nux::Geometry GetInputWindowGeometry();
 
@@ -84,6 +86,8 @@
   void OnExternalHideDash(GVariant* variant);
   void OnActivateRequest(GVariant* variant);
 
+  void FocusWindow();
+
   void StartShowHideTimeline();
   void OnViewShowHideFrame(double progress);
 
 
=== modified file 'hud/HudController.cpp'
--- hud/HudController.cpp	2012-12-11 23:37:17 +0000
+++ hud/HudController.cpp	2012-12-13 01:36:21 +0000
@@ -302,6 +302,15 @@
   visible_ ? HideHud(true) : ShowHud();
 }
 
+void Controller::ReFocusKeyInput()
+{
+  if (visible_)
+  {
+    window_->PushToFront();
+    window_->SetInputFocus();
+  }
+}
+
 bool Controller::IsVisible()
 {
   return visible_;
@@ -351,14 +360,7 @@
   LOG_DEBUG(logger) << "Taking application icon: " << focused_app_icon_;
   SetIcon(focused_app_icon_);
 
-  window_->ShowWindow(true);
-  window_->PushToFront();
-  window_->EnableInputWindow(true, "Hud", true, false);
-  window_->UpdateInputWindowGeometry();
-  window_->SetInputFocus();
-  window_->CaptureMouseDownAnyWhereElse(true);
-  view_->CaptureMouseDownAnyWhereElse(true);
-  window_->QueueDraw();
+  FocusWindow();
 
   view_->ResetToDefault();
   need_show_ = true;
@@ -376,6 +378,16 @@
   window_->SetEnterFocusInputArea(view_->default_focus());
 }
 
+void Controller::FocusWindow()
+{
+  window_->ShowWindow(true);
+  window_->PushToFront();
+  window_->EnableInputWindow(true, "Hud", true, false);
+  window_->UpdateInputWindowGeometry();
+  window_->SetInputFocus();
+  window_->QueueDraw();
+}
+
 void Controller::HideHud(bool restore)
 {
   LOG_DEBUG (logger) << "hiding the hud";
 
=== modified file 'hud/HudController.h'
--- hud/HudController.h	2012-12-11 23:37:17 +0000
+++ hud/HudController.h	2012-12-13 01:36:21 +0000
@@ -61,6 +61,7 @@
   void ShowHideHud();
   void ShowHud();
   void HideHud(bool restore_focus = true);
+  void ReFocusKeyInput();
   bool IsVisible();
 
   nux::Geometry GetInputWindowGeometry();
@@ -77,6 +78,8 @@
   void RegisterUBusInterests();
   void SetIcon(std::string const& icon_name);
 
+  void FocusWindow();
+
   int GetIdealMonitor();
   bool IsLockedToLauncher(int monitor);
 
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-12-07 04:21:35 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-12-13 01:36:21 +0000
@@ -2729,12 +2729,17 @@
   {
     UnityScreen* us = UnityScreen::get(screen);
 
-    // can't rely on launcher->IsOverlayVisible on focus change (because ubus is async close on focus change.)
-    if (us && (us->dash_controller_->IsVisible() || us->hud_controller_->IsVisible()))
+    // If focus gets moved to an external program while the Dash/Hud is open, refocus key input.
+    if (us)
     {
-      CompWindow *lw;
-      lw = screen->findWindow(us->launcher_controller_->LauncherWindowId(0));
-      lw->moveInputFocusTo();
+      if (us->dash_controller_->IsVisible())
+      {
+        us->dash_controller_->ReFocusKeyInput();
+      }
+      else if (us->hud_controller_->IsVisible())
+      {
+        us->hud_controller_->ReFocusKeyInput();
+      }
     }
   }
 }
 
=== modified file 'tests/autopilot/unity/tests/xim/test_gcin.py'
--- tests/autopilot/unity/tests/xim/test_gcin.py	2012-10-11 01:44:15 +0000
+++ tests/autopilot/unity/tests/xim/test_gcin.py	2012-12-13 01:36:21 +0000
@@ -19,7 +19,6 @@
 class GcinTestCase(UnityTestCase):
     """Tests the Input Method gcin."""
 
-    @skip("Currenlty no XIM support in Nux")
     def setUp(self):
         super(GcinTestCase, self).setUp()
 
@@ -44,17 +43,14 @@
             ('national script', {'input': 'gug mun ', 'result': u'\uad6d\ubb38'}),
         ]
 
-    @skip("Currenlty no XIM support in Nux")
     def setUp(self):
         super(GcinTestHangul, self).setUp()
 
-    @skip("Currenlty no XIM support in Nux")
     def enter_hangul_mode(self):
         """Ctrl+Space turns gcin on, Ctrl+Alt+/ turns hangul on."""
         self.keyboard.press_and_release("Ctrl+Space")
         self.keyboard.press_and_release("Ctrl+Alt+/")
 
-    @skip("Currenlty no XIM support in Nux")
     def test_dash_input(self):
         """Entering an input string through gcin will result in a Korean string result in the dash."""
 
@@ -65,7 +61,6 @@
         self.keyboard.type(self.input)
         self.assertThat(self.dash.search_string, Eventually(Equals(self.result)))
 
-    @skip("Currenlty no XIM support in Nux")
     def test_hud_input(self):
         """Entering an input string through gcin will result in a Korean string result in the hud."""