Merge lp:~dcolascione/compiz/compiz into lp:compiz/0.9.11

[Daniel Colascione]

This change allows users to configure staticswitcher to put minimized windows at the end of the list, behind other windows.

[MC Return (mc-return)]

Hi Daniel.

Thanks for this branch - works perfectly.

Just two suggestions:

Could you please make compareWindowsMinimizedAfter () a member function of BaseSwitchScreen in compiztoolbox, instead of making it available for StaticSwitchScreen only ?

Then the other Compiz switchers could utilize it as well without any additional code duplication...

Other than that it looks good, except for some minor whitespace and indentation inconsistencies, which are not so important to fix though, as a consistent style throughout the Compiz codebase is not available anyway...
But theoretically there should be a whitespace between functionname and bracket and 8 whitespaces should be represented by tabs - maybe you want to adjust that in your update also...

Greetinx && thanx 4 your contribution to Compiz !

P.S.: Please also set a commit message above, otherwise this won't merge...

review: Approve

[Christopher Townsend (townsend)]

Along with what MC Return said, please link this to a specific bug.

Thanks!

review: Needs Information

[Daniel Colascione (dcolascione)]

Thanks for the review. How exactly do I get it into tree after making
the mentioned changes?

On 05/11/2014 03:39 AM, MC Return wrote:
> Review: Approve
>
> Hi Daniel.
>
> Thanks for this branch - works perfectly.
>
> Just two suggestions:
>
> Could you please make compareWindowsMinimizedAfter () a member function of BaseSwitchScreen in compiztoolbox, instead of making it available for StaticSwitchScreen only ?

The reason I put it in StaticSwitchScreen was so that I could run a
custom staticswitcher.so against the default compiz, but putting it in
the base class should be fine for upstream.

>
> Then the other Compiz switchers could utilize it as well without any additional code duplication...
>
> Other than that it looks good, except for some minor whitespace and indentation inconsistencies, which are not so important to fix though, as a consistent style throughout the Compiz codebase is not available anyway...
> But theoretically there should be a whitespace between functionname and bracket and 8 whitespaces should be represented by tabs - maybe you want to adjust that in your update also...

Sure. Might want to add a .dir-locals.el so that Emacs uses these
settings by default.

>
> Greetinx && thanx 4 your contribution to Compiz !
>
> P.S.: Please also set a commit message above, otherwise this won't merge...
>

[Christopher Townsend (townsend)]

Hi Daniel,

A couple of things in order to get this merged into trunk.

1) Need a commit message for this merge proposal. I can do that, so not a big deal.
2) Need a bug linked to this merge proposal. If you can point to the bug in Launchpad that this is fixing, I can link the bug for it.
3) If you are going to move compareWindowsMinimizedAfter () to the BaseSwitchScreen class and fix the formatting issues, please do that and push the changes to this branch.

I'm moving this merge proposal to Work In Progress pending your feedback. Once this is done, then move it back to "Needs review". We'll then re-review and if all good, we'll approve and then it will be queued up to be merged in.

Thanks for your contribution!

Unmerged revisions

3861. By Daniel Colascione on 2014-05-11

Add option for keeping minimized windows out of the way

=== modified file 'plugins/staticswitcher/src/staticswitcher.cpp'
--- plugins/staticswitcher/src/staticswitcher.cpp	2013-06-11 04:45:57 +0000
+++ plugins/staticswitcher/src/staticswitcher.cpp	2014-05-11 02:58:09 +0000
@@ -127,6 +127,19 @@
 	updatePopupWindow ();
 }
 
+bool
+StaticSwitchScreen::compareWindowsMinimizedAfter (CompWindow *w1,
+                                                  CompWindow *w2)
+{
+    if (!w1->minimized() && w2->minimized())
+        return true;
+
+    if (w1->minimized() && !w2->minimized())
+        return false;
+
+    return BaseSwitchScreen::compareWindows(w1, w2);
+}
+
 void
 StaticSwitchScreen::createWindowList ()
 {
@@ -144,7 +157,10 @@
 	}
     }
 
-    windows.sort (BaseSwitchScreen::compareWindows);
+    if (optionGetMinimizedAfter())
+        windows.sort (StaticSwitchScreen::compareWindowsMinimizedAfter);
+    else
+        windows.sort (BaseSwitchScreen::compareWindows);
 
     updateWindowList ();
 }

=== modified file 'plugins/staticswitcher/src/staticswitcher.h'
--- plugins/staticswitcher/src/staticswitcher.h	2013-05-12 08:24:06 +0000
+++ plugins/staticswitcher/src/staticswitcher.h	2014-05-11 02:58:09 +0000
@@ -92,6 +92,8 @@
 	void getMinimizedAndMatch (bool &minimizedOption,
 				   CompMatch *&match);
 	bool getMipmap ();
+    	static bool compareWindowsMinimizedAfter (CompWindow *w1,
+                                                  CompWindow *w2);
 
 	Window    lastActiveWindow;
 

=== modified file 'plugins/staticswitcher/staticswitcher.xml.in'
--- plugins/staticswitcher/staticswitcher.xml.in	2012-10-15 10:31:51 +0000
+++ plugins/staticswitcher/staticswitcher.xml.in	2014-05-11 02:58:09 +0000
@@ -137,6 +137,11 @@
 		    <_long>Show minimized windows</_long>
 		    <default>true</default>
 		</option>
+		<option name="minimized_after" type="bool">
+		    <_short>Show Minimized After Others</_short>
+		    <_long>Show minimized windows after other windows</_long>
+		    <default>false</default>
+		</option>
 		<option name="auto_change_vp" type="bool">
 		    <_short>Auto Change Viewport</_short>
 		    <_long>Change to the viewport of the selected window while switching</_long>