[xserver-commit] xserver/mi mibstore.c,1.12,1.13 miexpose.c,3.11,3.12 miinitext.c,3.74,3.75 mioverlay.c,3.16,3.17 miscrinit.c,3.20,3.21 mivaltree.c,1.15,1.16 miwindow.c,1.9,1.10
Warren Turkal
xserver-commit@pdx.freedesktop.org
Committed by: wt
Update of /cvs/xserver/xserver/mi
In directory pdx:/tmp/cvs-serv27606/mi
Modified Files:
mibstore.c miexpose.c miinitext.c mioverlay.c miscrinit.c
mivaltree.c miwindow.c
Log Message:
Make the shape extension always build
Index: mibstore.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/mibstore.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- mibstore.c 11 Sep 2003 05:12:51 -0000 1.12
+++ mibstore.c 12 Feb 2004 18:58:49 -0000 1.13
@@ -2620,14 +2620,12 @@
REGION_TRANSLATE( pScreen, pSavedRegion,
-pWin->drawable.x,
-pWin->drawable.y);
-#ifdef SHAPE
if (wBoundingShape (pWin))
REGION_INTERSECT(pScreen, pSavedRegion, pSavedRegion,
wBoundingShape (pWin));
if (wClipShape (pWin))
REGION_INTERSECT(pScreen, pSavedRegion, pSavedRegion,
wClipShape (pWin));
-#endif
/* if window is already on-screen, assume it has been drawn to */
if (pWin->viewable)
pBackingStore->status = StatusVDirty;
@@ -3037,14 +3035,12 @@
REGION_TRANSLATE( pScreen, prgnSaved,
-pWin->drawable.x,
-pWin->drawable.y);
-#ifdef SHAPE
if (wBoundingShape (pWin))
REGION_INTERSECT(pScreen, prgnSaved, prgnSaved,
wBoundingShape (pWin));
if (wClipShape (pWin))
REGION_INTERSECT(pScreen, prgnSaved, prgnSaved,
wClipShape (pWin));
-#endif
miTileVirtualBS(pWin);
exposures = REGION_CREATE( pScreen, &box, 1);
@@ -3151,7 +3147,6 @@
REGION_TRANSLATE( pScreen, newSaved,
-pWin->drawable.x, -pWin->drawable.y);
-#ifdef SHAPE
if (wBoundingShape (pWin) || wClipShape (pWin)) {
if (wBoundingShape (pWin))
REGION_INTERSECT( pScreen, newSaved, newSaved,
@@ -3159,7 +3154,6 @@
if (wClipShape (pWin))
REGION_INTERSECT( pScreen, newSaved, newSaved, wClipShape (pWin));
}
-#endif
pSavedRegion = &pBackingStore->SavedRegion;
Index: miexpose.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/miexpose.c,v
retrieving revision 3.11
retrieving revision 3.12
diff -u -d -r3.11 -r3.12
--- miexpose.c 11 Sep 2003 05:12:51 -0000 3.11
+++ miexpose.c 12 Feb 2004 18:58:49 -0000 3.12
@@ -260,7 +260,6 @@
extents = pGC->graphicsExposures &&
(REGION_NUM_RECTS(&rgnExposed) > RECTLIMIT) &&
(pDstDrawable->type != DRAWABLE_PIXMAP);
-#ifdef SHAPE
if (pSrcWin)
{
RegionPtr region;
@@ -274,7 +273,6 @@
(RECT_IN_REGION(pscr, region, &srcBox) != rgnIN))
extents = FALSE;
}
-#endif
if (extents)
{
WindowPtr pWin = (WindowPtr)pDstDrawable;
Index: miinitext.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/miinitext.c,v
retrieving revision 3.74
retrieving revision 3.75
diff -u -d -r3.74 -r3.75
--- miinitext.c 29 Dec 2003 06:24:01 -0000 3.74
+++ miinitext.c 12 Feb 2004 18:58:49 -0000 3.75
@@ -123,9 +123,7 @@
#ifdef XTESTEXT1
extern void XTestExtension1Init(INITARGS);
#endif
-#ifdef SHAPE
extern void ShapeExtensionInit(INITARGS);
-#endif
#ifdef EVI
extern void EVIExtensionInit(INITARGS);
#endif
@@ -246,9 +244,7 @@
#ifdef XTESTEXT1
if (!noTestExtensions) XTestExtension1Init();
#endif
-#ifdef SHAPE
ShapeExtensionInit();
-#endif
#ifdef MITSHM
ShmExtensionInit();
#endif
Index: mioverlay.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/mioverlay.c,v
retrieving revision 3.16
retrieving revision 3.17
diff -u -d -r3.16 -r3.17
--- mioverlay.c 11 Sep 2003 05:12:51 -0000 3.16
+++ mioverlay.c 12 Feb 2004 18:58:49 -0000 3.17
@@ -80,9 +80,7 @@
unsigned int, WindowPtr);
static void miOverlayClearToBackground(WindowPtr, int, int, int, int, Bool);
-#ifdef SHAPE
static void miOverlaySetShape(WindowPtr);
-#endif
static void miOverlayChangeBorderWidth(WindowPtr, unsigned int);
#define MIOVERLAY_GET_SCREEN_PRIVATE(pScreen) \
@@ -157,9 +155,7 @@
pScreen->ResizeWindow = miOverlayResizeWindow;
pScreen->MarkWindow = miOverlayMarkWindow;
pScreen->ClearToBackground = miOverlayClearToBackground;
-#ifdef SHAPE
pScreen->SetShape = miOverlaySetShape;
-#endif
pScreen->ChangeBorderWidth = miOverlayChangeBorderWidth;
return TRUE;
@@ -489,7 +485,6 @@
break;
case rgnPART:
newVis = VisibilityPartiallyObscured;
-#ifdef SHAPE
{
RegionPtr pBounding;
@@ -508,7 +503,6 @@
}
}
}
-#endif
break;
default:
newVis = VisibilityFullyObscured;
@@ -1573,7 +1567,6 @@
}
-#ifdef SHAPE
static void
miOverlaySetShape(WindowPtr pWin)
{
@@ -1661,8 +1654,6 @@
WindowsRestructured ();
CheckCursorConfinement(pWin);
}
-#endif
-
static void
Index: miscrinit.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/miscrinit.c,v
retrieving revision 3.20
retrieving revision 3.21
diff -u -d -r3.20 -r3.21
--- miscrinit.c 2 Nov 2003 19:56:10 -0000 3.20
+++ miscrinit.c 12 Feb 2004 18:58:49 -0000 3.21
@@ -306,9 +306,7 @@
pScreen->HandleExposures = miHandleValidateExposures;
pScreen->ReparentWindow = (ReparentWindowProcPtr) 0;
pScreen->ChangeBorderWidth = miChangeBorderWidth;
-#ifdef SHAPE
pScreen->SetShape = miSetShape;
-#endif
pScreen->MarkUnrealizedWindow = miMarkUnrealizedWindow;
pScreen->SaveDoomedAreas = 0;
Index: mivaltree.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/mivaltree.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- mivaltree.c 10 Nov 2003 04:57:17 -0000 1.15
+++ mivaltree.c 12 Feb 2004 18:58:49 -0000 1.16
@@ -97,7 +97,6 @@
#include "globals.h"
-#ifdef SHAPE
/*
* Compute the visibility of a shaped window
*/
@@ -160,7 +159,6 @@
return rgnIN;
return rgnOUT;
}
-#endif
static GetRedirectBorderClipProcPtr miGetRedirectBorderClipProc;
static SetRedirectBorderClipProcPtr miSetRedirectBorderClipProc;
@@ -239,7 +237,6 @@
break;
case rgnPART:
newVis = VisibilityPartiallyObscured;
-#ifdef SHAPE
{
RegionPtr pBounding;
@@ -259,7 +256,6 @@
}
}
}
-#endif
break;
default:
newVis = VisibilityFullyObscured;
Index: miwindow.c
===================================================================
RCS file: /cvs/xserver/xserver/mi/miwindow.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- miwindow.c 11 Sep 2003 05:12:51 -0000 1.9
+++ miwindow.c 12 Feb 2004 18:58:49 -0000 1.10
@@ -966,7 +966,6 @@
return pWin->firstChild;
}
-#ifdef SHAPE
/******
*
* miSetShape
@@ -1070,7 +1069,6 @@
WindowsRestructured ();
CheckCursorConfinement(pWin);
}
-#endif
/* Keeps the same inside(!) origin */