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

dix: Fix some indentation 

Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Adam Jackson 2012-09-20 11:16:22 -04:00 committed by Keith Packard
parent 3d1051aecb
commit dab7a1ec7f
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dix/window.c
View File

@ -1886,8 +1886,7 @@ AnyWindowOverlapsMe(WindowPtr pWin, WindowPtr pHead, BoxPtr box)
if (pSib->mapped) { if (pSib->mapped) {
sbox = WindowExtents(pSib, &sboxrec); sbox = WindowExtents(pSib, &sboxrec);
if (BOXES_OVERLAP(sbox, box) if (BOXES_OVERLAP(sbox, box)
&& ShapeOverlap(pWin, box, pSib, sbox) && ShapeOverlap(pWin, box, pSib, sbox))
)
return TRUE; return TRUE;
} }
} }
@ -1905,8 +1904,7 @@ IOverlapAnyWindow(WindowPtr pWin, BoxPtr box)
if (pSib->mapped) { if (pSib->mapped) {
sbox = WindowExtents(pSib, &sboxrec); sbox = WindowExtents(pSib, &sboxrec);
if (BOXES_OVERLAP(sbox, box) if (BOXES_OVERLAP(sbox, box)
&& ShapeOverlap(pWin, box, pSib, sbox) && ShapeOverlap(pWin, box, pSib, sbox))
)
return TRUE; return TRUE;
} }
} }
@ -2174,8 +2172,7 @@ ConfigureWindow(WindowPtr pWin, Mask mask, XID *vlist, ClientPtr client)
else else
pSib = pWin->nextSib; pSib = pWin->nextSib;
if ((!pWin->overrideRedirect) && (RedirectSend(pParent) if ((!pWin->overrideRedirect) && (RedirectSend(pParent))) {
)) {
xEvent event = { xEvent event = {
.u.configureRequest.window = pWin->drawable.id, .u.configureRequest.window = pWin->drawable.id,
.u.configureRequest.sibling = (mask & CWSibling) ? sibwid : None, .u.configureRequest.sibling = (mask & CWSibling) ? sibwid : None,
@ -2551,7 +2548,7 @@ MapWindow(WindowPtr pWin, ClientPtr client)
if (pWin->mapped) if (pWin->mapped)
return Success; return Success;
/* general check for permission to map window */ /* general check for permission to map window */
if (XaceHook(XACE_RESOURCE_ACCESS, client, pWin->drawable.id, RT_WINDOW, if (XaceHook(XACE_RESOURCE_ACCESS, client, pWin->drawable.id, RT_WINDOW,
pWin, RT_NONE, NULL, DixShowAccess) != Success) pWin, RT_NONE, NULL, DixShowAccess) != Success)
return Success; return Success;
@ -2560,8 +2557,7 @@ MapWindow(WindowPtr pWin, ClientPtr client)
if ((pParent = pWin->parent)) { if ((pParent = pWin->parent)) {
Bool anyMarked; Bool anyMarked;
if ((!pWin->overrideRedirect) && (RedirectSend(pParent) if ((!pWin->overrideRedirect) && (RedirectSend(pParent))) {
)) {
xEvent event = { xEvent event = {
.u.mapRequest.window = pWin->drawable.id, .u.mapRequest.window = pWin->drawable.id,
.u.mapRequest.parent = pParent->drawable.id .u.mapRequest.parent = pParent->drawable.id