Merge lp:~mc-return/compiz/compiz.merge-fix966099-add-unmaximize-or-minimize-window-key into lp:compiz/0.9.9

[MC Return]

Added a new keyboard shortcut named unmaximize_or_minimize_window_key.

This key will restore a maximized or semi-maximized window and minimize a restored window.

Per default this shortcut is disabled and has yet to be enabled via ubuntu-config.patch
for the Ubuntu distribution and Unity.

(LP: #966099)

Note:

The Unity MP to fully fix bug 966099 is to be found here:

https://code.launchpad.net/~mc-return/unity/unity.merge-fix966099-shortcut-fails-to-minimize-just-restores/+merge/145474

TODO:
1. Fix Unity's Help Overlay (see the above MP for Unity, that changes
unmaximize_window_key to unmaximize_or_minimize_window_key)

2. Per default this shortcut is disabled and has yet to be enabled via
ubuntu-config.patch for the Ubuntu distribution and Unity.
(+<default>&lt;Control&gt;&lt;Super&gt;Down</default>)

This MP just adds the necessary new keyboard shortcut option and the needed
functionality for it.

[lp:~mc-return/compiz/compiz.merge-fix966099-add-unmaximize-or-minimize-window-key]

3587. By MC Return on 2013-01-29

Fixed short name of the new unmaximize or minimize option

3588. By MC Return on 2013-01-29

Reduced diff

3589. By MC Return on 2013-01-29

Fixed indentation

3590. By MC Return on 2013-01-29

Simplified the unmaximizeOrMinimizeWin function by checking if (w) just once

3591. By MC Return on 2013-01-29

unmaximizeOrMinimizeWin will now also restore horizontally or vertically maximized windows first, not just maximized ones

3592. By MC Return on 2013-01-29

Restored the default shortcut for the unmaximize_window_key
Made Control+Super+Down the default for the unmaximize_or_minimize_window_key

TODO: ubuntu-config.patch does not need to patch the default for the
unmaximize_window_key anymore, in fact it conflicts with the new default
for the unmaximize_or_minimize_window_key now until this is fixed

3593. By MC Return on 2013-01-29

Cleared the default for unmaximize_or_minimize_window_key, as this
has to be added via ubuntu-config.patch, like done for the
unmaximize_window_key currently

3594. By MC Return on 2013-01-30

Added brackets for better readability

[Brandon Schaefer (brandontschaefer)]

Works for me.

review: Approve

[Daniel van Vugt (vanvugt)]

1. This is a pointless statement:
+ if (((w->priv->state & MAXIMIZE_STATE) == MAXIMIZE_STATE) ||
+ (w->priv->state & CompWindowStateMaximizedHorzMask) ||
+ (w->priv->state & CompWindowStateMaximizedVertMask))
and is equivalent to:
    if (w->priv->state & MAXIMIZE_STATE)

2. If design approved this I think they made a mistake. Compiz already has key combinations unmaximize_window_key and minimize_window_key. It's redundant to add a new combo that overlaps those.

review: Disapprove

[Daniel van Vugt (vanvugt)]

I take that back. Design are allowed to /design/ any combos they want. It doesn't matter if they're redundant. The only thing they can't do is change the meaning of window buttons.

Still, the pointless if statement needs cleaning up at least.

review: Needs Fixing

[lp:~mc-return/compiz/compiz.merge-fix966099-add-unmaximize-or-minimize-window-key]

3595. By MC Return on 2013-01-30

Cleaned up pointless if statement

[MC Return (mc-return)]

> Still, the pointless if statement needs cleaning up at least.

Done in r3595.

[Brandon Schaefer (brandontschaefer)]

Approved. (Though I do agree with Daniel about this being more redundant...but design wishes for it)

review: Approve

=== modified file 'metadata/core.xml.in'
--- metadata/core.xml.in	2012-10-15 10:31:51 +0000
+++ metadata/core.xml.in	2013-01-30 01:53:21 +0000
@@ -190,6 +190,10 @@
 			<_long>Unmaximize active window</_long>
 			<default>&lt;Alt&gt;F5</default>
 			</option>
+			<option name="unmaximize_or_minimize_window_key" type="key">
+			<_short>Unmaximize or Minimize Window</_short>
+			<_long>Unmaximize or minimize active window</_long>
+			</option>
 			<option name="maximize_window_horizontally_key" type="key">
 			<_short>Maximize Window Horizontally</_short>
 			<_long>Maximize active window horizontally</_long>

=== modified file 'src/actions.cpp'
--- src/actions.cpp	2012-04-19 12:06:05 +0000
+++ src/actions.cpp	2013-01-30 01:53:21 +0000
@@ -68,6 +68,31 @@
 }
 
 bool
+CompScreenImpl::unmaximizeOrMinimizeWin (CompAction         *action,
+					 CompAction::State  state,
+					 CompOption::Vector &options)
+{
+    CompWindow *w;
+    Window     xid;
+
+    xid = CompOption::getIntOptionNamed (options, "window");
+
+    w = screen->findTopLevelWindow (xid);
+    if (w)
+    {
+	if (w->priv->state & MAXIMIZE_STATE)
+	{
+	    w->maximize (0);
+	}
+	else if (w->actions () & CompWindowActionMinimizeMask)
+	{
+	    w->minimize ();
+	}
+    }
+    return true;
+}
+
+bool
 CompScreenImpl::minimizeWin (CompAction         *action,
 			 CompAction::State  state,
 			 CompOption::Vector &options)

=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2012-12-30 11:13:36 +0000
+++ src/privatescreen.h	2013-01-30 01:53:21 +0000
@@ -1066,6 +1066,10 @@
 				   CompAction::State  state,
 				   CompOption::Vector &options);
 
+	static bool unmaximizeOrMinimizeWin (CompAction         *action,
+					     CompAction::State  state,
+					     CompOption::Vector &options);
+
 	static bool minimizeWin (CompAction         *action,
 				 CompAction::State  state,
 				 CompOption::Vector &options);

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2013-01-11 08:03:50 +0000
+++ src/screen.cpp	2013-01-30 01:53:21 +0000
@@ -4490,6 +4490,7 @@
 	privateScreen.optionSetLowerWindowButtonInitiate (CompScreenImpl::lowerWin);
 
 	privateScreen.optionSetUnmaximizeWindowKeyInitiate (CompScreenImpl::unmaximizeWin);
+	privateScreen.optionSetUnmaximizeOrMinimizeWindowKeyInitiate (CompScreenImpl::unmaximizeOrMinimizeWin);
 
 	privateScreen.optionSetMinimizeWindowKeyInitiate (CompScreenImpl::minimizeWin);
 	privateScreen.optionSetMinimizeWindowButtonInitiate (CompScreenImpl::minimizeWin);