aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/miext/rootless/rootlessValTree.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/miext/rootless/rootlessValTree.c')
-rw-r--r--xorg-server/miext/rootless/rootlessValTree.c36
1 files changed, 14 insertions, 22 deletions
diff --git a/xorg-server/miext/rootless/rootlessValTree.c b/xorg-server/miext/rootless/rootlessValTree.c
index 4f16530cc..47cd6790b 100644
--- a/xorg-server/miext/rootless/rootlessValTree.c
+++ b/xorg-server/miext/rootless/rootlessValTree.c
@@ -104,16 +104,17 @@ Equipment Corporation.
#include "globals.h"
-#ifdef SHAPE
+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 (pScreen, universe, bounding, rect, x, y)
- ScreenPtr pScreen;
- RegionPtr universe, bounding;
- BoxPtr rect;
- register int x, y;
+RootlessShapedWindowIn (ScreenPtr pScreen, RegionPtr universe,
+ RegionPtr bounding, BoxPtr rect, int x, int y)
{
BoxRec box;
register BoxPtr boundBox;
@@ -167,7 +168,6 @@ RootlessShapedWindowIn (pScreen, universe, bounding, rect, x, y)
return rgnIN;
return rgnOUT;
}
-#endif
#define HasParentRelativeBorder(w) (!(w)->borderIsPixel && \
HasBorder(w) && \
@@ -191,12 +191,8 @@ RootlessShapedWindowIn (pScreen, universe, bounding, rect, x, y)
*-----------------------------------------------------------------------
*/
static void
-RootlessComputeClips (pParent, pScreen, universe, kind, exposed)
- register WindowPtr pParent;
- register ScreenPtr pScreen;
- register RegionPtr universe;
- VTKind kind;
- RegionPtr exposed; /* for intermediate calculations */
+RootlessComputeClips (WindowPtr pParent, ScreenPtr pScreen,
+ RegionPtr universe, VTKind kind, RegionPtr exposed)
{
int dx,
dy;
@@ -235,7 +231,6 @@ RootlessComputeClips (pParent, pScreen, universe, kind, exposed)
break;
case rgnPART:
newVis = VisibilityPartiallyObscured;
-#ifdef SHAPE
{
RegionPtr pBounding;
@@ -255,7 +250,6 @@ RootlessComputeClips (pParent, pScreen, universe, kind, exposed)
}
}
}
-#endif
break;
default:
newVis = VisibilityFullyObscured;
@@ -514,8 +508,7 @@ RootlessComputeClips (pParent, pScreen, universe, kind, exposed)
}
static void
-RootlessTreeObscured(pParent)
- register WindowPtr pParent;
+RootlessTreeObscured(WindowPtr pParent)
{
register WindowPtr pChild;
register int oldVis;
@@ -581,11 +574,10 @@ RootlessTreeObscured(pParent)
// fixme this is ugly
// Xprint/ValTree.c doesn't work, but maybe that method can?
int
-RootlessMiValidateTree (pRoot, pChild, kind)
- WindowPtr pRoot; /* Parent to validate */
- WindowPtr pChild; /* First child of pRoot that was
- * affected */
- VTKind kind; /* What kind of configuration caused call */
+RootlessMiValidateTree (WindowPtr pRoot, /* Parent to validate */
+ WindowPtr pChild, /* First child of pRoot that was
+ * affected */
+ VTKind kind /* What kind of configuration caused call */)
{
RegionRec childClip; /* The new borderClip for the current
* child */