diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-04-06 19:21:46 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-04-10 00:46:25 -0700 |
| commit | 5ccfad8df099e8ebc4bf2dd53c3db1460903b135 (patch) | |
| tree | 1c9faf36bda80910e1abb8fec81a5be3fb3970f7 | |
| parent | ff7f019bbcbc52618cc478db7baed57aa5b7c3d3 (diff) | |
XQuartz: Revert most of the previous override redirect patch
The changes actually caused all windows to move to the current space. Instead, we're going with a fix entirely within Xplugin that depends on quartz-wm being the window-manager for now.
(cherry picked from commit 997b6f3142c622541bb5bac98652abae75d1101d)
| -rw-r--r-- | hw/xquartz/xpr/xprFrame.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/hw/xquartz/xpr/xprFrame.c b/hw/xquartz/xpr/xprFrame.c index a7fc3a9e7..a45290e20 100644 --- a/hw/xquartz/xpr/xprFrame.c +++ b/hw/xquartz/xpr/xprFrame.c @@ -257,22 +257,12 @@ xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid) if (nextWid == NULL) { -#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 3 - WindowPtr pWin = xprGetXWindow((xp_window_id)wid); - wc.stack_mode = (pWin && pWin->overrideRedirect) ? XP_MAPPED_ABOVE_CURRENT_SPACE : XP_MAPPED_ABOVE; -#else wc.stack_mode = XP_MAPPED_ABOVE; -#endif wc.sibling = 0; } else { -#if defined(XPLUGIN_VERSION) && XPLUGIN_VERSION >= 3 - WindowPtr pWin = xprGetXWindow((xp_window_id)wid); - wc.stack_mode = (pWin && pWin->overrideRedirect) ? XP_MAPPED_BELOW_CURRENT_SPACE : XP_MAPPED_BELOW; -#else wc.stack_mode = XP_MAPPED_BELOW; -#endif wc.sibling = x_cvt_vptr_to_uint(nextWid); } |