Merge lp:~sil2100/compiz/scale_all into lp:compiz/0.9.8

[Łukasz Zemczak]

Add support for initiating window picker in other than nomal mode. For now added only the additional 'All windows' picker, essentially fixing LP: #933776.
The code from the all mode comes from a patch made by Doug McMahon. Thanks!

Original description from the 0.9.7 MRQ:

The scale plugin has many actions defined: initiate for current workspace, for all windows, for groups and for current output device. But the scale plugin only supports one handler for all actions (the type of the action is not considered at all). For now I added a distinction between ScaleTypeAll and ScaleTypeNormal. I took the code proposed by Doug in the bug report as the code for ScaleTypeAll.

[Didier Roche-Tolomelli (didrocks)]

Tests are needed to enter distro

[Daniel van Vugt (vanvugt)]

Looks like this fixes bug 955035 too.

[Daniel van Vugt (vanvugt)]

OK, it works well and solves bug 933776 (and bug 955035 it seems).

Only a minor style issue in layoutThumbs() that I'll fix.

review: Approve

=== modified file 'plugins/scale/src/privates.h'
--- plugins/scale/src/privates.h	2012-02-01 17:49:07 +0000
+++ plugins/scale/src/privates.h	2012-06-22 10:18:21 +0000
@@ -63,6 +63,8 @@
 	void findBestSlots ();
 	bool fillInWindows ();
 	bool layoutThumbs ();
+	bool layoutThumbsAll ();
+	bool layoutThumbsSingle ();
 
 	SlotArea::vector getSlotAreas ();
 

=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2012-04-01 07:34:59 +0000
+++ plugins/scale/src/scale.cpp	2012-06-22 10:18:21 +0000
@@ -684,6 +684,47 @@
 bool
 PrivateScaleScreen::layoutThumbs ()
 {
+    switch (type) {
+	case ScaleTypeAll:
+	    return layoutThumbsAll ();
+	case ScaleTypeNormal:
+	default:
+	    return layoutThumbsSingle ();
+    }
+}
+
+bool
+PrivateScaleScreen::layoutThumbsAll ()
+{
+    windows.clear ();
+
+    /* add windows scale list, top most window first */
+    foreach (CompWindow *w, screen->windows ())
+    {
+	SCALE_WINDOW (w);
+
+	if (sw->priv->slot)
+	    sw->priv->adjust = true;
+
+	sw->priv->slot = NULL;
+
+	if (!sw->priv->isScaleWin ())
+            continue;
+
+	windows.push_back (sw);
+    }
+
+    if (windows.empty ())
+	return false;
+
+    slots.resize (windows.size ());
+
+    return ScaleScreen::get (screen)->layoutSlotsAndAssignWindows ();
+}
+
+bool
+PrivateScaleScreen::layoutThumbsSingle ()
+{
     bool ret = false;
     std::map <ScaleWindow *, ScaleSlot> slotWindows;
     CompWindowList          allWindows;