[xserver-commit] xserver/hw/xnest Window.c,3.10,3.11 XNWindow.h,1.3,1.4

[Warren Turkal]

Committed by: wt

Update of /cvs/xserver/xserver/hw/xnest
In directory pdx:/tmp/cvs-serv27606/hw/xnest

Modified Files:
	Window.c XNWindow.h 
Log Message:
Make the shape extension always build


Index: Window.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/Window.c,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -d -r3.10 -r3.11
--- Window.c	4 Feb 2004 15:51:20 -0000	3.10
+++ Window.c	12 Feb 2004 18:58:49 -0000	3.11
@@ -128,12 +128,10 @@
   xnestWindowPriv(pWin)->sibling_above = None;
   if (pWin->nextSib)
     xnestWindowPriv(pWin->nextSib)->sibling_above = xnestWindow(pWin);
-#ifdef SHAPE
   xnestWindowPriv(pWin)->bounding_shape = 
     REGION_CREATE(pWin->drawable.pScreen, NULL, 1);
   xnestWindowPriv(pWin)->clip_shape = 
     REGION_CREATE(pWin->drawable.pScreen, NULL, 1);
-#endif /* SHAPE */
 
   if (!pWin->parent) /* only the root window will have the right colormap */
     xnestSetInstalledColormapWindows(pWin->drawable.pScreen);
@@ -146,12 +144,10 @@
   if (pWin->nextSib)
     xnestWindowPriv(pWin->nextSib)->sibling_above = 
       xnestWindowPriv(pWin)->sibling_above;
-#ifdef SHAPE
   REGION_DESTROY(pWin->drawable.pScreen, 
 				xnestWindowPriv(pWin)->bounding_shape);
   REGION_DESTROY(pWin->drawable.pScreen, 
 				xnestWindowPriv(pWin)->clip_shape);
-#endif
   XDestroyWindow(xnestDisplay, xnestWindow(pWin));
   xnestWindowPriv(pWin)->window = None;
 
@@ -354,9 +350,7 @@
 Bool xnestRealizeWindow(WindowPtr pWin)
 {
   xnestConfigureWindow(pWin, CWStackingOrder);
-#ifdef SHAPE
   xnestShapeWindow(pWin);
-#endif /* SHAPE */
   XMapWindow(xnestDisplay, xnestWindow(pWin));
 
   return True;
@@ -398,9 +392,7 @@
 void xnestClipNotify(WindowPtr pWin, int dx, int dy)
 {
   xnestConfigureWindow(pWin, CWStackingOrder); 
-#ifdef SHAPE
   xnestShapeWindow(pWin);
-#endif /* SHAPE */
 }
 
 static Bool xnestWindowExposurePredicate(Display *display, XEvent *event, XPointer ptr)
@@ -435,7 +427,6 @@
   miWindowExposures(pWin, pRgn, other_exposed);
 }
 
-#ifdef SHAPE
 static Bool xnestRegionEqual(RegionPtr pReg1, RegionPtr pReg2)
 {
   BoxPtr pBox1, pBox2;
@@ -529,4 +520,3 @@
     }
   }
 }
-#endif /* SHAPE */

Index: XNWindow.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xnest/XNWindow.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- XNWindow.h	2 Nov 2003 19:56:10 -0000	1.3
+++ XNWindow.h	12 Feb 2004 18:58:49 -0000	1.4
@@ -25,10 +25,8 @@
   unsigned int height;
   unsigned int border_width;
   Window sibling_above;
-#ifdef SHAPE
   RegionPtr bounding_shape;
   RegionPtr clip_shape;
-#endif /* SHAPE */
 } xnestPrivWin;
 
 typedef struct {
@@ -72,8 +70,6 @@
 void xnestCopyWindow(WindowPtr pWin, DDXPointRec oldOrigin, RegionPtr oldRegion);
 void xnestClipNotify(WindowPtr pWin, int dx, int dy);
 void xnestWindowExposures(WindowPtr pWin, RegionPtr pRgn, RegionPtr other_exposed);
-#ifdef SHAPE
 void xnestShapeWindow(WindowPtr pWin);
-#endif /* SHAPE */
 
 #endif /* XNESTWINDOW_H */