Merge lp:~unity-team/compiz/trunk.icccm-4.1.4 into lp:~unity-team/compiz/trunk

[Sam Spilsbury]

ICCCM Compliance. We need to handle the case where the window maps to get from Withdrawn state to Iconic state such that it is managed but never actually mapped. This is crack, but applications do it, so we have to support it (key perpetrator, xterm -iconic)

[David Barth (dbarth)]

Same here: can you provide 2 test cases:
1. to verify that the issue is solved
2. to verify that "normal" cases still work as before

Please copy them to comments in the bug report, as the merge prop history gets lost once the branch is merged.

Thanks

review: Needs Information

[David Barth (dbarth)]

For reference, Sam wrote a test case: lp:~smspillaz/testing/unmaptest also mentioned on the bug report.

[David Barth (dbarth)]

review: Approve

[Loïc Molinari (loic.molinari)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-04-01 11:25:21 +0000
+++ CMakeLists.txt	2011-04-01 16:44:24 +0000
@@ -112,7 +112,7 @@
 add_subdirectory (libdecoration)
 add_subdirectory (gtk)
 add_subdirectory (kde)
-add_subdirectory (unity/unity_window_decorator)
+#add_subdirectory (unity/unity_window_decorator)
 add_subdirectory (po)
 add_subdirectory (metadata)
 add_subdirectory (src)

=== modified file 'src/window.cpp'
--- src/window.cpp	2011-03-27 04:14:46 +0000
+++ src/window.cpp	2011-04-01 16:44:24 +0000
@@ -4594,6 +4594,7 @@
 PrivateWindow::processMap ()
 {
     bool                   allowFocus;
+    bool		   wasManaged = priv->managed;
     CompStackingUpdateMode stackingMode;
 
     priv->initialViewport = screen->vp ();
@@ -4645,7 +4646,10 @@
 
     window->updateAttributes (stackingMode);
 
-    if (window->minimized ())
+    /* Window was either minimized by us, or it was mapped again
+     * since it has gone from withdrawn to iconic state, so
+     * unminimize it */
+    if (window->minimized () && (window->pendingMaps () || wasManaged))
 	window->unminimize ();
 
     screen->leaveShowDesktopMode (window);
@@ -5282,21 +5286,27 @@
     }
     else if (!overrideRedirect ())
     {
-	if (screen->priv->getWmState (priv->id) == IconicState)
+	if (screen->priv->getWmState (priv->id) == IconicState ||
+	    (priv->hints && priv->hints->initial_state == IconicState))
 	{
 	    // before everything else in maprequest
 	    if (!priv->frame)
 		priv->reparent ();
-	    priv->managed = true;
-	    priv->placed  = true;
-
-	    if (priv->state & CompWindowStateHiddenMask)
-	    {
-		if (priv->state & CompWindowStateShadedMask)
-		    priv->shaded = true;
-		else
-		    priv->minimized = true;
-	    }
+
+	    /* Not managed until map processing is done here
+	     * since to go from Withdrawn -> Iconic the client
+	     * needs to map the window again */
+	    priv->managed = false;
+	    priv->placed  = !(priv->hints && priv->hints->initial_state == IconicState);
+
+	    
+	    /* FIXME: CompWindowStateShadedMask can't be set
+	     * at this time anyways, so any window that wants
+	     * to start out shaded will have to be minimized instead */
+	    if (priv->state & CompWindowStateShadedMask)
+		priv->shaded = true;
+	    else
+		priv->minimized = true;
 	}
     }