diff options
| author | Adam Jackson <ajax@redhat.com> | 2013-09-11 17:54:27 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2014-04-30 14:27:19 -0400 |
| commit | f4cd3966cea2fbfb99b3e90763a7e0ed409315da (patch) | |
| tree | 1a35370478f9dee9901224967b8cb9acd1f5573f | |
| parent | fbe24f5b1c3f294be7885f0976e958cdbd3f0a50 (diff) | |
dix: Unconditionally do ->RestackWindow in MoveWindowInStackrootless-merge
Only rootless ddxes fill that slot in anyway. So just do it, and remove
a #ifdef ROOTLESS in the process.
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -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; |