aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/mi/mioverlay.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-09 05:23:48 +0000
committermarha <marha@users.sourceforge.net>2009-09-09 05:23:48 +0000
commit81f91c615982e50bb62708201569c33a3cd3d973 (patch)
tree4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/mi/mioverlay.c
parentb571a562410f565af2bdde52d9f7f9a23ffae04f (diff)
parenta915739887477b28d924ecc8417ee107d125bd6c (diff)
downloadvcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.gz
vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.bz2
vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.zip
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/mi/mioverlay.c')
-rw-r--r--xorg-server/mi/mioverlay.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/xorg-server/mi/mioverlay.c b/xorg-server/mi/mioverlay.c
index 4159935f2..0577e8c9f 100644
--- a/xorg-server/mi/mioverlay.c
+++ b/xorg-server/mi/mioverlay.c
@@ -106,7 +106,7 @@ static void miOverlayChangeBorderWidth(WindowPtr, unsigned int);
HasBorder(w) && \
(w)->backgroundState == ParentRelative)
-_X_EXPORT Bool
+Bool
miInitOverlay(
ScreenPtr pScreen,
miOverlayInOverlayFunc inOverlayFunc,
@@ -904,7 +904,7 @@ miOverlayHandleExposures(WindowPtr pWin)
REGION_UNINIT(pScreen, &val->after.borderExposed);
REGION_UNINIT(pScreen, &val->after.exposed);
xfree(val);
- pChild->valdata = (ValidatePtr)NULL;
+ pChild->valdata = NULL;
if (pChild->firstChild)
{
pChild = pChild->firstChild;
@@ -1608,7 +1608,7 @@ miOverlayChangeBorderWidth(
/* We need this as an addition since the xf86 common code doesn't
know about the second tree which is static to this file. */
-_X_EXPORT void
+void
miOverlaySetRootClip(ScreenPtr pScreen, Bool enable)
{
WindowPtr pRoot = WindowTable[pScreen->myNum];
@@ -1692,7 +1692,7 @@ miOverlayClearToBackground(
/****************************************************************/
/* not used */
-_X_EXPORT Bool
+Bool
miOverlayGetPrivateClips(
WindowPtr pWin,
RegionPtr *borderClip,
@@ -1711,7 +1711,7 @@ miOverlayGetPrivateClips(
return FALSE;
}
-_X_EXPORT void
+void
miOverlaySetTransFunction (
ScreenPtr pScreen,
miOverlayTransFunc transFunc
@@ -1719,13 +1719,13 @@ miOverlaySetTransFunction (
MIOVERLAY_GET_SCREEN_PRIVATE(pScreen)->MakeTransparent = transFunc;
}
-_X_EXPORT Bool
+Bool
miOverlayCopyUnderlay(ScreenPtr pScreen)
{
return MIOVERLAY_GET_SCREEN_PRIVATE(pScreen)->copyUnderlay;
}
-_X_EXPORT void
+void
miOverlayComputeCompositeClip(GCPtr pGC, WindowPtr pWin)
{
ScreenPtr pScreen = pGC->pScreen;
@@ -1781,7 +1781,7 @@ miOverlayComputeCompositeClip(GCPtr pGC, WindowPtr pWin)
}
}
-_X_EXPORT Bool
+Bool
miOverlayCollectUnderlayRegions(
WindowPtr pWin,
RegionPtr *region