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

Xinerama: Fix up obnoxiously-indented code 

Comments inside of conditionals confuse indent to death.  Which is fair
enough really.

Signed-off-by: Daniel Stone <daniel@fooishbar.org>
This commit is contained in:
Daniel Stone 2012-03-15 15:13:51 +00:00 committed by Keith Packard
parent 9838b7032e
commit 58b1f739d7
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Xext/panoramiXprocs.c
View File

@ -1928,23 +1928,21 @@ PanoramiXGetImage(ClientPtr client)
isRoot = IS_ROOT_DRAWABLE(draw); isRoot = IS_ROOT_DRAWABLE(draw);
if (isRoot) { if (isRoot) {
if ( /* check for being onscreen */ /* check for being onscreen */
x < 0 || x + w > PanoramiXPixWidth || if (x < 0 || x + w > PanoramiXPixWidth ||
y < 0 || y + h > PanoramiXPixHeight) y < 0 || y + h > PanoramiXPixHeight)
return BadMatch; return BadMatch;
} }
else { else {
if ( /* check for being onscreen */ /* check for being onscreen and inside of border */
screenInfo.screens[0]->x + pDraw->x + x < 0 || if (screenInfo.screens[0]->x + pDraw->x + x < 0 ||
screenInfo.screens[0]->x + pDraw->x + x + w > PanoramiXPixWidth screenInfo.screens[0]->x + pDraw->x + x + w > PanoramiXPixWidth ||
|| screenInfo.screens[0]->y + pDraw->y + y < 0 || screenInfo.screens[0]->y + pDraw->y + y < 0 ||
screenInfo.screens[0]->y + pDraw->y + y + h > PanoramiXPixHeight screenInfo.screens[0]->y + pDraw->y + y + h > PanoramiXPixHeight ||
|| x < -wBorderWidth((WindowPtr) pDraw) ||
/* check for being inside of border */ x + w > wBorderWidth((WindowPtr) pDraw) + (int) pDraw->width ||
x < -wBorderWidth((WindowPtr) pDraw) || y < -wBorderWidth((WindowPtr) pDraw) ||
x + w > wBorderWidth((WindowPtr) pDraw) + (int) pDraw->width || y + h > wBorderWidth((WindowPtr) pDraw) + (int) pDraw->height)
y < -wBorderWidth((WindowPtr) pDraw) ||
y + h > wBorderWidth((WindowPtr) pDraw) + (int) pDraw->height)
return BadMatch; return BadMatch;
} }