diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-03-15 15:13:51 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-03-27 11:50:43 -0700 |
| commit | dfecff4279b42a20ee1d186bfe49f5e2e3a53648 (patch) | |
| tree | 29ed0d6b7b0610f1be2f28887b0929939b4a3f56 | |
| parent | 8384075e1a0fb3189f9c37c17f9e12e1aae5102c (diff) | |
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>
(cherry picked from commit 58b1f739d73b03ff7952ca986ed8746a7307fffe)
| -rw-r--r-- | Xext/panoramiXprocs.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c index 6a91e35d0..7fb578b71 100644 --- a/Xext/panoramiXprocs.c +++ b/Xext/panoramiXprocs.c @@ -1928,23 +1928,21 @@ PanoramiXGetImage(ClientPtr client) isRoot = IS_ROOT_DRAWABLE(draw); if (isRoot) { - if ( /* check for being onscreen */ - x < 0 || x + w > PanoramiXPixWidth || - y < 0 || y + h > PanoramiXPixHeight) + /* check for being onscreen */ + if (x < 0 || x + w > PanoramiXPixWidth || + y < 0 || y + h > PanoramiXPixHeight) return BadMatch; } else { - if ( /* check for being onscreen */ - screenInfo.screens[0]->x + pDraw->x + x < 0 || - screenInfo.screens[0]->x + pDraw->x + x + w > PanoramiXPixWidth - || screenInfo.screens[0]->y + pDraw->y + y < 0 || - screenInfo.screens[0]->y + pDraw->y + y + h > PanoramiXPixHeight - || - /* check for being inside of border */ - x < -wBorderWidth((WindowPtr) pDraw) || - x + w > wBorderWidth((WindowPtr) pDraw) + (int) pDraw->width || - y < -wBorderWidth((WindowPtr) pDraw) || - y + h > wBorderWidth((WindowPtr) pDraw) + (int) pDraw->height) + /* check for being onscreen and inside of border */ + if (screenInfo.screens[0]->x + pDraw->x + x < 0 || + screenInfo.screens[0]->x + pDraw->x + x + w > PanoramiXPixWidth || + screenInfo.screens[0]->y + pDraw->y + y < 0 || + screenInfo.screens[0]->y + pDraw->y + y + h > PanoramiXPixHeight || + x < -wBorderWidth((WindowPtr) pDraw) || + x + w > wBorderWidth((WindowPtr) pDraw) + (int) pDraw->width || + y < -wBorderWidth((WindowPtr) pDraw) || + y + h > wBorderWidth((WindowPtr) pDraw) + (int) pDraw->height) return BadMatch; } |