diff options
| author | Jamey Sharp <jamey@minilop.net> | 2010-06-05 20:55:29 -0700 |
|---|---|---|
| committer | Jamey Sharp <jamey@minilop.net> | 2010-06-05 22:07:21 -0700 |
| commit | a0fe6987b55b5326157b50e169b8d6b9ae26a1ae (patch) | |
| tree | 30bd5b4a9fef3d1435059bb2a32d4e8d9916195c /miext/rootless/rootlessValTree.c | |
| parent | 424b593c7872a703d3d0c942b7e8acc0770eb023 (diff) | |
Clean up after removal of screen parameters from region macros.
Signed-off-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'miext/rootless/rootlessValTree.c')
| -rw-r--r-- | miext/rootless/rootlessValTree.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/miext/rootless/rootlessValTree.c b/miext/rootless/rootlessValTree.c index 0f62c28f4..e2c4ffe87 100644 --- a/miext/rootless/rootlessValTree.c +++ b/miext/rootless/rootlessValTree.c @@ -104,16 +104,13 @@ Equipment Corporation. #include "globals.h" -int RootlessShapedWindowIn (ScreenPtr pScreen, RegionPtr universe, - RegionPtr bounding, BoxPtr rect, int x, int y); - int RootlessMiValidateTree (WindowPtr pRoot, WindowPtr pChild, VTKind kind); /* * Compute the visibility of a shaped window */ -int -RootlessShapedWindowIn (ScreenPtr pScreen, RegionPtr universe, +static int +RootlessShapedWindowIn (RegionPtr universe, RegionPtr bounding, BoxPtr rect, int x, int y) { BoxRec box; @@ -236,7 +233,7 @@ RootlessComputeClips (WindowPtr pParent, ScreenPtr pScreen, if ((pBounding = wBoundingShape (pParent))) { - switch (RootlessShapedWindowIn (pScreen, universe, + switch (RootlessShapedWindowIn (universe, pBounding, &borderSize, pParent->drawable.x, pParent->drawable.y)) @@ -296,14 +293,12 @@ RootlessComputeClips (WindowPtr pParent, ScreenPtr pScreen, } if (pChild->valdata) { - RegionNull( - &pChild->valdata->after.borderExposed); + RegionNull(&pChild->valdata->after.borderExposed); if (HasParentRelativeBorder(pChild)) { - RegionSubtract( - &pChild->valdata->after.borderExposed, - &pChild->borderClip, - &pChild->winSize); + RegionSubtract(&pChild->valdata->after.borderExposed, + &pChild->borderClip, + &pChild->winSize); } RegionNull(&pChild->valdata->after.exposed); } |