[xorg-commit-diffs] xc/programs/Xserver/cfb Imakefile.inc, 1.1.4.3, 1.1.4.4 cfbmodule.c, 1.1, 1.1.4.1 cfbpntwin.c, 1.1.4.5, 1.1.4.6

[Egbert Eich]

Committed by: eich

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

Modified Files:
      Tag: XORG-CURRENT
	Imakefile.inc cfbmodule.c cfbpntwin.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile.inc
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/cfb/Imakefile.inc,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/Imakefile.inc	5 Mar 2004 13:39:55 -0000	1.1.4.3
+++ b/Imakefile.inc	15 Apr 2004 10:15:44 -0000	1.1.4.4
@@ -93,7 +93,7 @@
 	 cfbply1rctC.o cfbply1rctG.o cfbcppl.o $(PSZOBJS) $(STIPPLEOBJ) \
 	 $(XFMODOBJ)
 
-#ifdef XFree86Version
+#if (defined(XFree86Version) || defined(XorgVersion))
 PLATFORMDEFS = -DXFREE86
 #endif
 

Index: cfbmodule.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/cfb/cfbmodule.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/cfbmodule.c	14 Nov 2003 16:48:53 -0000	1.1
+++ b/cfbmodule.c	15 Apr 2004 10:15:44 -0000	1.1.4.1
@@ -38,7 +38,7 @@
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_ANSIC,		/* Only need the ansic layer */
 	ABI_ANSIC_VERSION,

Index: cfbpntwin.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/cfb/cfbpntwin.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/cfbpntwin.c	5 Mar 2004 13:39:55 -0000	1.1.4.5
+++ b/cfbpntwin.c	15 Apr 2004 10:15:44 -0000	1.1.4.6
@@ -59,11 +59,9 @@
 #include "cfbmskbits.h"
 #include "mi.h"
 
-#ifdef XINERAMA
+#ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
-extern Bool noPanoramiXExtension;
-extern WindowPtr *WindowTable;
 #endif
 
 void
@@ -100,11 +98,9 @@
 	    }
 	    else
 	    {
-#ifndef NO_XINERAMA_PORT
 		int xorg = pWin->drawable.x;
 		int yorg = pWin->drawable.y;
-#endif
-#ifdef XINERAMA
+#ifdef PANORAMIX
 		if(!noPanoramiXExtension) {
 		    int index = pWin->drawable.pScreen->myNum;
 		    if(WindowTable[index] == pWin) {
@@ -117,11 +113,7 @@
 				   (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:
@@ -149,20 +141,16 @@
 	}
 	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 XINERAMA
+#ifdef PANORAMIX
 	    if(!noPanoramiXExtension) {
 		int index = pWin->drawable.pScreen->myNum;
 		if(WindowTable[index] == pBgWin) {
@@ -176,12 +164,7 @@
 			       (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;
     }