[xserver-commit] xserver/miext/rootless rootlessCommon.h,1.3,1.4 rootlessScreen.c,1.3,1.4 rootlessValTree.c,1.2,1.3 rootlessWindow.c,1.5,1.6 rootlessWindow.h,1.2,1.3

[Warren Turkal]

Committed by: wt

Update of /cvs/xserver/xserver/miext/rootless
In directory pdx:/tmp/cvs-serv27606/miext/rootless

Modified Files:
	rootlessCommon.h rootlessScreen.c rootlessValTree.c 
	rootlessWindow.c rootlessWindow.h 
Log Message:
Make the shape extension always build


Index: rootlessCommon.h
===================================================================
RCS file: /cvs/xserver/xserver/miext/rootless/rootlessCommon.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rootlessCommon.h	11 Sep 2003 05:12:51 -0000	1.3
+++ rootlessCommon.h	12 Feb 2004 18:58:49 -0000	1.4
@@ -91,9 +91,7 @@
     MarkOverlappedWindowsProcPtr MarkOverlappedWindows;
     ValidateTreeProcPtr ValidateTree;
 
-#ifdef SHAPE
     SetShapeProcPtr SetShape;
-#endif
 
 #ifdef RENDER
     CompositeProcPtr Composite;

Index: rootlessScreen.c
===================================================================
RCS file: /cvs/xserver/xserver/miext/rootless/rootlessScreen.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rootlessScreen.c	11 Sep 2003 05:12:51 -0000	1.3
+++ rootlessScreen.c	12 Feb 2004 18:58:49 -0000	1.4
@@ -615,10 +615,7 @@
     WRAP(MarkOverlappedWindows);
     WRAP(ValidateTree);
     WRAP(ChangeWindowAttributes);
-
-#ifdef SHAPE
     WRAP(SetShape);
-#endif
 
 #ifdef RENDER
     {

Index: rootlessValTree.c
===================================================================
RCS file: /cvs/xserver/xserver/miext/rootless/rootlessValTree.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rootlessValTree.c	11 Sep 2003 05:12:51 -0000	1.2
+++ rootlessValTree.c	12 Feb 2004 18:58:49 -0000	1.3
@@ -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
 
 #define HasParentRelativeBorder(w) (!(w)->borderIsPixel && \
 				    HasBorder(w) && \
@@ -228,7 +226,6 @@
 	    break;
 	case rgnPART:
 	    newVis = VisibilityPartiallyObscured;
-#ifdef SHAPE
 	    {
 		RegionPtr   pBounding;
 
@@ -248,7 +245,6 @@
 		    }
 		}
 	    }
-#endif
 	    break;
 	default:
 	    newVis = VisibilityFullyObscured;

Index: rootlessWindow.c
===================================================================
RCS file: /cvs/xserver/xserver/miext/rootless/rootlessWindow.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rootlessWindow.c	11 Sep 2003 05:12:51 -0000	1.5
+++ rootlessWindow.c	12 Feb 2004 18:58:49 -0000	1.6
@@ -137,8 +137,6 @@
 }
 
 
-#ifdef SHAPE
-
 static Bool
 RootlessGetShape(WindowPtr pWin, RegionPtr pShape)
 {
@@ -215,8 +213,6 @@
     RootlessReshapeFrame(pWin);
 }
 
-#endif // SHAPE
-
 
 /* Disallow ParentRelative background on top-level windows
    because the root window doesn't really have the right background
@@ -329,10 +325,8 @@
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
     RootlessWindowRec *winRec;
-#ifdef SHAPE
     RegionRec shape;
     RegionPtr pShape = NULL;
-#endif
 
     if (WINREC(pWin) != NULL)
         return WINREC(pWin);
@@ -357,11 +351,9 @@
 
     WINREC(pWin) = winRec;
 
-#ifdef SHAPE
     // Set the frame's shape if the window is shaped
     if (RootlessGetShape(pWin, &shape))
         pShape = &shape;
-#endif
 
     RL_DEBUG_MSG("creating frame ");
 
@@ -375,10 +367,8 @@
         return NULL;
     }
 
-#ifdef SHAPE
     if (pShape != NULL)
         REGION_UNINIT (pScreen, &shape);
-#endif
 
     return winRec;
 }

Index: rootlessWindow.h
===================================================================
RCS file: /cvs/xserver/xserver/miext/rootless/rootlessWindow.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rootlessWindow.h	11 Sep 2003 05:12:51 -0000	1.2
+++ rootlessWindow.h	12 Feb 2004 18:58:49 -0000	1.3
@@ -37,9 +37,7 @@
 Bool RootlessCreateWindow(WindowPtr pWin);
 Bool RootlessDestroyWindow(WindowPtr pWin);
 
-#ifdef SHAPE
 void RootlessSetShape(WindowPtr pWin);
-#endif // SHAPE
 
 Bool RootlessChangeWindowAttributes(WindowPtr pWin, unsigned long vmask);
 Bool RootlessPositionWindow(WindowPtr pWin, int x, int y);