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)
This commit is contained in:
parent
ff7f019bbc
commit
5ccfad8df0
|
@ -257,22 +257,12 @@ xprRestackFrame(RootlessFrameID wid, RootlessFrameID nextWid)
|
||||||
|
|
||||||
if (nextWid == NULL)
|
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;
|
wc.stack_mode = XP_MAPPED_ABOVE;
|
||||||
#endif
|
|
||||||
wc.sibling = 0;
|
wc.sibling = 0;
|
||||||
}
|
}
|
||||||
else
|
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;
|
wc.stack_mode = XP_MAPPED_BELOW;
|
||||||
#endif
|
|
||||||
wc.sibling = x_cvt_vptr_to_uint(nextWid);
|
wc.sibling = x_cvt_vptr_to_uint(nextWid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue