Shape extension is built-in and mandatory.

5 files changed, 0 insertions, 20 deletions

diff --git a/include/dix.h b/include/dix.h
index fcb24888b..4b8a96e57 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -313,13 +313,11 @@ extern void SetMaskForEvent(
     Mask /* mask */,
     int /* event */);
 
-#ifdef SHAPE
 extern void ConfineToShape(
     DeviceIntPtr /* pDev */, 
     RegionPtr /* shape */, 
     int*      /* px */,
     int*      /* py */);
-#endif
 
 extern Bool IsParent(
     WindowPtr /* maybeparent */,
diff --git a/include/globals.h b/include/globals.h
index d9f140ec7..ccd71b3d3 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -89,10 +89,6 @@ extern Bool noRRExtension;
 extern Bool noRenderExtension;
 #endif
 
-#ifdef SHAPE
-extern Bool noShapeExtension;
-#endif
-
 #ifdef XCSECURITY
 extern Bool noSecurityExtension;
 #endif
diff --git a/include/inputstr.h b/include/inputstr.h
index 3f5c76870..6bba47cf8 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -314,9 +314,7 @@ typedef struct {
     CursorPtr	current;
     BoxRec	hotLimits;	/* logical constraints of hot spot */
     Bool	confined;	/* confined to screen */
-#if defined(SHAPE) || defined(PANORAMIX)
     RegionPtr	hotShape;	/* additional logical shape constraint */
-#endif
     BoxRec	physLimits;	/* physical constraints of hot spot */
     WindowPtr	win;		/* window of logical position */
     HotSpot	hot;		/* logical pointer position */
diff --git a/include/scrnintstr.h b/include/scrnintstr.h
index 5d4ddbbba..a309077ce 100644
--- a/include/scrnintstr.h
+++ b/include/scrnintstr.h
@@ -426,10 +426,8 @@ typedef    void (* ReparentWindowProcPtr)(
     WindowPtr /*pWin*/,
     WindowPtr /*pPriorParent*/);
 
-#ifdef SHAPE
 typedef    void (* SetShapeProcPtr)(
 	WindowPtr /*pWin*/);
-#endif /* SHAPE */
 
 typedef    void (* ChangeBorderWidthProcPtr)(
 	WindowPtr /*pWin*/,
@@ -589,9 +587,7 @@ typedef struct _Screen {
     HandleExposuresProcPtr	HandleExposures;
     ReparentWindowProcPtr	ReparentWindow;
 
-#ifdef SHAPE
     SetShapeProcPtr		SetShape;
-#endif /* SHAPE */
 
     ChangeBorderWidthProcPtr	ChangeBorderWidth;
     MarkUnrealizedWindowProcPtr	MarkUnrealizedWindow;
diff --git a/include/windowstr.h b/include/windowstr.h
index 2d11f6ec7..76501c726 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -108,11 +108,9 @@ typedef struct _WindowOpt {
     PropertyPtr		userProps;	   /* default: NULL */
     unsigned long	backingBitPlanes;  /* default: ~0L */
     unsigned long	backingPixel;	   /* default: 0 */
-#ifdef SHAPE
     RegionPtr		boundingShape;	   /* default: NULL */
     RegionPtr		clipShape;	   /* default: NULL */
     RegionPtr		inputShape;	   /* default: NULL */
-#endif
     struct _OtherInputMasks *inputMasks;   /* default: NULL */
     DevCursorList       deviceCursors;     /* default: NULL */
     struct _GenericClientMasks *geMasks;   /* default: NULL */
@@ -217,21 +215,15 @@ extern Mask	    DontPropagateMasks[];
 #define wUserProps(w)		wUseDefault(w, userProps, NULL)
 #define wBackingBitPlanes(w)	wUseDefault(w, backingBitPlanes, ~0L)
 #define wBackingPixel(w)	wUseDefault(w, backingPixel, 0)
-#ifdef SHAPE
 #define wBoundingShape(w)	wUseDefault(w, boundingShape, NULL)
 #define wClipShape(w)		wUseDefault(w, clipShape, NULL)
 #define wInputShape(w)          wUseDefault(w, inputShape, NULL)
-#endif
 #define wClient(w)		(clients[CLIENT_ID((w)->drawable.id)])
 #define wBorderWidth(w)		((int) (w)->borderWidth)
 
 /* true when w needs a border drawn. */
 
-#ifdef SHAPE
 #define HasBorder(w)	((w)->borderWidth || wClipShape(w))
-#else
-#define HasBorder(w)	((w)->borderWidth)
-#endif
 
 typedef struct _ScreenSaverStuff {
     WindowPtr pWindow;