Merge lp:~3v1n0/unity/quick-alt+tab-fixes.stable into lp:unity/4.0

[Marco Trevisan (Treviño)]

Make the quick Alt+Tab more consistent.

The quick Alt+Tab should be handled in a different way according to bug #861250, so I've made it possible by making the SwitcherController to use the ActionArg button member to define the type of the switch that has been performed (I've made this not to add an extra member to the class, but this can be changed if you want the code to be more clean).
Then the activated BamfLauncherIcon redirects this information to the PluginAdapter's FocusWindowGroup that now when called with the FocusVisibility::OnlyVisibleOnTop visibility option, just brings to focus the first window that is on top of the stack (for the given application).

A manual test is included.

[Sam Spilsbury (smspillaz)]

163 + /* Instead of defining a new type of ActionArg we only use the "button"
164 + * ActionArg value to indicate to the view if we're performing a quick
165 + * switch or not. */
166 + unsigned int is_quick = (view_window_ && view_window_->IsVisible()) ? 0 : 1;
167 +
168 if (model_->detail_selection)
169 {
170 - selection->Activate(ActionArg(ActionArg::SWITCHER, 0, model_->DetailSelectionWindow ()));
171 + selection->Activate(ActionArg(ActionArg::SWITCHER, is_quick, model_->DetailSelectionWindow ()));
172 }
173 else
174 {
175 if (selection->GetQuirk (AbstractLauncherIcon::QUIRK_ACTIVE) &&
176 !model_->DetailXids().empty ())
177 {
178 - selection->Activate(ActionArg (ActionArg::SWITCHER, 0, model_->DetailXids()[0]));
179 + selection->Activate(ActionArg (ActionArg::SWITCHER, is_quick, model_->DetailXids()[0]));
180 }
181 else
182 {
183 - selection->Activate(ActionArg(ActionArg::SWITCHER, 0));
184 + selection->Activate(ActionArg(ActionArg::SWITCHER, is_quick));
185 }
186 }

is_quick is confusing here.

I say drop the boolean parameter and have

enum class RaiseBehaviour
{
    RaiseActive,
    RaiseAll
}

review: Needs Fixing

[Marco Trevisan (Treviño) (3v1n0)]

Thanks for the review, however I don't know if this is still wanted.
I need to ask design.

[Sam Spilsbury (smspillaz)]

Any updates?

[Marco Trevisan (Treviño) (3v1n0)]

I had a talk with design, but I don't get exactly what they want on this side...
I think I can delay it to after the feature freeze.

=== added directory 'manual-tests'
=== added file 'manual-tests/QuickAltTab.txt'
--- manual-tests/QuickAltTab.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/QuickAltTab.txt	2011-12-14 02:19:28 +0000
@@ -0,0 +1,17 @@
+Quick Alt+Tab
+-------------
+This test shows how the alt+tab works when pressed quickly
+
+#. Start on a clean screen
+#. Open two windows of the same application (i.e. gnome-terminal)
+#. Open another window of another application (i.e. gedit)
+#. Focus a gnome-terminal window
+#. Quickly press Alt+Tab
+#. The gedit window should be now on focus
+#. Press again Alt+Tab
+
+Outcome
+  The gnome-terminal window that had been in focus before should be brought to
+  focus again. The second gnome-terminal window should below the gnome-terminal
+  and gedit windows. The same should happen if the gnome-terminal windows are
+  in different workspaces.

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2011-10-14 11:11:27 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2011-12-14 02:19:28 +0000
@@ -625,8 +625,18 @@
     }
   }
   else
-    WindowManager::Default()->FocusWindowGroup(windows,
-      WindowManager::FocusVisibility::OnlyVisible);
+  {
+    if (arg.button == 0)
+    {
+      WindowManager::Default()->FocusWindowGroup(windows,
+        WindowManager::FocusVisibility::OnlyVisible);
+    }
+    else
+    {
+      WindowManager::Default()->FocusWindowGroup(windows,
+        WindowManager::FocusVisibility::OnlyVisibleOnTop);
+    }
+  }
 }
 
 bool BamfLauncherIcon::Spread(int state, bool force)

=== modified file 'plugins/unityshell/src/PluginAdapter.cpp'
--- plugins/unityshell/src/PluginAdapter.cpp	2011-10-14 11:11:27 +0000
+++ plugins/unityshell/src/PluginAdapter.cpp	2011-12-14 02:19:28 +0000
@@ -568,7 +568,7 @@
     window->lower();
 }
 
-void 
+void
 PluginAdapter::FocusWindowGroup(std::vector<Window> window_ids, FocusVisibility focus_visibility)
 {
   CompPoint target_vp = m_Screen->vp();
@@ -603,50 +603,63 @@
       break;
   }
 
-  if (!any_on_current)
+  if (!any_on_current || focus_visibility == FocusVisibility::OnlyVisibleOnTop)
   {
-    for (auto it = windows.rbegin(); it != windows.rend(); it++)
+    for (auto it = windows.rbegin(); it != windows.rend(); ++it)
     {
-      if ((any_mapped && !(*it)->minimized()) || !any_mapped)
+      CompWindow* win = *it;
+      if ((any_mapped && !win->minimized()) || !any_mapped)
       {
-        target_vp = (*it)->defaultViewport();
+        if (focus_visibility == FocusVisibility::OnlyVisibleOnTop)
+        {
+          win->raise();
+          top_win = win;
+        }
+        else
+        {
+          target_vp = win->defaultViewport();
+        }
+
         break;
       }
     }
   }
 
-  for (CompWindow* &win : windows)
+  if (focus_visibility != FocusVisibility::OnlyVisibleOnTop)
   {
-    if (win->defaultViewport() == target_vp)
+    for (CompWindow* &win : windows)
     {
-       /* Any window which is actually unmapped is
+      if (win->defaultViewport() == target_vp)
+      {
+        /* Any window which is actually unmapped is
         * not going to be accessible by either switcher
         * or scale, so unconditionally unminimize those
         * windows when the launcher icon is activated */
-       if ((focus_visibility == WindowManager::FocusVisibility::ForceUnminimizeOnCurrentDesktop &&
-            WindowManager::Default ()->IsWindowOnCurrentDesktop(win->id ())) ||
-            (focus_visibility == WindowManager::FocusVisibility::ForceUnminimizeInvisible &&
+        if ((focus_visibility == FocusVisibility::ForceUnminimizeOnCurrentDesktop &&
+             WindowManager::Default()->IsWindowOnCurrentDesktop(win->id())) ||
+            (focus_visibility == FocusVisibility::ForceUnminimizeInvisible &&
              win->mapNum () == 0))
-       {
-         bool is_mapped = win->mapNum () != 0;
-         top_win = win;
-         win->unminimize ();
-
-         forced_unminimize = true;
-
-         /* Initially minimized windows dont get raised */
-         if (!is_mapped)
-           win->raise ();
-       }
-       else if ((any_mapped && !win->minimized()) || !any_mapped)
-       {
-         if (!forced_unminimize ||
-             WindowManager::Default ()->IsWindowOnCurrentDesktop (win->id ()))
-         {
-           win->raise();
-           top_win = win;
-         }
-       }
+        {
+          bool is_mapped = win->mapNum() != 0;
+          win->unminimize();
+          top_win = win;
+
+          forced_unminimize = true;
+
+          /* Initially minimized windows dont get raised */
+          if (!is_mapped)
+            win->raise();
+        }
+        else if ((any_mapped && !win->minimized()) || !any_mapped)
+        {
+          if (!forced_unminimize ||
+              WindowManager::Default()->IsWindowOnCurrentDesktop(win->id()))
+          {
+            win->raise();
+            top_win = win;
+          }
+        }
+      }
     }
   }
 

=== modified file 'plugins/unityshell/src/SwitcherController.cpp'
--- plugins/unityshell/src/SwitcherController.cpp	2011-10-02 21:28:52 +0000
+++ plugins/unityshell/src/SwitcherController.cpp	2011-12-14 02:19:28 +0000
@@ -183,20 +183,25 @@
     AbstractLauncherIcon* selection = model_->Selection();
     if (selection)
     {
+      /* Instead of defining a new type of ActionArg we only use the "button"
+       * ActionArg value to indicate to the view if we're performing a quick
+       * switch or not.                                                      */
+      unsigned int is_quick = (view_window_ && view_window_->IsVisible()) ? 0 : 1;
+
       if (model_->detail_selection)
       {
-        selection->Activate(ActionArg(ActionArg::SWITCHER, 0, model_->DetailSelectionWindow ()));
+        selection->Activate(ActionArg(ActionArg::SWITCHER, is_quick, model_->DetailSelectionWindow ()));
       }
       else
       {
         if (selection->GetQuirk (AbstractLauncherIcon::QUIRK_ACTIVE) &&
             !model_->DetailXids().empty ())
         {
-          selection->Activate(ActionArg (ActionArg::SWITCHER, 0, model_->DetailXids()[0]));
+          selection->Activate(ActionArg (ActionArg::SWITCHER, is_quick, model_->DetailXids()[0]));
         }
         else
         {
-          selection->Activate(ActionArg(ActionArg::SWITCHER, 0));
+          selection->Activate(ActionArg(ActionArg::SWITCHER, is_quick));
         }
       }
     }

=== modified file 'plugins/unityshell/src/WindowManager.h'
--- plugins/unityshell/src/WindowManager.h	2011-10-14 11:11:27 +0000
+++ plugins/unityshell/src/WindowManager.h	2011-12-14 02:19:28 +0000
@@ -48,6 +48,7 @@
   enum class FocusVisibility
   {
     OnlyVisible,
+    OnlyVisibleOnTop,
     ForceUnminimizeInvisible,
     ForceUnminimizeOnCurrentDesktop
   };