Merge lp:~azzar1/compiz-core/fix-919139 into lp:compiz-core

[Andrea Azzarone]

Change the behavior of the option "On all output devices."

== The problem ==
In multi-monitor environment, windows should spread on the monitor in which they reside.

== The fix ==
Change the behavior of the option "On all output devices."

== Test ==
Not yet implemented. I'd love to write unit-tests but I need to use CompWindow and I can't find an easy way to create a fake CompWindow (CompWindow has a private ctor) or to mock it.

[lp:~azzar1/compiz-core/fix-919139]

3081. By Andrea Azzarone on 2012-03-30

Fix coding style.

3082. By Andrea Azzarone on 2012-03-30

Don't use c++0x.

[Daniel van Vugt (vanvugt)]

/home/dan/bzr/compiz-core/spread/plugins/scale/src/scale.cpp: In member function ‘SlotArea::vector PrivateScaleScreen::getSlotAreas()’:
/home/dan/bzr/compiz-core/spread/plugins/scale/src/scale.cpp:491:39: error: comparison between signed and unsigned integer expressions [-Werror=sign-compare]

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Although, I can confirm after fixing the above error, it works perfectly. Windows do spread on the monitor they started on.

I'll fix the build failure when I merge.

review: Approve

[Andrea Azzarone (azzar1)]

We wanted to add tests, I'll do it in another branch :)

=== modified file 'plugins/scale/CMakeLists.txt'
--- plugins/scale/CMakeLists.txt	2009-03-15 05:09:18 +0000
+++ plugins/scale/CMakeLists.txt	2012-03-30 14:49:34 +0000
@@ -2,4 +2,4 @@
 
 include (CompizPlugin)
 
-compiz_plugin(scale PLUGINDEPS composite opengl)
\ No newline at end of file
+compiz_plugin(scale PLUGINDEPS composite opengl)

=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2012-01-18 17:05:12 +0000
+++ plugins/scale/src/scale.cpp	2012-03-30 14:49:34 +0000
@@ -477,64 +477,22 @@
 SlotArea::vector
 PrivateScaleScreen::getSlotAreas ()
 {
-    unsigned int       i = 0;
-    CompRect           workArea;
-    std::vector<float> size;
-    float              sizePerWindow, sum = 0.0f;
-    int                left;
-    SlotArea::vector   slotAreas;
+    SlotArea::vector slotAreas;
 
     slotAreas.resize (screen->outputDevs ().size ());
-    size.resize (screen->outputDevs ().size ());
-
-    left = windows.size ();
-
+
+    unsigned int i = 0;
     foreach (CompOutput &o, screen->outputDevs ())
     {
-	/* determine the size of the workarea for each output device */
-	workArea = CompRect (o.workArea ());
-
-	size[i] = workArea.width () * workArea.height ();
-	sum += size[i];
-
 	slotAreas[i].nWindows = 0;
-	slotAreas[i].workArea = workArea;
-
-	i++;
-    }
-
-    /* calculate size available for each window */
-    sizePerWindow = sum / windows.size ();
-
-    for (i = 0; i < screen->outputDevs ().size () && left; i++)
-    {
-	/* fill the areas with windows */
-	int nw = floor (size[i] / sizePerWindow);
-
-	nw = MIN (nw, left);
-	size[i] -= nw * sizePerWindow;
-	slotAreas[i].nWindows = nw;
-	left -= nw;
-    }
-
-    /* add left windows to output devices with the biggest free space */
-    while (left > 0)
-    {
-	int   num = 0;
-	float big = 0;
-
-	for (i = 0; i < screen->outputDevs ().size (); i++)
+	foreach (ScaleWindow *window, windows)
 	{
-	    if (size[i] > big)
-	    {
-		num = i;
-		big = size[i];
-	    }
+	    CompWindow *cw = window->priv->window;
+	    if (cw->outputDevice () == o.id ())
+		slotAreas[i].nWindows++;
 	}
 
-	size[num] -= sizePerWindow;
-	slotAreas[num].nWindows++;
-	left--;
+	slotAreas[i++].workArea = o.workArea ();
     }
 
     return slotAreas;