Merged changes from RELEASE-1 branch

7 files changed, 53 insertions, 55 deletions

diff --git a/Xext/panoramiX.h b/Xext/panoramiX.h
index c957d06ce..bc88c8b89 100644
--- a/Xext/panoramiX.h
+++ b/Xext/panoramiX.h
@@ -27,6 +27,7 @@ dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 
 ******************************************************************/
+
 /* $XFree86: xc/programs/Xserver/Xext/panoramiX.h,v 1.5 2001/01/03 02:54:17 keithp Exp $ */
 
 /* THIS IS NOT AN X PROJECT TEAM SPECIFICATION */
diff --git a/Xext/saver.c b/Xext/saver.c
index 377e1969c..4b783fd5e 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/saver.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
+/* $XdotOrg$ */
 /*
  * $XConsortium: saver.c,v 1.12 94/04/17 20:59:36 dpw Exp $
  *
@@ -47,7 +47,7 @@ in this Software without prior written authorization from the X Consortium.
 #include "gcstruct.h"
 #include "cursorstr.h"
 #include "colormapst.h"
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@@ -677,7 +677,7 @@ ScreenSaverHandle (pScreen, xstate, force)
 	    ret = TRUE;
 	
     }
-#ifdef XINERAMA
+#ifdef PANORAMIX
     if(noPanoramiXExtension || !pScreen->myNum)
 #endif
        SendScreenSaverNotify (pScreen, state, force);
@@ -1195,7 +1195,7 @@ ScreenSaverUnsetAttributes (ClientPtr client)
 static int
 ProcScreenSaverSetAttributes (ClientPtr client)
 {
-#ifdef XINERAMA
+#ifdef PANORAMIX
     if(!noPanoramiXExtension) {
        REQUEST(xScreenSaverSetAttributesReq);
        PanoramiXRes *draw;
@@ -1274,7 +1274,7 @@ ProcScreenSaverSetAttributes (ClientPtr client)
 static int
 ProcScreenSaverUnsetAttributes (ClientPtr client)
 {
-#ifdef XINERAMA
+#ifdef PANORAMIX
     if(!noPanoramiXExtension) {
        REQUEST(xScreenSaverUnsetAttributesReq);
        PanoramiXRes *draw;
diff --git a/Xext/shape.c b/Xext/shape.c
index 0407db90f..8f5c3dba0 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/shape.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
+/* $XdotOrg$ */
 /* $XFree86: xc/programs/Xserver/Xext/shape.c,v 3.18 2003/10/28 23:08:43 tsi Exp $ */
 /************************************************************
 
@@ -113,7 +113,7 @@ static DISPATCH_PROC(SProcShapeQueryVersion);
 static DISPATCH_PROC(SProcShapeRectangles);
 static DISPATCH_PROC(SProcShapeSelectInput);
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@@ -376,9 +376,9 @@ ProcShapeRectangles (client)
 			  stuff->xOff, stuff->yOff, createDefault);
 }
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 static int
-ProcXineramaShapeRectangles(
+ProcPanoramiXShapeRectangles(
     register ClientPtr client)
 {
     REQUEST(xShapeRectanglesReq);
@@ -465,9 +465,9 @@ ProcShapeMask (client)
 			  stuff->xOff, stuff->yOff, createDefault);
 }
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 static int
-ProcXineramaShapeMask(
+ProcPanoramiXShapeMask(
     register ClientPtr client)
 {
     REQUEST(xShapeMaskReq);
@@ -580,9 +580,9 @@ ProcShapeCombine (client)
 }
 
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 static int
-ProcXineramaShapeCombine(
+ProcPanoramiXShapeCombine(
     register ClientPtr client)
 {
     REQUEST(xShapeCombineReq);
@@ -649,9 +649,9 @@ ProcShapeOffset (client)
 }
 
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 static int
-ProcXineramaShapeOffset(
+ProcPanoramiXShapeOffset(
     register ClientPtr client)
 {
     REQUEST(xShapeOffsetReq);
@@ -1065,30 +1065,30 @@ ProcShapeDispatch (client)
     case X_ShapeQueryVersion:
 	return ProcShapeQueryVersion (client);
     case X_ShapeRectangles:
-#ifdef XINERAMA
+#ifdef PANORAMIX
         if ( !noPanoramiXExtension )
-	    return ProcXineramaShapeRectangles (client);
+	    return ProcPanoramiXShapeRectangles (client);
         else 
 #endif
 	return ProcShapeRectangles (client);
     case X_ShapeMask:
-#ifdef XINERAMA
+#ifdef PANORAMIX
         if ( !noPanoramiXExtension )
-           return ProcXineramaShapeMask (client);
+           return ProcPanoramiXShapeMask (client);
 	else
 #endif
 	return ProcShapeMask (client);
     case X_ShapeCombine:
-#ifdef XINERAMA
+#ifdef PANORAMIX
         if ( !noPanoramiXExtension )
-           return ProcXineramaShapeCombine (client);
+           return ProcPanoramiXShapeCombine (client);
 	else
 #endif
 	return ProcShapeCombine (client);
     case X_ShapeOffset:
-#ifdef XINERAMA
+#ifdef PANORAMIX
         if ( !noPanoramiXExtension )
-           return ProcXineramaShapeOffset (client);
+           return ProcPanoramiXShapeOffset (client);
 	else
 #endif
 	return ProcShapeOffset (client);
diff --git a/Xext/shm.c b/Xext/shm.c
index d2e1f507b..29eab06f5 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -62,7 +62,7 @@ in this Software without prior written authorization from The Open Group.
 #include "xf86_ansic.h"
 #endif
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@@ -560,9 +560,9 @@ fbShmPutImage(dst, pGC, depth, format, w, h, sx, sy, sw, sh, dx, dy, data)
 }
 
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 static int 
-ProcXineramaShmPutImage(register ClientPtr client)
+ProcPanoramiXShmPutImage(register ClientPtr client)
 {
     int			 j, result = 0, orig_x, orig_y;
     PanoramiXRes	*draw, *gc;
@@ -600,7 +600,7 @@ ProcXineramaShmPutImage(register ClientPtr client)
 }
 
 static int 
-ProcXineramaShmGetImage(ClientPtr client)
+ProcPanoramiXShmGetImage(ClientPtr client)
 {
     PanoramiXRes	*draw;
     DrawablePtr 	drawables[MAXSCREENS];
@@ -714,7 +714,7 @@ ProcXineramaShmGetImage(ClientPtr client)
 }
 
 static int
-ProcXineramaShmCreatePixmap(
+ProcPanoramiXShmCreatePixmap(
     register ClientPtr client)
 {
     ScreenPtr pScreen = NULL;
@@ -1080,11 +1080,9 @@ CreatePmap:
 			    shmdesc->addr + stuff->offset);
     if (pMap)
     {
-#ifdef NO_XINERAMA_PORT
 #ifdef PIXPRIV
 	pMap->devPrivates[shmPixmapPrivate].ptr = (pointer) shmdesc;
 #endif
-#endif
 	shmdesc->refcnt++;
 	pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER;
 	pMap->drawable.id = stuff->pid;
@@ -1110,21 +1108,21 @@ ProcShmDispatch (client)
     case X_ShmDetach:
 	return ProcShmDetach(client);
     case X_ShmPutImage:
-#ifdef XINERAMA
+#ifdef PANORAMIX
         if ( !noPanoramiXExtension )
-	   return ProcXineramaShmPutImage(client);
+	   return ProcPanoramiXShmPutImage(client);
 #endif
 	return ProcShmPutImage(client);
     case X_ShmGetImage:
-#ifdef XINERAMA
+#ifdef PANORAMIX
         if ( !noPanoramiXExtension )
-	   return ProcXineramaShmGetImage(client);
+	   return ProcPanoramiXShmGetImage(client);
 #endif
 	return ProcShmGetImage(client);
     case X_ShmCreatePixmap:
-#ifdef XINERAMA
+#ifdef PANORAMIX
         if ( !noPanoramiXExtension )
-	   return ProcXineramaShmCreatePixmap(client);
+	   return ProcPanoramiXShmCreatePixmap(client);
 #endif
 	   return ProcShmCreatePixmap(client);
     default:
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 1f4213db2..3635b3898 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/xtest.c,v 1.1.4.3 2003/12/18 19:29:12 kaleb Exp $ */
+/* $XdotOrg$ */
 /* $Xorg: xtest.c,v 1.4 2001/02/09 02:04:33 xorgcvs Exp $ */
 /*
 
@@ -64,7 +64,7 @@ static unsigned char XTestReqCode;
 extern int DeviceValuator;
 #endif /* XINPUT */
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@@ -391,7 +391,7 @@ ProcXTestFakeInput(client)
 	    return BadValue;
 	}
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 	if (!noPanoramiXExtension) {
 	    ScreenPtr pScreen = root->drawable.pScreen;
 	    BoxRec    box;
@@ -426,7 +426,7 @@ ProcXTestFakeInput(client)
 	else if (ev->u.keyButtonPointer.rootY >= root->drawable.height)
 	    ev->u.keyButtonPointer.rootY = root->drawable.height - 1;
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 	if ((!noPanoramiXExtension
 	     && root->drawable.pScreen->myNum != XineramaGetCursorScreen())
 	    || (noPanoramiXExtension && root != GetCurrentRootWindow()))
diff --git a/Xext/xvdisp.c b/Xext/xvdisp.c
index a1dd69e19..f98168c99 100644
--- a/Xext/xvdisp.c
+++ b/Xext/xvdisp.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/xvdisp.c,v 1.1.4.3 2004/02/25 21:46:33 kaleb Exp $ */
+/* $XdotOrg$ */
 /***********************************************************
 Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
 and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@@ -73,7 +73,7 @@ SOFTWARE.
 
 #include "xvdisp.h"
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 
@@ -233,14 +233,14 @@ ProcXvDispatch(ClientPtr client)
     case xv_QueryAdaptors: return(ProcXvQueryAdaptors(client));
     case xv_QueryEncodings: return(ProcXvQueryEncodings(client));
     case xv_PutVideo:
-#ifdef XINERAMA
+#ifdef PANORAMIX
         if(!noPanoramiXExtension)
             return(XineramaXvPutVideo(client));
         else
 #endif
             return(ProcXvPutVideo(client));
     case xv_PutStill:
-#ifdef XINERAMA
+#ifdef PANORAMIX
         if(!noPanoramiXExtension)
             return(XineramaXvPutStill(client));
         else
@@ -253,14 +253,14 @@ ProcXvDispatch(ClientPtr client)
     case xv_SelectVideoNotify: return(ProcXvSelectVideoNotify(client));
     case xv_SelectPortNotify: return(ProcXvSelectPortNotify(client));
     case xv_StopVideo: 
-#ifdef XINERAMA
+#ifdef PANORAMIX
         if(!noPanoramiXExtension)
 	    return(XineramaXvStopVideo(client));
 	else
 #endif
 	    return(ProcXvStopVideo(client));
     case xv_SetPortAttribute: 
-#ifdef XINERAMA
+#ifdef PANORAMIX
         if(!noPanoramiXExtension)
 	    return(XineramaXvSetPortAttribute(client));
 	else
@@ -270,7 +270,7 @@ ProcXvDispatch(ClientPtr client)
     case xv_QueryBestSize: return(ProcXvQueryBestSize(client));
     case xv_QueryPortAttributes: return(ProcXvQueryPortAttributes(client));
     case xv_PutImage:
-#ifdef XINERAMA
+#ifdef PANORAMIX
         if(!noPanoramiXExtension)
 	    return(XineramaXvPutImage(client));
 	else
@@ -278,7 +278,7 @@ ProcXvDispatch(ClientPtr client)
 	    return(ProcXvPutImage(client));
 #ifdef MITSHM
     case xv_ShmPutImage: 
-#ifdef XINERAMA
+#ifdef PANORAMIX
         if(!noPanoramiXExtension)
 	    return(XineramaXvShmPutImage(client));
 	else
@@ -1863,7 +1863,7 @@ SWriteListImageFormatsReply(
 }
 
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 
 
 
@@ -2079,8 +2079,7 @@ XineramaXvPutStill(ClientPtr client)
                 client, stuff->port, XvXRTPort, SecurityReadAccess)))
         return _XvBadPort;
 
-    isRoot = (draw->type == XRT_WINDOW) &&
-		(stuff->drawable == WindowTable[0]->drawable.id);
+    isRoot = (draw->type == XRT_WINDOW) && draw->u.win.root;
 
     x = stuff->drw_x;
     y = stuff->drw_y;
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index abef11b99..e95bbe390 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/Xext/xvmain.c,v 1.1.4.2 2003/12/18 19:29:12 kaleb Exp $ */
+/* $XdotOrg$ */
 /***********************************************************
 Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
 and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
@@ -99,7 +99,7 @@ SOFTWARE.
 #include "xf86_ansic.h"
 #endif
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #include "xvdisp.h"
@@ -172,7 +172,7 @@ XvExtensionInit()
 	  ErrorF("XvExtensionInit: Unable to allocate screen private index\n");
 	  return;
 	}
-#ifdef XINERAMA
+#ifdef PANORAMIX
         XineramaRegisterConnectionBlockCallback(XineramifyXv);
 #endif
       XvScreenGeneration = serverGeneration;
@@ -271,7 +271,7 @@ XvScreenInit(ScreenPtr pScreen)
 	  ErrorF("XvScreenInit: Unable to allocate screen private index\n");
 	  return BadAlloc;
 	}
-#ifdef XINERAMA
+#ifdef PANORAMIX
         XineramaRegisterConnectionBlockCallback(XineramifyXv);
 #endif
       XvScreenGeneration = serverGeneration;