Merge lp:~3v1n0/unity/switcher-first-selection-mode into lp:unity

[Marco Trevisan (Treviño)]

SwitcherController: add first selection mode property, to decide what to select at first

Add option to have Switcher strictly between applications, and not select the previously focused window as first selection (even if that window part of the same application)

Add option to have Switcher strictly between applications, and not select the previously focused window as first selection (even if that window part of the same application)

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

Ok, looks good.
Thanks ;)

review: Approve

[Gerry Boland (gerboland)]

Hmm, it not working right. /me shouldn't code in bed.

[Gerry Boland (gerboland)]

Works well for me! Code looks fine to me, but I'm not an expert in this codebase

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3919
http://jenkins.qa.ubuntu.com/job/unity-ci/1179/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-amd64-ci/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-armhf-ci/66
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-vivid-i386-ci/66

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1179/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Ok, code looks good.

review: Approve

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2014-03-26 03:09:23 +0000
+++ launcher/SwitcherController.cpp	2015-04-03 15:46:57 +0000
@@ -73,14 +73,15 @@
   : detail([this] { return impl_->model_ && impl_->model_->detail_selection(); },
            [this] (bool d) { if (impl_->model_) { impl_->model_->detail_selection = d; } return false; })
   , detail_mode([this] { return detail_mode_; })
+  , first_selection_mode(FirstSelectionMode::LAST_ACTIVE_VIEW)
+  , show_desktop_disabled(false)
+  , mouse_disabled(false)
   , timeout_length(0)
   , detail_on_timeout(true)
   , detail_timeout_length(500)
   , initial_detail_timeout_length(1500)
   , visible_(false)
   , monitor_(0)
-  , show_desktop_disabled_(false)
-  , mouse_disabled_(false)
   , detail_mode_(DetailMode::TAB_NEXT_WINDOW)
   , impl_(new Controller::Impl(this, 20, create_window))
 {}
@@ -91,7 +92,7 @@
 
 bool Controller::CanShowSwitcher(const std::vector<AbstractLauncherIcon::Ptr>& results) const
 {
-  bool empty = (IsShowDesktopDisabled() ? results.empty() : results.size() == 1);
+  bool empty = (show_desktop_disabled() ? results.empty() : results.size() == 1);
   return (!empty && !WindowManager::Default().IsWallActive());
 }
 
@@ -202,29 +203,9 @@
   return impl_->ExternalRenderTargets();
 }
 
-bool Controller::IsShowDesktopDisabled() const
-{
-  return show_desktop_disabled_;
-}
-
-void Controller::SetShowDesktopDisabled(bool disabled)
-{
-  show_desktop_disabled_ = disabled;
-}
-
-bool Controller::IsMouseDisabled() const
-{
-  return mouse_disabled_;
-}
-
-void Controller::SetMouseDisabled(bool disabled)
-{
-  mouse_disabled_ = disabled;
-}
-
 int Controller::StartIndex() const
 {
-  return (IsShowDesktopDisabled() ? 0 : 1);
+  return (show_desktop_disabled() ? 0 : 1);
 }
 
 Selection Controller::GetCurrentSelection() const
@@ -265,8 +246,10 @@
   .add("detail_timeout_length", detail_timeout_length())
   .add("visible", visible_)
   .add("monitor", monitor_)
-  .add("show_desktop_disabled", show_desktop_disabled_)
-  .add("detail_mode", static_cast<int>(detail_mode_));
+  .add("show_desktop_disabled", show_desktop_disabled())
+  .add("mouse_disabled", mouse_disabled())
+  .add("detail_mode", static_cast<unsigned>(detail_mode_))
+  .add("first_selection_mode", static_cast<unsigned>(first_selection_mode()));
 }
 
 
@@ -717,6 +700,12 @@
     return;
   }
 
+  if (obj_->first_selection_mode == FirstSelectionMode::LAST_ACTIVE_APP)
+  {
+    model_->Select(second);
+    return;
+  }
+
   uint64_t first_highest = 0;
   uint64_t first_second = 0; // first icons second highest active
   uint64_t second_first = 0; // second icons first highest active
 
=== modified file 'launcher/SwitcherController.h'
--- launcher/SwitcherController.h	2014-03-04 00:42:49 +0000
+++ launcher/SwitcherController.h	2015-04-03 15:46:57 +0000
@@ -56,6 +56,11 @@
   TAB_NEXT_TILE,
 };
 
+enum class FirstSelectionMode
+{
+  LAST_ACTIVE_VIEW,
+  LAST_ACTIVE_APP
+};
 
 /**
  * Represents a selected application+window to be switched to.
@@ -109,12 +114,6 @@
 
   ui::LayoutWindow::Vector const& ExternalRenderTargets() const;
 
-  bool IsShowDesktopDisabled() const;
-  void SetShowDesktopDisabled(bool disabled);
-
-  bool IsMouseDisabled() const;
-  void SetMouseDisabled(bool disabled);
-
   int StartIndex() const;
   double Opacity() const;
 
@@ -128,6 +127,9 @@
 
   nux::RWProperty<bool> detail;
   nux::ROProperty<DetailMode> detail_mode;
+  nux::Property<FirstSelectionMode> first_selection_mode;
+  nux::Property<bool> show_desktop_disabled;
+  nux::Property<bool> mouse_disabled;
   nux::Property<int>  timeout_length;
   nux::Property<bool> detail_on_timeout;
   nux::Property<int>  detail_timeout_length;
@@ -136,8 +138,6 @@
 private:
   bool       visible_;
   int        monitor_;
-  bool       show_desktop_disabled_;
-  bool       mouse_disabled_;
   DetailMode detail_mode_;
 
   ImplPtr    impl_;
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2015-03-05 16:35:54 +0000
+++ plugins/unityshell/src/unityshell.cpp	2015-04-03 15:46:57 +0000
@@ -350,6 +350,7 @@
      optionSetDashTapDurationNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetAltTabTimeoutNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetAltTabBiasViewportNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
+     optionSetSwitchStrictlyBetweenApplicationsNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetDisableShowDesktopNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetDisableMouseNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
 
@@ -359,10 +360,8 @@
      optionSetAltTabForwardAllTerminate(boost::bind(&UnityScreen::altTabTerminateCommon, this, _1, _2, _3));
      optionSetAltTabPrevAllInitiate(boost::bind(&UnityScreen::altTabPrevAllInitiate, this, _1, _2, _3));
      optionSetAltTabPrevInitiate(boost::bind(&UnityScreen::altTabPrevInitiate, this, _1, _2, _3));
-
      optionSetAltTabNextWindowInitiate(boost::bind(&UnityScreen::altTabNextWindowInitiate, this, _1, _2, _3));
      optionSetAltTabNextWindowTerminate(boost::bind(&UnityScreen::altTabTerminateCommon, this, _1, _2, _3));
-
      optionSetAltTabPrevWindowInitiate(boost::bind(&UnityScreen::altTabPrevWindowInitiate, this, _1, _2, _3));
 
      optionSetLauncherSwitcherForwardInitiate(boost::bind(&UnityScreen::launcherSwitcherForwardInitiate, this, _1, _2, _3));
@@ -1985,7 +1984,7 @@
   if (event->type == MapRequest)
     ShowdesktopHandler::AllowLeaveShowdesktopMode(event->xmaprequest.window);
 
-  if (switcher_controller_->IsMouseDisabled() && switcher_controller_->Visible() &&
+  if (switcher_controller_->Visible() && switcher_controller_->mouse_disabled() &&
       (event->type == MotionNotify || event->type == ButtonPress || event->type == ButtonRelease))
   {
     skip_other_plugins = true;
@@ -2231,14 +2230,8 @@
 {
   if (!grab_index_)
   {
-    if (switcher_controller_->IsMouseDisabled())
-    {
-      grab_index_ = screen->pushGrab (screen->invisibleCursor(), "unity-switcher");
-    }
-    else
-    {
-      grab_index_ = screen->pushGrab (screen->normalCursor(), "unity-switcher");
-    }
+    auto cursor = switcher_controller_->mouse_disabled() ? screen->invisibleCursor() : screen->normalCursor();
+    grab_index_ = screen->pushGrab(cursor, "unity-switcher");
   }
 
   launcher_controller_->ClearTooltips();
@@ -2270,7 +2263,7 @@
   }
 
   auto results = launcher_controller_->GetAltTabIcons(show_mode == switcher::ShowMode::CURRENT_VIEWPORT,
-                                                      switcher_controller_->IsShowDesktopDisabled());
+                                                      switcher_controller_->show_desktop_disabled());
 
   if (switcher_controller_->CanShowSwitcher(results))
     switcher_controller_->Show(show_mode, switcher::SortMode::FOCUS_ORDER, results);
@@ -3575,11 +3568,16 @@
     case UnityshellOptions::AltTabBiasViewport:
       PluginAdapter::Default().bias_active_to_viewport = optionGetAltTabBiasViewport();
       break;
+    case UnityshellOptions::SwitchStrictlyBetweenApplications:
+      switcher_controller_->first_selection_mode = optionGetSwitchStrictlyBetweenApplications() ?
+                                                   switcher::FirstSelectionMode::LAST_ACTIVE_APP :
+                                                   switcher::FirstSelectionMode::LAST_ACTIVE_VIEW;
+      break;
     case UnityshellOptions::DisableShowDesktop:
-      switcher_controller_->SetShowDesktopDisabled(optionGetDisableShowDesktop());
+      switcher_controller_->show_desktop_disabled = optionGetDisableShowDesktop();
       break;
     case UnityshellOptions::DisableMouse:
-      switcher_controller_->SetMouseDisabled(optionGetDisableMouse());
+      switcher_controller_->mouse_disabled = optionGetDisableMouse();
       break;
     case UnityshellOptions::ShowMinimizedWindows:
       compiz::CompizMinimizedWindowHandler<UnityScreen, UnityWindow>::setFunctions (optionGetShowMinimizedWindows ());
 
=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2014-04-07 03:21:46 +0000
+++ plugins/unityshell/unityshell.xml.in	2015-04-03 15:46:57 +0000
@@ -565,6 +565,12 @@
                     <passive_grab>false</passive_grab>
                 </option>
 
+                <option name="switch_strictly_between_applications" type="bool">
+                    <_short>Switcher strictly changes between applications</_short>
+                    <_long>Disables the last focused window being the first entry in the Switcher, so Switcher strictly switches between applications</_long>
+                    <default>false</default>
+                </option>
+
                 <option name="show_minimized_windows" type="bool">
                     <_short>Show live previews of windows in the Switcher</_short>
                     <_long>Enables miniature live window previews in the Switcher.</_long>
 
=== modified file 'tests/MockSwitcherController.h'
--- tests/MockSwitcherController.h	2014-03-04 00:42:49 +0000
+++ tests/MockSwitcherController.h	2015-04-03 15:46:57 +0000
@@ -52,8 +52,6 @@
   MOCK_METHOD0(SelectFirstItem, void());
   MOCK_METHOD2(SetWorkspace, void(nux::Geometry, int));
   MOCK_CONST_METHOD0(ExternalRenderTargets, unity::ui::LayoutWindow::Vector const&());
-  MOCK_CONST_METHOD0(IsShowDesktopDisabled, bool());
-  MOCK_METHOD1(SetShowDesktopDisabled, void(bool));
   MOCK_CONST_METHOD0(StartIndex, int());
 };
 }
 
=== modified file 'tests/test_switcher_controller.cpp'
--- tests/test_switcher_controller.cpp	2014-03-03 22:49:48 +0000
+++ tests/test_switcher_controller.cpp	2015-04-03 15:46:57 +0000
@@ -171,9 +171,7 @@
 {
   EXPECT_CALL(*mock_window_, ShowWindow(true, _)).Times(AtLeast(1));
 
-  controller_->SetShowDesktopDisabled(true);
-  ASSERT_TRUE(controller_->IsShowDesktopDisabled());
-
+  controller_->show_desktop_disabled = true;
   controller_->Show(ShowMode::ALL, SortMode::LAUNCHER_ORDER, icons_);
   Utils::WaitUntilMSec([this] { return controller_->Visible(); });
   ASSERT_TRUE(controller_->StartIndex() == 0);
@@ -187,7 +185,7 @@
 
 TEST_F(TestSwitcherController, ShowSwitcherNoResults)
 {
-  controller_->SetShowDesktopDisabled(true);
+  controller_->show_desktop_disabled = true;
   std::vector<unity::launcher::AbstractLauncherIcon::Ptr> results;
   EXPECT_CALL(*mock_window_, ShowWindow(true, _)).Times(0);