[xorg-commit-diffs] xc/programs/Xserver/Xext Imakefile, 1.1.4.8, 1.1.4.9 panoramiX.h, 1.1.4.3, 1.1.4.4 saver.c, 1.1.4.4, 1.1.4.5 shape.c, 1.1.4.7, 1.1.4.8 shm.c, 1.1.4.7, 1.1.4.8 xtest.c, 1.1.4.5, 1.1.4.6 xvdisp.c, 1.1.4.5, 1.1.4.6 xvmain.c, 1.1.4.4, 1.1.4.5 panoramiXstubs.c, 1.1, NONE xinerama.c, 1.1.4.4, NONE xinerama.h, 1.1.4.3, NONE xineramaP.h, 1.1.4.1, NONE xineramaProcs.c, 1.1.4.3, NONE xineramaSrv.h, 1.1.4.1, NONE xineramaSwap.c, 1.1.4.3, NONE

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/Xext
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/Xext

Modified Files:
      Tag: XORG-CURRENT
	Imakefile panoramiX.h saver.c shape.c shm.c xtest.c xvdisp.c 
	xvmain.c 
Removed Files:
      Tag: XORG-CURRENT
	panoramiXstubs.c xinerama.c xinerama.h xineramaP.h 
	xineramaProcs.c xineramaSrv.h xineramaSwap.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/Imakefile,v
retrieving revision 1.1.4.8
retrieving revision 1.1.4.9
diff -u -d -r1.1.4.8 -r1.1.4.9
--- a/Imakefile	25 Mar 2004 05:20:20 -0000	1.1.4.8
+++ b/Imakefile	15 Apr 2004 10:15:40 -0000	1.1.4.9
@@ -37,12 +37,12 @@
   SCRNSAVOBJ = saver.o
 #endif
 
-#if BuildXF86VidModeExt && XF86Server
+#if BuildXF86VidModeExt && (XF86Server || XorgServer)
  VIDMODESRCS = xf86vmode.c
  VIDMODEOBJS = xf86vmode.o
 #endif
 
-#if BuildXF86MiscExt && XF86Server
+#if BuildXF86MiscExt && (XF86Server || XorgServer)
 XF86MISCSRCS = xf86misc.c
 XF86MISCOBJS = xf86misc.o
 #endif
@@ -85,9 +85,9 @@
          CUPOBJS = cup.o
 #endif
 #if BuildXinerama
-    XINERAMASRCS = panoramiX.c panoramiXSwap.c panoramiXprocs.c
-    XINERAMAOBJS = panoramiX.o panoramiXSwap.o panoramiXprocs.o
-    XINERAMAINCS = -I$(FONTINCSRC) -I../mi -I../render
+        PNRXSRCS = panoramiX.c panoramiXSwap.c panoramiXprocs.c
+        PNRXOBJS = panoramiX.o panoramiXSwap.o panoramiXprocs.o
+    PNRXINCLUDES = -I$(FONTINCSRC) -I../mi -I../render
 #endif
 #if BuildDPMS
         DPMSSRCS = dpms.c
@@ -107,26 +107,26 @@
               mitmisc.c xtest.c xtest1di.c xtest1dd.c sleepuntil.c \
 	      bigreq.c sync.c $(SCRNSAVSRC) xcmisc.c $(VIDMODESRCS) \
 	      $(XF86MISCSRCS) $(XF86BIGFSRCS) $(XF86DGASRCS) $(SECURITYSRCS) \
-	      $(APPGROUPSRCS) xprint.c $(CUPSRCS) $(XINERAMASRCS) $(DPMSSRCS) \
+	      $(APPGROUPSRCS) xprint.c $(CUPSRCS) $(PNRXSRCS) $(DPMSSRCS) \
 	      $(EVISRCS) $(XVSRCS) $(FONTCACHESRCS) $(XRESSRCS)
 
        OBJS = shape.o $(SHMOBJS) $(MULTIBUFOBJ) \
               mitmisc.o xtest.o xtest1di.o xtest1dd.o sleepuntil.o \
               bigreq.o sync.o $(SCRNSAVOBJ) xcmisc.o $(VIDMODEOBJS) \
 	      $(XF86MISCOBJS) $(XF86BIGFOBJS) $(XF86DGAOBJS) $(SECURITYOBJS) \
-	      $(APPGROUPOBJS) xprint.o $(CUPOBJS) $(XINERAMAOBJS) $(DPMSOBJS) \
+	      $(APPGROUPOBJS) xprint.o $(CUPOBJS) $(PNRXOBJS) $(DPMSOBJS) \
 	      $(EVIOBJS) $(XVOBJS) $(FONTCACHEOBJS) $(XRESOBJS)
 
       SOBJS = $(SHMOBJS) $(APPGROUPOBJS) $(SECURITYOBJS) xprint.o \
-	      xtest.o xtest1di.o xtest1dd.o sleepuntil.o $(XINERAMAOBJS) \
+	      xtest.o xtest1di.o xtest1dd.o sleepuntil.o $(PNRXOBJS) \
 	      $(XF86BIGFOBJS)
 
-#ifdef XFree86Version
+#if (defined(XFree86Version) || defined(XorgVersion))
 /* XXX Check if this can be eliminated */
 XF86INCLUDES = -I$(XF86COMSRC)
 #endif
     INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
-		$(XINERAMAINCS) $(XF86INCLUDES) -I$(FONTINCSRC) \
+		$(PNRXINCLUDES) $(XF86INCLUDES) -I$(FONTINCSRC) \
  		$(FONTCACHEINCLUDES)
     LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln
 

Index: panoramiX.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/panoramiX.h,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/panoramiX.h	7 Mar 2004 23:45:09 -0000	1.1.4.3
+++ b/panoramiX.h	15 Apr 2004 10:15:40 -0000	1.1.4.4
@@ -27,6 +27,7 @@
 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 */

Index: saver.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/saver.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/saver.c	5 Mar 2004 13:39:50 -0000	1.1.4.4
+++ b/saver.c	15 Apr 2004 10:15:40 -0000	1.1.4.5
@@ -47,7 +47,7 @@
 #include "gcstruct.h"
 #include "cursorstr.h"
 #include "colormapst.h"
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@@ -677,7 +677,7 @@
 	    ret = TRUE;
 	
     }
-#ifdef XINERAMA
+#ifdef PANORAMIX
     if(noPanoramiXExtension || !pScreen->myNum)
 #endif
        SendScreenSaverNotify (pScreen, state, force);
@@ -1195,7 +1195,7 @@
 static int
 ProcScreenSaverSetAttributes (ClientPtr client)
 {
-#ifdef XINERAMA
+#ifdef PANORAMIX
     if(!noPanoramiXExtension) {
        REQUEST(xScreenSaverSetAttributesReq);
        PanoramiXRes *draw;
@@ -1274,7 +1274,7 @@
 static int
 ProcScreenSaverUnsetAttributes (ClientPtr client)
 {
-#ifdef XINERAMA
+#ifdef PANORAMIX
     if(!noPanoramiXExtension) {
        REQUEST(xScreenSaverUnsetAttributesReq);
        PanoramiXRes *draw;

Index: shape.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/shape.c,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -u -d -r1.1.4.7 -r1.1.4.8
--- a/shape.c	25 Mar 2004 05:11:16 -0000	1.1.4.7
+++ b/shape.c	15 Apr 2004 10:15:40 -0000	1.1.4.8
@@ -113,7 +113,7 @@
 static DISPATCH_PROC(SProcShapeRectangles);
 static DISPATCH_PROC(SProcShapeSelectInput);
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@@ -376,9 +376,9 @@
 			  stuff->xOff, stuff->yOff, createDefault);
 }
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 static int
-ProcXineramaShapeRectangles(
+ProcPanoramiXShapeRectangles(
     register ClientPtr client)
 {
     REQUEST(xShapeRectanglesReq);
@@ -465,9 +465,9 @@
 			  stuff->xOff, stuff->yOff, createDefault);
 }
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 static int
-ProcXineramaShapeMask(
+ProcPanoramiXShapeMask(
     register ClientPtr client)
 {
     REQUEST(xShapeMaskReq);
@@ -580,9 +580,9 @@
 }
 
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 static int
-ProcXineramaShapeCombine(
+ProcPanoramiXShapeCombine(
     register ClientPtr client)
 {
     REQUEST(xShapeCombineReq);
@@ -649,9 +649,9 @@
 }
 
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 static int
-ProcXineramaShapeOffset(
+ProcPanoramiXShapeOffset(
     register ClientPtr client)
 {
     REQUEST(xShapeOffsetReq);
@@ -1065,30 +1065,30 @@
     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);

Index: shm.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/shm.c,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -u -d -r1.1.4.7 -r1.1.4.8
--- a/shm.c	5 Mar 2004 13:39:50 -0000	1.1.4.7
+++ b/shm.c	15 Apr 2004 10:15:40 -0000	1.1.4.8
@@ -62,7 +62,7 @@
 #include "xf86_ansic.h"
 #endif
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@@ -560,9 +560,9 @@
 }
 
 
-#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 @@
 }
 
 static int 
-ProcXineramaShmGetImage(ClientPtr client)
+ProcPanoramiXShmGetImage(ClientPtr client)
 {
     PanoramiXRes	*draw;
     DrawablePtr 	drawables[MAXSCREENS];
@@ -714,7 +714,7 @@
 }
 
 static int
-ProcXineramaShmCreatePixmap(
+ProcPanoramiXShmCreatePixmap(
     register ClientPtr client)
 {
     ScreenPtr pScreen = NULL;
@@ -1080,11 +1080,9 @@
 			    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 @@
     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:

Index: xtest.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xtest.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/xtest.c	5 Mar 2004 13:39:51 -0000	1.1.4.5
+++ b/xtest.c	15 Apr 2004 10:15:40 -0000	1.1.4.6
@@ -64,7 +64,7 @@
 extern int DeviceValuator;
 #endif /* XINPUT */
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #endif
@@ -391,7 +391,7 @@
 	    return BadValue;
 	}
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 	if (!noPanoramiXExtension) {
 	    ScreenPtr pScreen = root->drawable.pScreen;
 	    BoxRec    box;
@@ -426,7 +426,7 @@
 	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()))

Index: xvdisp.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xvdisp.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/xvdisp.c	5 Mar 2004 13:39:51 -0000	1.1.4.5
+++ b/xvdisp.c	15 Apr 2004 10:15:40 -0000	1.1.4.6
@@ -73,7 +73,7 @@
 
 #include "xvdisp.h"
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 
@@ -233,14 +233,14 @@
     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 @@
     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 @@
     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 @@
 	    return(ProcXvPutImage(client));
 #ifdef MITSHM
     case xv_ShmPutImage: 
-#ifdef XINERAMA
+#ifdef PANORAMIX
         if(!noPanoramiXExtension)
 	    return(XineramaXvShmPutImage(client));
 	else
@@ -1863,7 +1863,7 @@
 }
 
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 
 
 
@@ -2079,8 +2079,7 @@
                 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;

Index: xvmain.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xext/xvmain.c,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/xvmain.c	5 Mar 2004 13:39:51 -0000	1.1.4.4
+++ b/xvmain.c	15 Apr 2004 10:15:40 -0000	1.1.4.5
@@ -99,7 +99,7 @@
 #include "xf86_ansic.h"
 #endif
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
 #include "xvdisp.h"
@@ -172,7 +172,7 @@
 	  ErrorF("XvExtensionInit: Unable to allocate screen private index\n");
 	  return;
 	}
-#ifdef XINERAMA
+#ifdef PANORAMIX
         XineramaRegisterConnectionBlockCallback(XineramifyXv);
 #endif
       XvScreenGeneration = serverGeneration;
@@ -271,7 +271,7 @@
 	  ErrorF("XvScreenInit: Unable to allocate screen private index\n");
 	  return BadAlloc;
 	}
-#ifdef XINERAMA
+#ifdef PANORAMIX
         XineramaRegisterConnectionBlockCallback(XineramifyXv);
 #endif
       XvScreenGeneration = serverGeneration; 

--- panoramiXstubs.c DELETED ---

--- xinerama.c DELETED ---

--- xinerama.h DELETED ---

--- xineramaP.h DELETED ---

--- xineramaProcs.c DELETED ---

--- xineramaSrv.h DELETED ---

--- xineramaSwap.c DELETED ---