Merge lp:~3v1n0/compiz/fix-outputs-for-windows-in-workspaces into lp:compiz/0.9.12

[Marco Trevisan (Treviño)]

Window: compute the correct output using the absolute window position

Window geometry has absolute coordinates that include viewports, but we
need to use viewport relative coordinates when figuring out the window output
or the window will be considered offscreen and thus it will fallback to first monitor.
This is generally applied, but was not done well in addWindowSizeChanges which
was causing Fullscreen and (horizontally) maximized windows to be moved to the
primary monitor when activated.

[Stephen M. Webb (bregma)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3960
http://jenkins.qa.ubuntu.com/job/compiz-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/8

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

review: Approve (continuous-integration)

=== modified file 'src/window.cpp'
--- src/window.cpp	2014-09-16 19:37:23 +0000
+++ src/window.cpp	2015-07-17 17:44:11 +0000
@@ -3572,7 +3572,11 @@
     int x = (viewport.x () - screen->vp ().x ()) * screen->width ();
     int y = (viewport.y () - screen->vp ().y ()) * screen->height ();
 
-    CompOutput *output = &screen->outputDevs ().at (screen->outputDeviceForGeometry (old));
+    CompWindow::Geometry old_relative_to_vp(old.x () - x, old.y () - y,
+					    old.width (), old.height (),
+					    old.border ());
+    int outputDev = screen->outputDeviceForGeometry (old_relative_to_vp);
+    CompOutput *output = &screen->outputDevs ().at (outputDev);
 
     /*
      * output is now the correct output for the given geometry.
@@ -5129,7 +5133,19 @@
 int
 CompWindow::outputDevice () const
 {
-    return screen->outputDeviceForGeometry (priv->serverGeometry);
+    const CompPoint& vp  = defaultViewport ();
+    const CompPoint& svp = screen->vp ();
+
+    if (vp == svp)
+	return screen->outputDeviceForGeometry (priv->serverGeometry);
+
+    Geometry geo (priv->serverGeometry.x () + (svp.x () - vp.x ()) * screen->width (),
+		  priv->serverGeometry.y () + (svp.y () - vp.y ()) * screen->height (),
+		  priv->serverGeometry.width (),
+		  priv->serverGeometry.height (),
+		  priv->serverGeometry.border ());
+
+   return screen->outputDeviceForGeometry (geo);
 }
 
 bool
@@ -5987,10 +6003,9 @@
 
 	CompPoint vp   = window->defaultViewport ();
 	CompPoint svp  = screen->vp ();
-	CompSize size  = *screen;
 
-	int x = window->serverGeometry ().x () + (svp.x () - vp.x ()) * size.width ();
-	int y = window->serverGeometry ().y () + (svp.y () - vp.y ()) * size.height ();
+	int x = window->serverGeometry ().x () + (svp.x () - vp.x ()) * screen->width ();
+	int y = window->serverGeometry ().y () + (svp.y () - vp.y ()) * screen->height ();
 	window->moveToViewportPosition (x, y, true);
 
 	if (allowWindowFocus (0, timestamp))