diff options
| author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
| commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
| tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/mi/mivaltree.c | |
| parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
| parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
| download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip | |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/mi/mivaltree.c')
| -rw-r--r-- | xorg-server/mi/mivaltree.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/xorg-server/mi/mivaltree.c b/xorg-server/mi/mivaltree.c index d9d07caad..2585422bc 100644 --- a/xorg-server/mi/mivaltree.c +++ b/xorg-server/mi/mivaltree.c @@ -103,16 +103,12 @@ Equipment Corporation. #include "globals.h" -#ifdef SHAPE /* * Compute the visibility of a shaped window */ -_X_EXPORT int -miShapedWindowIn (pScreen, universe, bounding, rect, x, y) - ScreenPtr pScreen; - RegionPtr universe, bounding; - BoxPtr rect; - int x, y; +int +miShapedWindowIn (ScreenPtr pScreen, RegionPtr universe, RegionPtr bounding, + BoxPtr rect, int x, int y) { BoxRec box; BoxPtr boundBox; @@ -166,7 +162,6 @@ miShapedWindowIn (pScreen, universe, bounding, rect, x, y) return rgnIN; return rgnOUT; } -#endif static GetRedirectBorderClipProcPtr miGetRedirectBorderClipProc; static SetRedirectBorderClipProcPtr miSetRedirectBorderClipProc; @@ -272,7 +267,6 @@ miComputeClips ( break; case rgnPART: newVis = VisibilityPartiallyObscured; -#ifdef SHAPE { RegionPtr pBounding; @@ -292,7 +286,6 @@ miComputeClips ( } } } -#endif break; default: newVis = VisibilityFullyObscured; @@ -597,11 +590,12 @@ miTreeObscured( */ /*ARGSUSED*/ int -miValidateTree (pParent, pChild, kind) - WindowPtr pParent; /* Parent to validate */ - WindowPtr pChild; /* First child of pParent that was +miValidateTree ( + WindowPtr pParent, /* Parent to validate */ + WindowPtr pChild, /* First child of pParent that was * affected */ - VTKind kind; /* What kind of configuration caused call */ + VTKind kind /* What kind of configuration caused call */ + ) { RegionRec totalClip; /* Total clipping region available to * the marked children. pParent's clipList |