Merge lp:~townsend/compiz-core/fix-lp1171878-0.9.7 into lp:compiz-core

[Christopher Townsend]

Fix issue where having a maximized window on a second monitor, then that monitor gets removed which moves the maximized window to the main monitor, then restoring the maximized window would place it on a different viewport. It should stay on the same viewport. This is a backport of lp:compiz r3845.

Fix issue where having a maximized window on a second monitor, then that monitor gets removed which moves the maximized window to the main monitor, then restoring the maximized window would place it on a different viewport. It should stay on the same viewport. This is a backport of lp:compiz r3845.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

=== modified file 'include/core/window.h'
--- include/core/window.h	2012-03-22 17:00:51 +0000
+++ include/core/window.h	2014-06-30 15:44:56 +0000
@@ -490,6 +490,8 @@
 
 	bool alive ();
 
+	bool moved () const;
+
 	bool overrideRedirect ();
 
 	bool isMapped () const;

=== modified file 'src/privatewindow.h'
--- src/privatewindow.h	2012-03-02 18:02:07 +0000
+++ src/privatewindow.h	2014-06-30 15:44:56 +0000
@@ -302,6 +302,8 @@
 	unsigned int lastPong;
 	bool         alive;
 
+	bool moved;
+
 	CompWindowExtents input;
 	CompWindowExtents serverInput;
 	CompWindowExtents border;

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-11-18 18:06:24 +0000
+++ src/screen.cpp	2014-06-30 15:44:56 +0000
@@ -3566,10 +3566,24 @@
 
     if (workAreaChanged)
     {
+	CompWindow::Geometry before, after;
+
 	/* as work area changed, update all maximized windows on this
 	   screen to snap to the new work area */
 	foreach (CompWindow *w, priv->windows)
+	{
+	    before = w->priv->serverGeometry;
 	    w->priv->updateSize ();
+	    after = w->priv->serverGeometry;
+
+	    /* A maximized window was adjusted for the new workarea size */
+	    if (before != after &&
+		(w->state () & CompWindowStateMaximizedVertMask ||
+		w->state () & CompWindowStateMaximizedHorzMask))
+	    {
+		w->priv->moved = true;
+	    }
+	}
     }
 }
 

=== modified file 'src/window.cpp'
--- src/window.cpp	2012-11-19 18:26:35 +0000
+++ src/window.cpp	2014-06-30 15:44:56 +0000
@@ -3852,6 +3852,31 @@
 	    mask |= restoreGeometry (xwc, CWX | CWWidth);
 	}
 
+	/* Check to see if a monitor has disappeared that had a maximized window and if so,
+	 * adjust the window to restore in the current viewport instead of the
+	 * coordinates of a different viewport. */
+	if (window->moved () &&
+	    !(state & CompWindowStateMaximizedVertMask || state & CompWindowStateMaximizedHorzMask))
+	{
+	    if (xwc->x > screen->width () ||
+		xwc->y > screen->height ())
+	    {
+		/* The removed monitor may have had a much different resolution than the
+		 * the current monitor, so let's just orient the window in the top left
+		 * of the workarea. */
+		xwc->x = workArea.x () + window->border ().left;
+		xwc->y = workArea.y () + window->border ().top;
+
+		if (xwc->width > workArea.width ())
+		    xwc->width = workArea.width () - (window->border ().left + window->border ().right);
+
+		if (xwc->height > workArea.height ())
+		    xwc->height = workArea.height () - (window->border ().top + window->border ().bottom);
+
+	    }
+
+	    window->priv->moved = false;
+	}
 	/* constrain window width if smaller than minimum width */
 	if (!(mask & CWWidth) && (int) old.width () < sizeHints.min_width)
 	{
@@ -6530,6 +6555,8 @@
     lastPong (0),
     alive (true),
 
+    moved (false),
+
     struts (0),
 
     icons (0),
@@ -6677,6 +6704,12 @@
     return priv->alive;
 }
 
+bool
+CompWindow::moved () const
+{
+    return priv->moved;
+}
+
 unsigned int
 CompWindow::mwmDecor ()
 {