diff options
| -rw-r--r-- | dix/window.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/dix/window.c b/dix/window.c index 4c450c8ed..c8d454aeb 100644 --- a/dix/window.c +++ b/dix/window.c @@ -1578,20 +1578,16 @@ MoveWindowInStack(WindowPtr pWin, WindowPtr pNextSib) pFirstChange = pFirstChange->nextSib; } } - if (pWin->drawable.pScreen->RestackWindow) - (*pWin->drawable.pScreen->RestackWindow) (pWin, pOldNextSib); } -#ifdef ROOTLESS /* * In rootless mode we can't optimize away window restacks. * There may be non-X windows around, so even if the window * is in the correct position from X's point of view, * the underlying window system may want to reorder it. */ - else if (pWin->drawable.pScreen->RestackWindow) + if (pWin->drawable.pScreen->RestackWindow) (*pWin->drawable.pScreen->RestackWindow) (pWin, pWin->nextSib); -#endif return pFirstChange; } @@ -2238,11 +2234,7 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client) if ((mask & CWBorderWidth) && (bw != wBorderWidth(pWin))) goto ActuallyDoSomething; if (mask & CWStackMode) { -#ifndef ROOTLESS - /* See above for why we always reorder in rootless mode. */ - if (pWin->nextSib != pSib) -#endif - goto ActuallyDoSomething; + goto ActuallyDoSomething; } return Success; |