Merge lp:~brandontschaefer/unity/condense-unityshell-function into lp:unity

[Brandon Schaefer]

Condensed some code in for saving input focus and focusing a new window in unityshell.cpp

=== Problem ===
Duplicate functions

=== Fix ===
Condense them

[Brandon Schaefer (brandontschaefer)]

All launcher test pass.

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-06-26 18:34:03 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-06-27 22:26:20 +0000
@@ -1671,26 +1671,6 @@
   return true;
 }
 
-void UnityScreen::startLauncherKeyNav()
-{
-  // get CompWindow* of launcher-window
-  newFocusedWindow = screen->findWindow(launcher_controller_->KeyNavLauncherInputWindowId());
-
-  // check if currently focused window isn't the launcher-window
-  if (newFocusedWindow != screen->findWindow(screen->activeWindow()))
-    PluginAdapter::Default()->saveInputFocus();
-
-  // set input-focus on launcher-window and start key-nav mode
-  if (newFocusedWindow)
-  {
-    // Put the launcher BaseWindow at the top of the BaseWindow stack. The
-    // input focus coming from the XinputWindow will be processed by the
-    // launcher BaseWindow only. Then the Launcher BaseWindow will decide
-    // which View will get the input focus.
-    launcher_controller_->PushToFront();
-    newFocusedWindow->moveInputFocusTo();
-  }
-}
 
 bool UnityScreen::setKeyboardFocusKeyInitiate(CompAction* action,
                                               CompAction::State state,
@@ -1934,7 +1914,12 @@
 
 void UnityScreen::OnLauncherStartKeyNav(GVariant* data)
 {
-  startLauncherKeyNav();
+  // Put the launcher BaseWindow at the top of the BaseWindow stack. The
+  // input focus coming from the XinputWindow will be processed by the
+  // launcher BaseWindow only. Then the Launcher BaseWindow will decide
+  // which View will get the input focus.
+  if (SaveInputThenFocus(launcher_controller_->KeyNavLauncherInputWindowId()))
+    launcher_controller_->PushToFront();
 }
 
 void UnityScreen::OnLauncherEndKeyNav(GVariant* data)
@@ -1944,13 +1929,7 @@
 
 void UnityScreen::OnSwitcherStart(GVariant* data)
 {
-  newFocusedWindow = screen->findWindow(switcher_controller_->GetSwitcherInputWindowId());
-
-  if (switcher_controller_->GetSwitcherInputWindowId() != screen->activeWindow())
-    PluginAdapter::Default()->saveInputFocus();
-
-  if (newFocusedWindow)
-    newFocusedWindow->moveInputFocusTo();
+  SaveInputThenFocus(switcher_controller_->GetSwitcherInputWindowId());
 }
 
 void UnityScreen::OnSwitcherEnd(GVariant* data)
@@ -1973,6 +1952,24 @@
     PluginAdapter::Default ()->restoreInputFocus ();
 }
 
+bool UnityScreen::SaveInputThenFocus(const guint xid)
+{
+  // get CompWindow*
+  newFocusedWindow = screen->findWindow(xid);
+
+  // check if currently focused window isn't it self
+  if (xid != screen->activeWindow())
+    PluginAdapter::Default()->saveInputFocus();
+
+  // set input-focus on window
+  if (newFocusedWindow)
+  {
+    newFocusedWindow->moveInputFocusTo();
+    return true;
+  }
+  return false;
+}
+
 bool UnityScreen::ShowHud()
 {
   if (switcher_controller_->Visible())

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-06-26 17:34:31 +0000
+++ plugins/unityshell/src/unityshell.h	2012-06-27 22:26:20 +0000
@@ -220,7 +220,6 @@
   static void OnStartKeyNav(GVariant* data, void* value);
   static void OnExitKeyNav(GVariant* data, void* value);
 
-  void startLauncherKeyNav();
   void restartLauncherKeyNav();
 
   void OnDashRealized ();
@@ -232,6 +231,7 @@
   void OnSwitcherEnd(GVariant* data);
 
   void RestoreWindow(GVariant* data);
+  bool SaveInputThenFocus(const guint xid);
 
   void InitHints();