frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: Outdent Unmap{Window,Subwindows} a bit 

No functional change, just folding some conditionals together.
This commit is contained in:
Adam Jackson 2019-03-06 17:03:58 -05:00 committed by Adam Jackson
parent 74479a99ec
commit 3904216b01
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
dix/window.c
View File

@ -2856,13 +2856,11 @@ UnmapWindow(WindowPtr pWin, Bool fromConfigure)
pWin->mapped = FALSE; pWin->mapped = FALSE;
if (wasRealized) if (wasRealized)
UnrealizeTree(pWin, fromConfigure); UnrealizeTree(pWin, fromConfigure);
if (wasViewable) { if (wasViewable && !fromConfigure) {
if (!fromConfigure) { (*pScreen->ValidateTree) (pLayerWin->parent, pWin, VTUnmap);
(*pScreen->ValidateTree) (pLayerWin->parent, pWin, VTUnmap); (*pScreen->HandleExposures) (pLayerWin->parent);
(*pScreen->HandleExposures) (pLayerWin->parent); if (pScreen->PostValidateTree)
if (pScreen->PostValidateTree) (*pScreen->PostValidateTree) (pLayerWin->parent, pWin, VTUnmap);
(*pScreen->PostValidateTree) (pLayerWin->parent, pWin, VTUnmap);
}
} }
if (wasRealized && !fromConfigure) { if (wasRealized && !fromConfigure) {
WindowsRestructured(); WindowsRestructured();
@ -2909,31 +2907,28 @@ UnmapSubwindows(WindowPtr pWin)
UnrealizeTree(pChild, FALSE); UnrealizeTree(pChild, FALSE);
} }
} }
if (wasViewable) { if (wasViewable && anyMarked) {
if (anyMarked) { if (pLayerWin->parent == pWin)
if (pLayerWin->parent == pWin) (*pScreen->MarkWindow) (pWin);
(*pScreen->MarkWindow) (pWin); else {
else { WindowPtr ptmp;
WindowPtr ptmp;
(*pScreen->MarkOverlappedWindows) (pWin, pLayerWin, NULL); (*pScreen->MarkOverlappedWindows) (pWin, pLayerWin, NULL);
(*pScreen->MarkWindow) (pLayerWin->parent); (*pScreen->MarkWindow) (pLayerWin->parent);
/* Windows between pWin and pLayerWin may not have been marked */ /* Windows between pWin and pLayerWin may not have been marked */
ptmp = pWin; ptmp = pWin;
while (ptmp != pLayerWin->parent) { while (ptmp != pLayerWin->parent) {
(*pScreen->MarkWindow) (ptmp); (*pScreen->MarkWindow) (ptmp);
ptmp = ptmp->parent; ptmp = ptmp->parent;
}
pHead = pWin->firstChild;
} }
(*pScreen->ValidateTree) (pLayerWin->parent, pHead, VTUnmap); pHead = pWin->firstChild;
(*pScreen->HandleExposures) (pLayerWin->parent);
if (pScreen->PostValidateTree)
(*pScreen->PostValidateTree) (pLayerWin->parent, pHead,
VTUnmap);
} }
(*pScreen->ValidateTree) (pLayerWin->parent, pHead, VTUnmap);
(*pScreen->HandleExposures) (pLayerWin->parent);
if (pScreen->PostValidateTree)
(*pScreen->PostValidateTree) (pLayerWin->parent, pHead, VTUnmap);
} }
if (wasRealized) { if (wasRealized) {
WindowsRestructured(); WindowsRestructured();