Merge lp:~unity-team/compiz-core/compiz-core.fix_767095 into lp:compiz-core/trunk

[Sam Spilsbury]

Fixes the broken systray issue some people were getting

[lp:~unity-team/compiz-core/compiz-core.fix_767095]

2741. By Sam Spilsbury on 2011-05-27

Typo

2742. By Sam Spilsbury on 2011-05-27

Fix typo in comment

2743. By Sam Spilsbury on 2011-05-30

Fix windows appearing at small sizes

[Jason Smith (jassmith)]

can you explain why we dont need that big deleted section anymore?

[Sam Spilsbury (smspillaz)]

Forcing and intercepting reparent is bad.

Also we don't need remove windows from createdWindows on ReparentNotify since createdWindows gets cleared every time a window gets created.

[Jason Smith (jassmith)]

+1 thanks for the explanation

review: Approve

=== modified file 'src/event.cpp'
--- src/event.cpp	2011-04-30 14:07:20 +0000
+++ src/event.cpp	2011-05-30 12:14:31 +0000
@@ -1204,7 +1204,7 @@
 	else if (!(event->xreparent.parent == priv->root))
 	{
 	    bool     remove = false;
-	    Window   xid = None;
+	    Window   xid = event->xreparent.window;
 	    Window   root_return;
 	    unsigned int ui;
 	    int		 x, y;
@@ -1218,47 +1218,12 @@
 		if (event->xreparent.parent != w->priv->wrapper)
 		{
 		    w->moveInputFocusToOtherWindow ();
-
-		    /* In the case where someone else reparented one of
-		     * our windows we are going to get the UnmapNotify first
-		     * which means that this will start reparenting the
-		     * window into the root window and interrupt
-		     * the client's request to reparent into another
-		     * window, we should handle this case */
-		    if (!w->priv->frame)
-		    {
-			xid = w->priv->id;
-			XGetGeometry (screen->dpy (), xid, &root_return,
-				      &x, &y, &ui, &ui, &ui, &ui);
-		    }
 		    w->destroy ();
-		    remove = true;
-		}
-	    }
-	    else
-	    {
-		foreach (CoreWindow *cw, screen->priv->createdWindows)
-		{
-		    if (cw->priv->id == event->xreparent.parent)
-		    {
-			screen->priv->createdWindows.remove (cw);
-			delete cw;
-			remove = true;
-			break;
-		    }
-		}
-	    }
-
-	    if (remove)
-	    {
-		XSelectInput (priv->dpy, w->id (), NoEventMask);
-		XShapeSelectInput (priv->dpy, w->id (), NoEventMask);
-		XUngrabButton (priv->dpy, AnyButton, AnyModifier, w->id ());
-
-		/* Reparent the window back where it belongs */
-		if (xid)
-		    XReparentWindow (screen->dpy (), xid, event->xreparent.parent,
-				     x, y);
+
+		    XSelectInput (priv->dpy, w->id (), NoEventMask);
+		    XShapeSelectInput (priv->dpy, w->id (), NoEventMask);
+		    XUngrabButton (priv->dpy, AnyButton, AnyModifier, w->id ());
+		}
 	    }
 	}
 	break;

=== modified file 'src/window.cpp'
--- src/window.cpp	2011-05-26 13:50:00 +0000
+++ src/window.cpp	2011-05-30 12:14:31 +0000
@@ -1424,9 +1424,9 @@
 bool
 CompWindow::resize (CompWindow::Geometry gm)
 {
-    if (priv->attrib.width        != gm.width ()  ||
-	priv->attrib.height       != gm.height () ||
-	priv->attrib.border_width != gm.border ())
+    if (priv->geometry.x ()       != gm.width ()  ||
+	priv->geometry.y ()       != gm.height () ||
+	priv->geometry.border ()  != gm.border ())
     {
 	int pw, ph;
 	int dx, dy, dwidth, dheight;
@@ -1463,7 +1463,7 @@
 	priv->invisible = WINDOW_INVISIBLE (priv);
 	priv->updateFrameWindow ();
     }
-    else if (priv->attrib.x != gm.x () || priv->attrib.y != gm.y ())
+    else if (priv->geometry.x () != gm.x () || priv->geometry.y () != gm.y ())
     {
 	int dx, dy;
 
@@ -1603,10 +1603,8 @@
     priv->attrib.override_redirect = ce->override_redirect;
 
     if (priv->syncWait)
-    {
 	priv->syncGeometry.set (ce->x, ce->y, ce->width, ce->height,
 				ce->border_width);
-    }
     else
     {
 	if (ce->override_redirect)
@@ -5718,7 +5716,6 @@
 PrivateWindow::reparent ()
 {
     XSetWindowAttributes attr;
-    XWindowAttributes    wa;
     XWindowChanges       xwc;
     int                  mask;
     unsigned int         nchildren;
@@ -5730,19 +5727,30 @@
     Colormap		 cmap = DefaultColormap (screen->dpy (),
 						 screen->screenNum ());
 
-    if (frame || attrib.override_redirect)
+    if (frame)
 	return false;
 
     XSync (dpy, false);
     XGrabServer (dpy);
 
-    if (!XGetWindowAttributes (dpy, id, &wa))
+    if (!XGetWindowAttributes (dpy, id, &attrib))
     {
 	XUngrabServer (dpy);
 	XSync (dpy, false);
 	return false;
     }
 
+    /* Since we have read directly to our XWindowAttributes
+     * we need to update the size of a window since it might
+     * have changed during the reparent
+     */
+
+    window->resize (attrib.x, attrib.y, attrib.width, attrib.height,
+		    attrib.border_width);
+
+    if (attrib.override_redirect)
+	return false;
+
     /* Don't ever reparent windows which have ended up
      * reparented themselves on the server side but not
      * on the client side */
@@ -5823,7 +5831,7 @@
 
     XChangeWindowAttributes (dpy, id, CWEventMask | CWDontPropagate, &attr);
 
-    if (wa.map_state == IsViewable || shaded)
+    if (attrib.map_state == IsViewable || shaded)
 	XMapWindow (dpy, frame);
 
     attr.event_mask = SubstructureRedirectMask | StructureNotifyMask |
@@ -5861,10 +5869,12 @@
 void
 PrivateWindow::unreparent ()
 {
-    Display        *dpy = screen->dpy ();
-    XEvent         e;
-    bool           alive = true;
-    XWindowChanges xwc;
+    Display        	 *dpy = screen->dpy ();
+    XEvent         	 e;
+    bool           	 alive = true;
+    XWindowChanges 	 xwc;
+    unsigned int         nchildren;
+    Window		 *children = NULL, root_return, parent_return;
 
     if (!frame)
 	return;
@@ -5877,6 +5887,17 @@
         alive = false;
     }
 
+    /* Also don't reparent back into root windows that have ended up
+     * reparented into other windows (and as such we are unmanaging them) */
+
+    if (alive)
+    {
+	XQueryTree (dpy, id, &root_return, &parent_return, &children, &nchildren);
+
+	if (parent_return != wrapper)
+	    alive = false;
+    }
+
     if ((!destroyed) && alive)
     {
 	XGrabServer (dpy);
@@ -5922,6 +5943,9 @@
 	XMoveWindow (dpy, id, serverGeometry.x (), serverGeometry.y ());
     }
 
+    if (children)
+	XFree (children);
+
     XDestroyWindow (dpy, wrapper);
     XDestroyWindow (dpy, frame);
     wrapper = None;