[Xorg-commit] xc/programs/Xserver/cfb cfbpntwin.c,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver/cfb
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver/cfb

Modified Files:
      Tag: XORG-CURRENT
	cfbpntwin.c 
Log Message:
First pass at "Standard" Xinerama.
The sources for this came from Heather Lanigan's xinerama tree on 
Sourceforge.Net. 
No attempt has been made to handle previous, non-standard versions of 
the protocol. Nor has any attempt been made to preserve the ABI of 
previous versions -- that part will be added at a later time, and 
then probably only on systems that have nice object/linker semantics, 
e.g. ELF systems with weak symbols.



Index: cfbpntwin.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/cfb/cfbpntwin.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- cfbpntwin.c	26 Nov 2003 22:48:43 -0000	1.1.4.2
+++ cfbpntwin.c	18 Dec 2003 19:29:12 -0000	1.1.4.3
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $Xorg: cfbpntwin.c,v 1.4 2001/02/09 02:04:38 xorgcvs Exp $ */
 /***********************************************************
 
@@ -58,9 +59,11 @@
 #include "cfbmskbits.h"
 #include "mi.h"
 
-#ifdef PANORAMIX
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
+#ifdef XINERAMA
+#include "xinerama.h"
+#include "xineramaSrv.h"
+extern Bool noXineramaExtension;
+extern WindowPtr *WindowTable;
 #endif
 
 void
@@ -97,14 +100,16 @@
 	    }
 	    else
 	    {
+#ifndef NO_XINERAMA_PORT
 		int xorg = pWin->drawable.x;
 		int yorg = pWin->drawable.y;
-#ifdef PANORAMIX
-		if(!noPanoramiXExtension) {
+#endif
+#ifdef XINERAMA
+		if(!noXineramaExtension) {
 		    int index = pWin->drawable.pScreen->myNum;
 		    if(WindowTable[index] == pWin) {
-			xorg -= panoramiXdataPtr[index].x;
-			yorg -= panoramiXdataPtr[index].y;
+			xorg -= xineramaDataPtr[index].x;
+			yorg -= xineramaDataPtr[index].y;
 		    }
 		}
 #endif
@@ -112,7 +117,11 @@
 				   (int)REGION_NUM_RECTS(pRegion),
 				   REGION_RECTS(pRegion),
 				   pWin->background.pixmap,
+#ifndef NO_XINERAMA_PORT
 				   xorg, yorg);
+#else
+				   (int)pWin->drawable.x, (int)pWin->drawable.y);
+#endif
 	    }
 	    break;
 	case BackgroundPixel:
@@ -140,21 +149,25 @@
 	}
 	else
 	{
+#ifndef NO_XINERAMA_PORT
 	    int xorg, yorg;
+#endif
 
 	    for (pBgWin = pWin;
 		 pBgWin->backgroundState == ParentRelative;
 		 pBgWin = pBgWin->parent);
 
+#ifndef NO_XINERAMA_PORT
 	    xorg = pBgWin->drawable.x;
 	    yorg = pBgWin->drawable.y;
+#endif
 
-#ifdef PANORAMIX
-	    if(!noPanoramiXExtension) {
+#ifdef XINERAMA
+	    if(!noXineramaExtension) {
 		int index = pWin->drawable.pScreen->myNum;
 		if(WindowTable[index] == pBgWin) {
-		    xorg -= panoramiXdataPtr[index].x;
-		    yorg -= panoramiXdataPtr[index].y;
+		    xorg -= xineramaDataPtr[index].x;
+		    yorg -= xineramaDataPtr[index].y;
 		}
 	    }
 #endif
@@ -163,7 +176,12 @@
 			       (int)REGION_NUM_RECTS(pRegion),
 			       REGION_RECTS(pRegion),
 			       pWin->border.pixmap,
+#ifndef NO_XINERAMA_PORT
 			       xorg, yorg);
+#else
+			       (int) pBgWin->drawable.x,
+			       (int) pBgWin->drawable.y);
+#endif
 	}
 	break;
     }