Merge lp:~compiz-team/compiz-core/compiz-core.fix_865863 into lp:compiz-core/0.9.5

[Sam Spilsbury]

Fixes Bug 865863

Handle windows that reparent into the root window correclty

[Tim Penhey (thumper)]

Do you really need to create the CoreWindow on the stack?

Could you do this:

CoreWindow cw(event->xcreatewindow.window);
cw.manage (priv->getTopWindow (), wa);
priv->createdWindows.remove (&cw);
break;

// NOTE: no delete needed.

[Sam Spilsbury (smspillaz)]

Yes, because CoreWindow's constructor adds itself to priv->createdWindows. Yeah, I know, that's bad, but I plan to kill CoreWindow anyways

=== modified file 'src/event.cpp'
--- src/event.cpp	2011-10-02 07:17:59 +0000
+++ src/event.cpp	2011-10-04 03:34:34 +0000
@@ -1240,59 +1240,66 @@
 	}
 	break;
     case ReparentNotify:
+
 	w = findWindow (event->xreparent.window);
 
-	/* It is possible that some plugin might call
-	 * w->destroy () before the window actually receives
-	 * its first ReparentNotify event which would mean
-	 * that it is already in the list of destroyed
-	 * windows, so check that list too */
+	/* If this window isn't part of our tracked window
+	 * list and was reparented into the root window then
+	 * we need to track it */
 	if (!w)
 	{
-	    foreach (CompWindow *dw, screen->priv->destroyedWindows)
-	    {
-		if (dw->priv->serverId == event->xdestroywindow.window)
-		{
-		    w = dw;
-		    break;
-		}
-	    }
-	}
-
-	if (!w && event->xreparent.parent == priv->root)
-	{
-	    /* Failure means that window has been destroyed. We still have to add 
-	     * the window to the window list as we might get configure requests
-	     * which require us to stack other windows relative to it. Setting
-	     * some default values if this is the case. */
-	    if (!XGetWindowAttributes (priv->dpy, event->xcreatewindow.window, &wa))
-		priv->setDefaultWindowAttributes (&wa);
-
-	    CoreWindow *cw = new CoreWindow (event->xcreatewindow.window);
-	    cw->manage (priv->getTopWindow (), wa);
-
-	    priv->createdWindows.remove (cw);
-	    delete cw;
-	}
-	else if (!(event->xreparent.parent == priv->root))
-	{
-	    /* This is the only case where a window is removed but not
-	       destroyed. We must remove our event mask and all passive
-	       grabs. */
-
-	    if (w)
-	    {
-		if (event->xreparent.parent != w->priv->wrapper)
-		{
-		    w->moveInputFocusToOtherWindow ();
-		    w->destroy ();
-
-		    XSelectInput (priv->dpy, w->id (), NoEventMask);
-		    XShapeSelectInput (priv->dpy, w->id (), NoEventMask);
-		    XUngrabButton (priv->dpy, AnyButton, AnyModifier, w->id ());
-		}
-	    }
-	}
+	    if (event->xreparent.parent == priv->root)
+	    {
+		/* Failure means that window has been destroyed. We still have to add 
+		 * the window to the window list as we might get configure requests
+		 * which require us to stack other windows relative to it. Setting
+		 * some default values if this is the case. */
+		if (!XGetWindowAttributes (priv->dpy, event->xcreatewindow.window, &wa))
+		    priv->setDefaultWindowAttributes (&wa);
+
+		CoreWindow *cw = new CoreWindow (event->xcreatewindow.window);
+		cw->manage (priv->getTopWindow (), wa);
+
+		priv->createdWindows.remove (cw);
+		delete cw;
+		break;
+	    }
+	    else
+	    {
+		/* It is possible that some plugin might call
+		 * w->destroy () before the window actually receives
+		 * its first ReparentNotify event which would mean
+		 * that it is already in the list of destroyed
+		 * windows, so check that list too */
+
+		foreach (CompWindow *dw, screen->priv->destroyedWindows)
+		{
+		    if (dw->priv->serverId == event->xreparent.window)
+		    {
+			w = dw;
+			break;
+		    }
+		}
+	    }
+	}
+
+	/* This is the only case where a window is removed but not
+	   destroyed. We must remove our event mask and all passive
+	   grabs. */
+
+        if (w)
+	{
+	    if (event->xreparent.parent != w->priv->wrapper)
+	    {
+		w->moveInputFocusToOtherWindow ();
+		w->destroy ();
+
+		XSelectInput (priv->dpy, w->id (), NoEventMask);
+		XShapeSelectInput (priv->dpy, w->id (), NoEventMask);
+		XUngrabButton (priv->dpy, AnyButton, AnyModifier, w->id ());
+	    }
+        }
+
 	break;
     case CirculateNotify:
 	w = findWindow (event->xcirculate.window);