Merge lp:~townsend/compiz/fix-lp1304531 into lp:compiz/0.9.11

[Christopher Townsend]

Fix issue where maximized windows would get moved to different workspaces when disconnecting/connecting an external monitor. Windows should stay in the same workspace they are in when the monitor event occurs.

I'm going to go ahead and propose this to get some review loving.

This is intended to be SRU'd in 14.04, so the goal here is to fix the problem at hand and cause no regressions. The code in these areas is very fragile, so we really need to test this. That said, there are still issues, so when testing, make sure the issue you see is not a regression caused from this code.

Some scenarios when testing also should not use an external monitor since this code is also used for workspace switching and changing workspace geometry such as going to 1 workspace, using 2x2 workspaces, 3x4 workspaces, etc.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3861
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/75/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-i386-ci/3

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

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'plugins/place/src/place.cpp'
--- plugins/place/src/place.cpp	2013-07-22 17:19:59 +0000
+++ plugins/place/src/place.cpp	2014-05-21 12:42:10 +0000
@@ -123,6 +123,8 @@
 	state |= compiz::place::WindowAbove;
     if (window->state () & CompWindowStateBelowMask)
 	state |= compiz::place::WindowBelow;
+    if (window->state () & CompWindowStateMaximizedVertMask || window->state () & CompWindowStateMaximizedHorzMask)
+	state |= compiz::place::WindowMaximized;
 
     return state;
 }

=== modified file 'plugins/place/src/screen-size-change/include/screen-size-change.h'
--- plugins/place/src/screen-size-change/include/screen-size-change.h	2012-01-20 06:27:10 +0000
+++ plugins/place/src/screen-size-change/include/screen-size-change.h	2014-05-21 12:42:10 +0000
@@ -36,6 +36,7 @@
 {
 namespace place
 {
+    const unsigned int WindowMaximized = 1 << 2;
 
 class ScreenSizeChangeObject
 {
@@ -50,6 +51,7 @@
 	virtual const CompPoint & getViewport () const = 0;
 	virtual const CompRect & getWorkarea (const compiz::window::Geometry &g) const = 0;
 	virtual const compiz::window::extents::Extents & getExtents () const = 0;
+	virtual unsigned int getState () const = 0;
 
 	compiz::window::Geometry adjustForSize (const CompSize &oldSize,
 						const CompSize &newSize);

=== modified file 'plugins/place/src/screen-size-change/src/screen-size-change.cpp'
--- plugins/place/src/screen-size-change/src/screen-size-change.cpp	2013-04-07 08:45:50 +0000
+++ plugins/place/src/screen-size-change/src/screen-size-change.cpp	2014-05-21 12:42:10 +0000
@@ -39,7 +39,7 @@
 {
     int            vpX, vpY;
     compiz::window::Geometry g, vpRelRect;
-    int		   pivotX, pivotY;
+    int		   pivotX, pivotY, pivotWidth, pivotHeight;
 
     g = getGeometry ();
     compiz::window::Geometry og (g);
@@ -50,10 +50,13 @@
     /* FIXME: Should use saved geometry for maximized / fullscreen windows */
 
     /* calculate target vp x, y index for window's pivot point */
-    vpX = pivotX / oldSize.width ();
+    pivotWidth = (getState () & compiz::place::WindowMaximized) ? newSize.width () : oldSize.width ();
+    pivotHeight = (getState () & compiz::place::WindowMaximized) ? newSize.height () : oldSize.height ();
+
+    vpX = pivotX / pivotWidth;
     if (pivotX < 0)
 	vpX -= 1;
-    vpY = pivotY / oldSize.height ();
+    vpY = pivotY / pivotHeight;
     if (pivotY < 0)
 	vpY -= 1;
 

=== modified file 'plugins/place/src/screen-size-change/tests/screen-size-change/src/test-place-screen-size-change.cpp'
--- plugins/place/src/screen-size-change/tests/screen-size-change/src/test-place-screen-size-change.cpp	2013-04-16 04:24:22 +0000
+++ plugins/place/src/screen-size-change/tests/screen-size-change/src/test-place-screen-size-change.cpp	2014-05-21 12:42:10 +0000
@@ -62,6 +62,7 @@
 	const CompPoint & getViewport () const;
 	const CompRect &  getWorkarea (const cw::Geometry &g) const;
 	const cw::extents::Extents & getExtents () const;
+	unsigned int getState () const;
 
 	void setVp (const CompPoint &);
 	void setWorkArea (const CompRect &);
@@ -214,6 +215,12 @@
     return mCurrentExtents;
 }
 
+unsigned int
+StubScreenSizeChangeObject::getState () const
+{
+    return 0;
+}
+
 void
 StubScreenSizeChangeObject::setVp (const CompPoint &p)
 {

=== modified file 'src/window.cpp'
--- src/window.cpp	2014-04-09 15:52:47 +0000
+++ src/window.cpp	2014-05-21 12:42:10 +0000
@@ -3553,11 +3553,20 @@
     int       mask = 0;
     CompPoint viewport;
 
-    if (old.intersects (CompRect (0, 0, screen->width (), screen->height ())))
+    if (old.intersects (CompRect (0, 0, screen->width (), screen->height ())) && 
+	!(state & CompWindowStateMaximizedHorzMask || state & CompWindowStateMaximizedVertMask))
 	viewport = screen->vp ();
+    else if ((state & CompWindowStateMaximizedHorzMask || state & CompWindowStateMaximizedVertMask) &&
+	     window->moved ())
+	viewport = initialViewport;
     else
 	screen->viewportForGeometry (old, viewport);
 
+    if (viewport.x () > screen->vpSize ().width () - 1)
+	viewport.setX (screen->vpSize ().width () - 1);
+    if (viewport.y () > screen->vpSize ().height () - 1)
+	viewport.setY (screen->vpSize ().height () - 1);
+
     int x = (viewport.x () - screen->vp ().x ()) * screen->width ();
     int y = (viewport.y () - screen->vp ().y ()) * screen->height ();
 
@@ -4021,6 +4030,8 @@
 
     if (placed)
 	priv->placed = true;
+
+    priv->initialViewport = defaultViewport ();
 }
 
 bool
@@ -4674,6 +4685,8 @@
     if (overrideRedirect ())
 	return;
 
+    priv->initialViewport = screen->vp ();
+
     state = constrainWindowState (state, priv->actions);
 
     state &= MAXIMIZE_STATE;
@@ -5832,6 +5845,10 @@
 	xwc.y = serverGeometry ().y () + wy;
 
 	configureXWindow (valueMask, &xwc);
+
+	if ((state () & CompWindowStateMaximizedHorzMask || state () & CompWindowStateMaximizedVertMask) &&
+            (defaultViewport () == screen->vp ()))
+            priv->initialViewport = screen->vp ();
     }
 }