Merge lp:~alan-griffiths/compiz-core/stop-dumping-windows-in-first-workspace into lp:compiz-core

[Alan Griffiths]

Avoid dumping all the windows into first workspace when closing.

Reverts to correct logic used before r2838.

[Alan Griffiths (alan-griffiths)]

From discussion with Sam:

"CompWindowNotifyUnreparent would call through to DecorWindow::windowNotify and then that would call reconfigureXWindow, which would then attempt to configure the destroyed frame and wrapper windows and move the client to 0,0 in its own parent window, which at this point, would be the root window (so the client moves to 0,0). I know this because its exactly the same problem I fixed last cycle :P

"The fix is to move the assignments (and the queue clear) to None to before that call. That will cause reconfigureXWindow to treat the window as an unreparented window, eg, correctly."

[Sam Spilsbury (smspillaz)]

review: Approve

[Daniel van Vugt (vanvugt)]

Confirmed it works. The problem of windows being moved to the first workspace is solved.

I still have an issue where all windows rotate left by one workspace when I restart compiz. But that's obviously a different bug.

review: Approve

=== modified file 'src/window.cpp'
--- src/window.cpp	2012-04-04 03:11:55 +0000
+++ src/window.cpp	2012-04-12 15:56:24 +0000
@@ -7171,7 +7171,6 @@
     XDestroyWindow (screen->dpy (), serverFrame);
     XDestroyWindow (screen->dpy (), wrapper);
 
-    window->windowNotify (CompWindowNotifyUnreparent);
     /* This window is no longer "managed" in the
      * reparenting sense so clear its pending event
      * queue ... though maybe in future it would
@@ -7182,4 +7181,7 @@
     frame = None;
     wrapper = None;
     serverFrame = None;
+
+    // Finally, (i.e. after updating state) notify the change
+    window->windowNotify (CompWindowNotifyUnreparent);
 }