Merge lp:~3v1n0/unity/spread-app-windows into lp:unity

[Marco Trevisan (Treviño)]

UnityScreen: add SpreadAppWindows option and trigger it on Super+Ctrl+[Shift]+W

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4033
http://jenkins.qa.ubuntu.com/job/unity-ci/1324/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/100
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/100/console

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

review: Needs Fixing (continuous-integration)

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2015-10-16 08:45:44 +0000
+++ plugins/unityshell/src/unityshell.cpp	2015-10-28 09:25:56 +0000
@@ -381,6 +381,8 @@
      optionSetPanelFirstMenuInitiate(boost::bind(&UnityScreen::showPanelFirstMenuKeyInitiate, this, _1, _2, _3));
      optionSetPanelFirstMenuTerminate(boost::bind(&UnityScreen::showPanelFirstMenuKeyTerminate, this, _1, _2, _3));
      optionSetPanelFirstMenuNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
+     optionSetSpreadAppWindowsInitiate(boost::bind(&UnityScreen::spreadAppWindowsInitiate, this, _1, _2, _3));
+     optionSetSpreadAppWindowsAnywhereInitiate(boost::bind(&UnityScreen::spreadAppWindowsAnywhereInitiate, this, _1, _2, _3));
      optionSetAutomaximizeValueNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetDashTapDurationNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetAltTabTimeoutNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
@@ -2106,7 +2108,7 @@
     action->setState(action->state() | CompAction::StateTermKey);
 
   super_keypressed_ = true;
-  int when = options[7].value().i();  // XEvent time in millisec
+  int when = CompOption::getIntOptionNamed(options, "time");
   launcher_controller_->HandleLauncherKeyPress(when);
   EnsureSuperKeybindings ();
 
@@ -2138,7 +2140,7 @@
   bool was_tap = state & CompAction::StateTermTapped;
   bool tap_handled = false;
   LOG_DEBUG(logger) << "Super released: " << (was_tap ? "tapped" : "released");
-  int when = options[7].value().i();  // XEvent time in millisec
+  int when = CompOption::getIntOptionNamed(options, "time");
 
   // hack...if the scale just wasn't activated AND the 'when' time is within time to start the
   // dash then assume was_tap is also true, since the ScalePlugin doesn't accept that state...
@@ -2209,7 +2211,7 @@
   /* In order to avoid too many events when keeping the keybinding pressed,
    * that would make the unity-panel-service to go crazy (see bug #948522)
    * we need to filter them, just considering an event every 750 ms */
-  int event_time = options[7].value().i();  // XEvent time in millisec
+  int event_time = CompOption::getIntOptionNamed(options, "time");
 
   if (event_time - first_menu_keypress_time_ < 750)
   {
@@ -2279,6 +2281,38 @@
   return true;
 }
 
+void UnityScreen::SpreadAppWindows(bool anywhere)
+{
+  if (ApplicationPtr const& active_app = ApplicationManager::Default().GetActiveApplication())
+  {
+    std::vector<Window> windows;
+
+    for (auto& window : active_app->GetWindows())
+    {
+      if (anywhere || WM.IsWindowOnCurrentDesktop(window->window_id()))
+        windows.push_back(window->window_id());
+    }
+
+    WM.ScaleWindowGroup(windows, 0, true);
+  }
+}
+
+bool UnityScreen::spreadAppWindowsInitiate(CompAction* action,
+                                           CompAction::State state,
+                                           CompOption::Vector& options)
+{
+  SpreadAppWindows(false);
+  return true;
+}
+
+bool UnityScreen::spreadAppWindowsAnywhereInitiate(CompAction* action,
+                                                   CompAction::State state,
+                                                   CompOption::Vector& options)
+{
+  SpreadAppWindows(true);
+  return true;
+}
+
 bool UnityScreen::setKeyboardFocusKeyInitiate(CompAction* action,
                                               CompAction::State state,
                                               CompOption::Vector& options)
@@ -2632,7 +2666,7 @@
   // to receive the Terminate event
   if (state & CompAction::StateInitKey)
     action->setState(action->state() | CompAction::StateTermKey);
-  hud_keypress_time_ = options[7].value().i();  // XEvent time in millisec
+  hud_keypress_time_ = CompOption::getIntOptionNamed(options, "time");
 
   // pass key through
   return false;
@@ -2653,7 +2687,7 @@
   if (!(state & CompAction::StateTermTapped))
     return false;
 
-  int release_time = options[7].value().i();  // XEvent time in millisec
+  int release_time = CompOption::getIntOptionNamed(options, "time");
   int tap_duration = release_time - hud_keypress_time_;
   if (tap_duration > local::ALT_TAP_DURATION)
   {
@@ -3886,9 +3920,9 @@
     screen->removeAction(&action);
 
   // We notify that super/alt have been released, to avoid to leave unity in inconsistent state
-  CompOption::Vector options(8);
-  options[7].setName("time", CompOption::TypeInt);
-  options[7].value().set<int>(screen->getCurrentTime());
+  CompOption::Vector options(1);
+  options.back().setName("time", CompOption::TypeInt);
+  options.back().value().set<int>(screen->getCurrentTime());
 
   showLauncherKeyTerminate(&optionGetShowLauncher(), CompAction::StateTermKey, options);
   showMenuBarTerminate(&optionGetShowMenuBar(), CompAction::StateTermKey, options);
 
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2015-05-12 13:10:07 +0000
+++ plugins/unityshell/src/unityshell.h	2015-10-28 09:25:56 +0000
@@ -185,6 +185,8 @@
 
   bool executeCommand(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool showDesktopKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
+  bool spreadAppWindowsInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
+  bool spreadAppWindowsAnywhereInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool setKeyboardFocusKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
 
   bool altTabInitiateCommon(CompAction* action, switcher::ShowMode mode);
@@ -318,6 +320,7 @@
   void DamageBlurUpdateRegion(nux::Geometry const&);
 
   void ShowFirstRunHints();
+  void SpreadAppWindows(bool anywhere);
 
   std::unique_ptr<na::TickSource> tick_source_;
   std::unique_ptr<na::AnimationController> animation_controller_;
 
=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2015-05-12 13:09:57 +0000
+++ plugins/unityshell/unityshell.xml.in	2015-10-28 09:25:56 +0000
@@ -87,6 +87,18 @@
                     <default>&lt;Alt&gt;F10</default>
                 </option>
 
+                <option name="spread_app_windows" type="key">
+                    <_short>Key to spread the current application windows</_short>
+                    <_long>Initiate the window Spread for the current application windows.</_long>
+                    <default>&lt;Control&gt;&lt;Super&gt;w</default>
+                </option>
+
+                <option name="spread_app_windows_anywhere" type="key">
+                    <_short>Key to spread the current application windows in any workspace</_short>
+                    <_long>Initiate the window Spread for the current application windows, for the all the windows.</_long>
+                    <default>&lt;Control&gt;&lt;Super&gt;&lt;Shift&gt;w</default>
+                </option>
+
                 <option name="panel_opacity" type="float">
                     <_short>Panel Opacity</_short>
                     <_long>The opacity of the Panel background.</_long>
 
=== modified file 'shortcuts/CompizShortcutModeller.cpp'
--- shortcuts/CompizShortcutModeller.cpp	2014-09-10 17:19:16 +0000
+++ shortcuts/CompizShortcutModeller.cpp	2015-10-28 09:25:56 +0000
@@ -68,6 +68,8 @@
   const std::string UNITYSHELL_OPTION_LAUNCHER_SWITCHER_FORWARD = "launcher_switcher_forward";
   const std::string UNITYSHELL_OPTION_SHOW_HUD = "show_hud";
   const std::string UNITYSHELL_OPTION_PANEL_FIRST_MENU = "panel_first_menu";
+  const std::string UNITYSHELL_OPTION_SPREAD_APP_WINDOWS = "spread_app_windows";
+  const std::string UNITYSHELL_OPTION_SPREAD_APP_WINDOWS_ANYWHERE = "spread_app_windows_anywhere";
   const std::string UNITYSHELL_OPTION_ALT_TAB_FORWARD = "alt_tab_forward";
   const std::string UNITYSHELL_OPTION_ALT_TAB_FORWARD_ALL = "alt_tab_forward_all";
   const std::string UNITYSHELL_OPTION_ALT_TAB_NEXT_WINDOW = "alt_tab_next_window";
@@ -316,6 +318,23 @@
   }
 
   hints.push_back(std::make_shared<shortcut::Hint>(windows, "", "",
+                                                   (ws_enabled ?
+                                                    _("Spreads all windows of the focused application in the current workspace.") :
+                                                    _("Spreads all windows of the focused application.")),
+                                                   shortcut::OptionType::COMPIZ_KEY,
+                                                   UNITYSHELL_PLUGIN_NAME,
+                                                   UNITYSHELL_OPTION_SPREAD_APP_WINDOWS));
+
+  if (ws_enabled)
+  {
+    hints.push_back(std::make_shared<shortcut::Hint>(windows, "", "",
+                                                     _("Spreads all windows of the focused application in all the workspaces."),
+                                                     shortcut::OptionType::COMPIZ_KEY,
+                                                     UNITYSHELL_PLUGIN_NAME,
+                                                     UNITYSHELL_OPTION_SPREAD_APP_WINDOWS_ANYWHERE));
+  }
+
+  hints.push_back(std::make_shared<shortcut::Hint>(windows, "", "",
                                                    _("Minimises all windows."),
                                                    shortcut::OptionType::COMPIZ_KEY,
                                                    CORE_PLUGIN_NAME,
 
=== modified file 'unity-shared/GnomeKeyGrabber.cpp'
--- unity-shared/GnomeKeyGrabber.cpp	2015-10-01 03:52:09 +0000
+++ unity-shared/GnomeKeyGrabber.cpp	2015-10-28 09:25:56 +0000
@@ -64,11 +64,6 @@
 std::string const DBUS_NAME = "com.canonical.Unity.Test.GnomeKeyGrabber";
 }
 
-namespace
-{
-inline int compiz_event_timestamp(CompOption::Vector& options) { return options[7].value().i(); }
-}
-
 GnomeGrabber::Impl::Impl(bool test_mode)
   : screen_(screen)
   , shell_server_(test_mode ? testing::DBUS_NAME : shell::DBUS_NAME)
@@ -224,7 +219,7 @@
     action.setState(CompAction::StateInitKey);
     action.setInitiate([this, action_id](CompAction* action, CompAction::State state, CompOption::Vector& options) {
       LOG_DEBUG(logger) << "pressed \"" << action->keyToString() << "\"";
-      ActivateDBusAction(*action, action_id, 0, compiz_event_timestamp(options));
+      ActivateDBusAction(*action, action_id, 0, CompOption::getIntOptionNamed(options, "time"));
       return true;
     });
   }
@@ -239,7 +234,7 @@
       if (state & CompAction::StateTermTapped)
       {
         LOG_DEBUG(logger) << "tapped \"" << key << "\"";
-        ActivateDBusAction(*action, action_id, 0, compiz_event_timestamp(options));
+        ActivateDBusAction(*action, action_id, 0, CompOption::getIntOptionNamed(options, "time"));
         return true;
       }