Merge lp:~townsend/unity/fix-lp1251777.2 into lp:unity

[Christopher Townsend]

* Revert most of lp:unity revno. 3509 as the Compiz Grid plugin is a better place to handle the Ctrl-Super-Left/Right shortcuts.
* Expanded autopilot test to check for correct window placement when semi-maximizing and restoring.

= Issue =
Due to revno. 3509, when vertically semi-maximizing a window using Ctrl-Super-Left/Right and then restoring the window, the window would not return to the same place and correct size.

= Fix =
It is better to have the Compiz Grid plugin handle this since it already handles semi-maximizing windows and duplicating code in Unity is not a worthy exercise. This basically reverts most of revno. 3509 except the test_wm_shortcuts Autopilot tests.

= Test =
Added testing of correct window placement in the semi-maximize/restore Autopilot test.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3607
http://jenkins.qa.ubuntu.com/job/unity-ci/523/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/57

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

review: Approve (continuous-integration)

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

Goodbye code!

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-11-20 21:39:40 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-12-04 19:57:31 +0000
@@ -352,9 +352,6 @@
      optionSetLauncherSwitcherPrevInitiate(boost::bind(&UnityScreen::launcherSwitcherPrevInitiate, this, _1, _2, _3));
      optionSetLauncherSwitcherForwardTerminate(boost::bind(&UnityScreen::launcherSwitcherTerminate, this, _1, _2, _3));
 
-     optionSetWindowRightMaximizeInitiate(boost::bind(&UnityScreen::rightMaximizeKeyInitiate, this, _1, _2, _3));
-     optionSetWindowLeftMaximizeInitiate(boost::bind(&UnityScreen::leftMaximizeKeyInitiate, this, _1, _2, _3));
-
      optionSetStopVelocityNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetRevealPressureNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetEdgeResponsivenessNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
@@ -2274,20 +2271,6 @@
   return true;
 }
 
-bool UnityScreen::rightMaximizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
-{
-  auto& WM = WindowManager::Default();
-  WM.RightMaximize(WM.GetActiveWindow());
-  return true;
-}
-
-bool UnityScreen::leftMaximizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
-{
-  auto& WM = WindowManager::Default();
-  WM.LeftMaximize(WM.GetActiveWindow());
-  return true;
-}
-
 void UnityScreen::OnLauncherStartKeyNav(GVariant* data)
 {
   // Put the launcher BaseWindow at the top of the BaseWindow stack. The
@@ -3682,10 +3665,6 @@
     .add("xid", (uint64_t)xid)
     .add("title", wm.GetWindowName(xid))
     .add("fake_decorated", uScreen->fake_decorated_windows_.find(this) != uScreen->fake_decorated_windows_.end())
-    .add("maximized", wm.IsWindowVerticallyMaximized(xid))
-    .add("horizontally_maximized", wm.IsWindowHorizontallyMaximized(xid))
-    .add("vertically_maximized", wm.IsWindowVerticallyMaximized(xid))
-    .add("minimized", wm.IsWindowMinimized(xid))
     .add("scaled", scaled)
     .add("scaled_close_geo", close_button_geo_)
     .add("scaled_close_x", close_button_geo_.x)

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2013-11-20 21:39:40 +0000
+++ plugins/unityshell/src/unityshell.h	2013-12-04 19:57:31 +0000
@@ -179,8 +179,6 @@
   bool launcherSwitcherForwardInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool launcherSwitcherPrevInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool launcherSwitcherTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options);
-  bool rightMaximizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
-  bool leftMaximizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
 
   /* handle option changes and change settings inside of the
    * panel and dock views */

=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2013-09-29 23:26:29 +0000
+++ plugins/unityshell/unityshell.xml.in	2013-12-04 19:57:31 +0000
@@ -68,18 +68,6 @@
                     <default>&lt;Alt&gt;F10</default>
                 </option>
 
-                <option name="window_right_maximize" type="key">
-                    <_short>Key to vertically maximize the focused window to the right</_short>
-                    <_long>Semi-maximize vertically the focused window on the half right width of the screen</_long>
-                    <default>&lt;Control&gt;&lt;Super&gt;Right</default>
-                </option>
-
-                <option name="window_left_maximize" type="key">
-                    <_short>Key to vertically maximize the focused window to the left</_short>
-                    <_long>Semi-maximize vertically the focused window to the half left width of the screen</_long>
-                    <default>&lt;Control&gt;&lt;Super&gt;Left</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	2013-09-16 14:18:57 +0000
+++ shortcuts/CompizShortcutModeller.cpp	2013-12-04 19:57:31 +0000
@@ -32,6 +32,7 @@
   // Compiz' plug-in names
   const std::string CORE_PLUGIN_NAME = "core";
   const std::string EXPO_PLUGIN_NAME = "expo";
+  const std::string GRID_PLUGIN_NAME = "grid";
   const std::string MOVE_PLUGIN_NAME = "move";
   const std::string RESIZE_PLUGIN_NAME = "resize";
   const std::string SCALE_PLUGIN_NAME = "scale";
@@ -48,6 +49,9 @@
   // Compiz Expo Options
   const std::string EXPO_OPTION_EXPO_KEY = "expo_key";
 
+  // Compiz Grid Options
+  const std::string GRID_OPTION_LEFT_MAXIMIZE = "left_maximize";
+
   // Compiz Move Options
   const std::string MOVE_OPTION_INITIATE_BUTTON = "initiate_button";
 
@@ -65,10 +69,6 @@
   const std::string UNITYSHELL_OPTION_PANEL_FIRST_MENU = "panel_first_menu";
   const std::string UNITYSHELL_OPTION_ALT_TAB_FORWARD = "alt_tab_forward";
   const std::string UNITYSHELL_OPTION_ALT_TAB_NEXT_WINDOW = "alt_tab_next_window";
-  const std::string UNITYSHELL_OPTION_MAXIMIZE = "window_maximize";
-  const std::string UNITYSHELL_OPTION_LEFT_MAXIMIZE = "window_left_maximize";
-  const std::string UNITYSHELL_OPTION_RIGHT_MAXIMIZE = "window_right_maximize";
-  const std::string UNITYSHELL_OPTION_RESTORE_MINIMIZE = "window_restore_minimize";
 
   // Compiz Wall Options
   const std::string WALL_OPTION_LEFT_KEY = "left_key";
@@ -315,8 +315,8 @@
   hints.push_back(std::make_shared<shortcut::Hint>(windows, "", _(" or Right"),
                                                    _("Semi-maximise the current window."),
                                                    shortcut::OptionType::COMPIZ_KEY,
-                                                   UNITYSHELL_PLUGIN_NAME,
-                                                   UNITYSHELL_OPTION_LEFT_MAXIMIZE));
+                                                   GRID_PLUGIN_NAME,
+                                                   GRID_OPTION_LEFT_MAXIMIZE));
 
   hints.push_back(std::make_shared<shortcut::Hint>(windows, "", "",
                                                    _("Closes the current window."),

=== modified file 'tests/autopilot/unity/tests/test_wm_keybindings.py'
--- tests/autopilot/unity/tests/test_wm_keybindings.py	2013-10-08 14:20:04 +0000
+++ tests/autopilot/unity/tests/test_wm_keybindings.py	2013-12-04 19:57:31 +0000
@@ -126,10 +126,18 @@
         if not self.start_restored:
             self.addCleanup(self.keybinding, "window/maximize")
             self.keybinding("window/restore")
+        (x1, y1, w1, h1) = self.screen_win.geometry
         self.keyboard.press_and_release("Ctrl+Super+Right")
         self.keybinding("window/restore")
+        (x2, y2, w2, h2) = self.screen_win.geometry
+
         self.assertThat(self.screen_win.vertically_maximized, Eventually(Equals(False)))
         self.assertThat(self.screen_win.minimized, Eventually(Equals(False)))
+        # Make sure the window restored to its same geometry before vertically maximizing
+        self.assertThat(x1, Equals(x2))
+        self.assertThat(y1, Equals(y2))
+        self.assertThat(w1, Equals(w2))
+        self.assertThat(h1, Equals(h2))
 
     def test_minimize_restored_window(self):
         if not self.start_restored:

=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2013-11-14 00:17:19 +0000
+++ unity-shared/PluginAdapter.cpp	2013-12-04 19:57:31 +0000
@@ -460,22 +460,6 @@
   return false;
 }
 
-bool PluginAdapter::IsWindowVerticallyMaximized(Window window_id) const
-{
-  if (CompWindow* window = m_Screen->findWindow(window_id))
-    return (window->state() & CompWindowStateMaximizedVertMask);
-
-  return false;
-}
-
-bool PluginAdapter::IsWindowHorizontallyMaximized(Window window_id) const
-{
-  if (CompWindow* window = m_Screen->findWindow(window_id))
-    return (window->state() & CompWindowStateMaximizedHorzMask);
-
-  return false;
-}
-
 unsigned long PluginAdapter::GetMwnDecorations(Window window_id) const
 {
   Display* display = m_Screen->dpy();
@@ -712,59 +696,6 @@
     window->maximize(MAXIMIZE_STATE);
 }
 
-void PluginAdapter::VerticallyMaximizeWindowAt(CompWindow* window, nux::Geometry const& geo)
-{
-  if (window && ((window->type() & CompWindowTypeNormalMask) ||
-      ((window->actions() & CompWindowActionMaximizeVertMask) &&
-        window->actions() & CompWindowActionResizeMask)))
-  {
-    /* First we unmaximize the Window */
-    if (window->state() & MAXIMIZE_STATE)
-      window->maximize(0);
-
-    /* Then we vertically maximize the it so it can be unminimized correctly */
-    if (!(window->state() & CompWindowStateMaximizedVertMask))
-      window->maximize(CompWindowStateMaximizedVertMask);
-
-    /* Then we resize and move it on the requested place */
-    MoveResizeWindow(window->id(), geo);
-  }
-}
-
-void PluginAdapter::LeftMaximize(Window window_id)
-{
-  CompWindow* window = m_Screen->findWindow(window_id);
-
-  if (!window)
-    return;
-
-  /* Let's compute the area where the window should stay */
-  CompRect workarea = m_Screen->getWorkareaForOutput(window->outputDevice());
-  nux::Geometry win_geo(workarea.x() + window->border().left,
-                        workarea.y() + window->border().top,
-                        workarea.width() / 2 - (window->border().left + window->border().right),
-                        workarea.height() - (window->border().top + window->border().bottom));
-
-  VerticallyMaximizeWindowAt(window, win_geo);
-}
-
-void PluginAdapter::RightMaximize(Window window_id)
-{
-  CompWindow* window = m_Screen->findWindow(window_id);
-
-  if (!window)
-    return;
-
-  /* Let's compute the area where the window should stay */
-  CompRect workarea = m_Screen->getWorkareaForOutput(window->outputDevice());
-  nux::Geometry win_geo(workarea.x() + workarea.width() / 2 + window->border().left,
-                        workarea.y() + window->border().top,
-                        workarea.width() / 2 - (window->border().left + window->border().right),
-                        workarea.height() - (window->border().top + window->border().bottom));
-
-  VerticallyMaximizeWindowAt(window, win_geo);
-}
-
 void PluginAdapter::Restore(Window window_id)
 {
   CompWindow* window = m_Screen->findWindow(window_id);

=== modified file 'unity-shared/PluginAdapter.h'
--- unity-shared/PluginAdapter.h	2013-09-19 20:43:30 +0000
+++ unity-shared/PluginAdapter.h	2013-12-04 19:57:31 +0000
@@ -130,8 +130,6 @@
 
   // WindowManager implementation
   bool IsWindowMaximized(Window window_id) const;
-  bool IsWindowVerticallyMaximized(Window window_id) const;
-  bool IsWindowHorizontallyMaximized(Window window_id) const;
   bool IsWindowDecorated(Window window_id) const;
   bool IsWindowOnCurrentDesktop(Window window_id) const;
   bool IsWindowObscured(Window window_id) const;
@@ -145,8 +143,6 @@
   bool HasWindowDecorations(Window window_id) const;
 
   void Maximize(Window window_id);
-  void LeftMaximize(Window window_id);
-  void RightMaximize(Window window_id);
   void Restore(Window window_id);
   void RestoreAt(Window window_id, int x, int y);
   void Minimize(Window window_id);
@@ -200,8 +196,6 @@
 
   Window GetTopWindowAbove(Window xid) const;
 
-  void MoveResizeWindow(guint32 xid, nux::Geometry geometry);
-
 protected:
   PluginAdapter(CompScreen* screen);
   void AddProperties(debug::IntrospectionData&);
@@ -221,8 +215,6 @@
   std::string GetUtf8Property(Window xid, Atom atom) const;
   std::vector<long> GetCardinalProperty(Window xid, Atom atom) const;
 
-  void VerticallyMaximizeWindowAt(CompWindow* window, nux::Geometry const& geo);
-
   CompScreen* m_Screen;
   MultiActionList m_ExpoActionList;
   MultiActionList m_ScaleActionList;

=== modified file 'unity-shared/StandaloneWindowManager.cpp'
--- unity-shared/StandaloneWindowManager.cpp	2013-11-14 00:17:19 +0000
+++ unity-shared/StandaloneWindowManager.cpp	2013-12-04 19:57:31 +0000
@@ -42,8 +42,7 @@
   , active(false)
   , mapped(true)
   , visible(true)
-  , v_maximized(false)
-  , h_maximized(false)
+  , maximized(false)
   , minimized(false)
   , decorated(true)
   , has_decorations(true)
@@ -67,20 +66,6 @@
 
     return false;
   });
-
-  maximized.SetGetterFunction([this] { return v_maximized && h_maximized; });
-  maximized.SetSetterFunction([this] (bool value) {
-    if (maximized() == value)
-      return false;
-
-    v_maximized = value;
-    h_maximized = value;
-    decorated = !value;
-    return true;
-  });
-
-  v_maximized.changed.connect([this] (bool value) { maximized.changed.emit(maximized()); });
-  h_maximized.changed.connect([this] (bool value) { maximized.changed.emit(maximized()); });
 }
 
 WindowManagerPtr create_window_manager()
@@ -139,24 +124,6 @@
   return false;
 }
 
-bool StandaloneWindowManager::IsWindowVerticallyMaximized(Window window_id) const
-{
-  auto window = GetWindowByXid(window_id);
-  if (window)
-    return window->v_maximized;
-
-  return false;
-}
-
-bool StandaloneWindowManager::IsWindowHorizontallyMaximized(Window window_id) const
-{
-  auto window = GetWindowByXid(window_id);
-  if (window)
-    return window->h_maximized;
-
-  return false;
-}
-
 bool StandaloneWindowManager::IsWindowDecorated(Window window_id) const
 {
   auto window = GetWindowByXid(window_id);
@@ -281,51 +248,20 @@
 {
   auto window = GetWindowByXid(window_id);
   if (window)
+  {
     window->maximized = true;
-}
-
-void StandaloneWindowManager::LeftMaximize(Window window_id)
-{
-  auto window = GetWindowByXid(window_id);
-
-  if (!window)
-    return;
-
-  /* Let's compute the area where the window should be put */
-  auto workarea = GetWorkAreaGeometry(window_id);
-  workarea.width /= 2;
-
-  if (window->maximized)
-    window->maximized = false;
-
-  window->v_maximized = true;
-  MoveResizeWindow(window_id, workarea);
-}
-
-void StandaloneWindowManager::RightMaximize(Window window_id)
-{
-  auto window = GetWindowByXid(window_id);
-
-  if (!window)
-    return;
-
-  /* Let's compute the area where the window should be put */
-  auto workarea = GetWorkAreaGeometry(window_id);
-  workarea.width /= 2;
-  workarea.x += workarea.width;
-
-  if (window->maximized)
-    window->maximized = false;
-
-  window->v_maximized = true;
-  MoveResizeWindow(window_id, workarea);
+    Undecorate(window_id);
+  }
 }
 
 void StandaloneWindowManager::Restore(Window window_id)
 {
   auto window = GetWindowByXid(window_id);
   if (window)
+  {
     window->maximized = false;
+    Decorate(window_id);
+  }
 }
 
 void StandaloneWindowManager::RestoreAt(Window window_id, int x, int y)

=== modified file 'unity-shared/StandaloneWindowManager.h'
--- unity-shared/StandaloneWindowManager.h	2013-11-14 00:17:19 +0000
+++ unity-shared/StandaloneWindowManager.h	2013-12-04 19:57:31 +0000
@@ -48,9 +48,7 @@
   nux::Property<bool> active;
   nux::Property<bool> mapped;
   nux::Property<bool> visible;
-  nux::RWProperty<bool> maximized;
-  nux::Property<bool> v_maximized;
-  nux::Property<bool> h_maximized;
+  nux::Property<bool> maximized;
   nux::Property<bool> minimized;
   nux::Property<bool> decorated;
   nux::Property<bool> has_decorations;
@@ -72,8 +70,6 @@
   std::vector<Window> GetWindowsInStackingOrder() const override;
 
   virtual bool IsWindowMaximized(Window window_id) const;
-  virtual bool IsWindowVerticallyMaximized(Window window_id) const;
-  virtual bool IsWindowHorizontallyMaximized(Window window_id) const;
   virtual bool IsWindowDecorated(Window window_id) const;
   virtual bool IsWindowOnCurrentDesktop(Window window_id) const;
   virtual bool IsWindowObscured(Window window_id) const;
@@ -90,8 +86,6 @@
   virtual bool InShowDesktop() const;
 
   virtual void Maximize(Window window_id);
-  virtual void LeftMaximize(Window window_id);
-  virtual void RightMaximize(Window window_id);
   virtual void Restore(Window window_id);
   virtual void RestoreAt(Window window_id, int x, int y);
   virtual void Minimize(Window window_id);

=== modified file 'unity-shared/WindowManager.h'
--- unity-shared/WindowManager.h	2013-11-14 00:17:19 +0000
+++ unity-shared/WindowManager.h	2013-12-04 19:57:31 +0000
@@ -77,9 +77,6 @@
   virtual std::vector<Window> GetWindowsInStackingOrder() const = 0;
 
   virtual bool IsWindowMaximized(Window window_id) const = 0;
-  virtual bool IsWindowVerticallyMaximized(Window window_id) const = 0;
-  virtual bool IsWindowHorizontallyMaximized(Window window_id) const = 0;
-  virtual bool IsWindowMaximizable(Window window_id) const = 0;
   virtual bool IsWindowDecorated(Window window_id) const = 0;
   virtual bool IsWindowOnCurrentDesktop(Window window_id) const = 0;
   virtual bool IsWindowObscured(Window window_id) const = 0;
@@ -89,14 +86,13 @@
   virtual bool IsWindowClosable(Window window_id) const = 0;
   virtual bool IsWindowMinimized(Window window_id) const = 0;
   virtual bool IsWindowMinimizable(Window window_id) const = 0;
+  virtual bool IsWindowMaximizable(Window window_id) const = 0;
   virtual bool HasWindowDecorations(Window window_id) const = 0;
 
   virtual void ShowDesktop() = 0;
   virtual bool InShowDesktop() const = 0;
 
   virtual void Maximize(Window window_id) = 0;
-  virtual void LeftMaximize(Window window_id) = 0;
-  virtual void RightMaximize(Window window_id) = 0;
   virtual void Restore(Window window_id) = 0;
   virtual void RestoreAt(Window window_id, int x, int y) = 0;
   virtual void Minimize(Window window_id) = 0;