[Xorg-commit] xc/programs/Xserver/fb fbwindow.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

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

Modified Files:
      Tag: XORG-CURRENT
	fbwindow.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: fbwindow.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/fb/fbwindow.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- fbwindow.c	26 Nov 2003 22:48:43 -0000	1.1.4.1
+++ fbwindow.c	18 Dec 2003 19:29:12 -0000	1.1.4.2
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /*
  * Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
@@ -223,9 +224,9 @@
     }
 }
 
-#ifdef PANORAMIX
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
+#ifdef XINERAMA
+#include "xinerama.h"
+#include "xineramaSrv.h"
 #endif
 
 void
@@ -247,14 +248,14 @@
     int		xRot = pDrawable->x;
     int		yRot = pDrawable->y;
     
-#ifdef PANORAMIX
-    if(!noPanoramiXExtension) 
+#ifdef XINERAMA
+    if(!noXineramaExtension) 
     {
 	int index = pDrawable->pScreen->myNum;
 	if(&WindowTable[index]->drawable == pDrawable) 
 	{
-	    xRot -= panoramiXdataPtr[index].x;
-	    yRot -= panoramiXdataPtr[index].y;
+	    xRot -= xineramaDataPtr[index].x;
+	    yRot -= xineramaDataPtr[index].y;
 	}
     }
 #endif