[Xorg-commit] xc/programs/Xserver/XTrap xtrapdi.c,1.1.4.1,1.1.4.2

[Kaleb Keithley]

Committed by: kaleb

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

Modified Files:
      Tag: XORG-CURRENT
	xtrapdi.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: xtrapdi.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/XTrap/xtrapdi.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
--- xtrapdi.c	26 Nov 2003 22:48:41 -0000	1.1.4.1
+++ xtrapdi.c	18 Dec 2003 19:29:12 -0000	1.1.4.2
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.7 2003/10/28 22:52:10 tsi Exp $ */
 /*****************************************************************************
 Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
@@ -76,9 +77,9 @@
 #include <X11/extensions/xtrapddmi.h>
 #include <X11/extensions/xtrapproto.h>
 #include "colormapst.h"
-#ifdef PANORAMIX
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
+#ifdef XINERAMA
+#include "xinerama.h"
+#include "xineramaSrv.h"
 #include "cursor.h"
 #endif
 
@@ -1558,8 +1559,8 @@
             /* Copy the event information into our local memory */
             (void)memcpy(&(data.u.event),x_event,sizeof(xEvent));
 
-#ifdef PANORAMIX
-	    if (!noPanoramiXExtension &&
+#ifdef XINERAMA
+	    if (!noXineramaExtension &&
                 (data.u.event.u.u.type == MotionNotify ||
                 data.u.event.u.u.type == ButtonPress ||
                 data.u.event.u.u.type == ButtonRelease ||
@@ -1567,9 +1568,9 @@
                 data.u.event.u.u.type == KeyRelease)) {
 		    int scr = XineramaGetCursorScreen();
 		    data.u.event.u.keyButtonPointer.rootX +=
-			panoramiXdataPtr[scr].x - panoramiXdataPtr[0].x;
+			xineramaDataPtr[scr].x - xineramaDataPtr[0].x;
 		    data.u.event.u.keyButtonPointer.rootY +=
-			panoramiXdataPtr[scr].y - panoramiXdataPtr[0].y;
+			xineramaDataPtr[scr].y - xineramaDataPtr[0].y;
 	    }
 #endif