Merge lp://qastaging/~compiz-team/compiz/compiz.find-top-level-window-server-frame into lp://qastaging/compiz/0.9.8
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~compiz-team/compiz/compiz.find-top-level-window-server-frame |
| Merge into: | lp://qastaging/compiz/0.9.8 |
| Diff against target: |
750 lines (+490/-41) 15 files modified
plugins/copytex/src/copytex.cpp (+5/-4) plugins/copytex/src/copytex.h (+5/-4) plugins/decor/src/decor.cpp (+3/-1) plugins/opengl/CMakeLists.txt (+4/-0) plugins/opengl/include/opengl/opengl.h (+1/-1) plugins/opengl/include/opengl/pixmapsource.h (+40/-0) plugins/opengl/include/opengl/texture.h (+10/-5) plugins/opengl/src/glxtfpbind/CMakeLists.txt (+31/-0) plugins/opengl/src/glxtfpbind/include/glx-tfp-bind.h (+53/-0) plugins/opengl/src/glxtfpbind/src/glx-tfp-bind.cpp (+53/-0) plugins/opengl/src/glxtfpbind/tests/CMakeLists.txt (+24/-0) plugins/opengl/src/glxtfpbind/tests/test-opengl-glx-tfp-bind.cpp (+157/-0) plugins/opengl/src/privatetexture.h (+16/-12) plugins/opengl/src/texture.cpp (+87/-13) src/screen.cpp (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~compiz-team/compiz/compiz.find-top-level-window-server-frame |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel van Vugt | Pending | ||
| Tim Penhey | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2012-09-18.
Description of the change
Check the pending frame of the window when looking to see if it is a "toplevel" window. There was a case where calling updateAttributes on a just-reparented window which hadn't yet got the ReparentNotify event for its frame window would cause subsequent calls to reconfigureXWindow which want to restack relative to it to fail because that frame window wasn't marked as "existing" yet, so we would detect that case as restacking relative to an invalid window and prevent the restack request.
I only want testing of this fix right now to see if it works. I don't plan to refactor the code to get it under test, though we should look into getting some kind of integration test story going first before we merge this in. xorg-gtest perhaps?
Probably the most important thing to note is that this will stop a number of "Attempted to restack window relative to ... which is a window compiz does not own" errors.
Unmerged revisions
- 3381. By Sam Spilsbury
-
When calling findTopLevelWindow we're interested in any windows that could
be pending a reparent too, as we could call it relative to their pending frame
