merge XFree86 4.3.0.1 to -CURRENT

1 files changed, 46 insertions, 43 deletions

diff --git a/Xext/panoramiXSwap.c b/Xext/panoramiXSwap.c
index c6bb5071e..e78624187 100644
--- a/Xext/panoramiXSwap.c
+++ b/Xext/panoramiXSwap.c
@@ -23,6 +23,7 @@ shall not be used in advertising or otherwise to promote the sale, use or other
 dealings in this Software without prior written authorization from Digital
 Equipment Corporation.
 ******************************************************************/
+/* $XFree86: xc/programs/Xserver/Xext/panoramiXSwap.c,v 3.8 2001/08/23 13:01:36 alanh Exp $ */
 
 #include <stdio.h>
 #include "X.h"
@@ -44,20 +45,16 @@ Equipment Corporation.
 #endif
 #include "panoramiX.h"
 #include "panoramiXproto.h"
+#include "panoramiXsrv.h"
+#include "globals.h"
 
 
 /*
-/*
  *	External references for data variables
  */
 
-extern Bool noPanoramiXExtension;
-extern Bool PanoramiXVisibilityNotifySent;
-extern WindowPtr *WindowTable;
-extern int defaultBackingStore;
 extern char *ConnectionInfo;
 extern int connBlockScreenStart;
-extern int (* ProcVector[256]) ();
 
 #if NeedFunctionPrototypes
 #define PROC_EXTERN(pfunc)      extern int pfunc(ClientPtr)
@@ -68,50 +65,38 @@ extern int (* ProcVector[256]) ();
 PROC_EXTERN(ProcPanoramiXQueryVersion);
 PROC_EXTERN(ProcPanoramiXGetState);
 PROC_EXTERN(ProcPanoramiXGetScreenCount);
-PROC_EXTERN(PropPanoramiXGetScreenSize);
+PROC_EXTERN(ProcPanoramiXGetScreenSize);
+
+PROC_EXTERN(ProcXineramaIsActive);
+PROC_EXTERN(ProcXineramaQueryScreens);
 
 static int
-#if NeedFunctionPrototypes      
 SProcPanoramiXQueryVersion (ClientPtr client)
-#else
-SProcPanoramiXQueryVersion (client)
-    register ClientPtr  client;
-#endif
 {
-    register 	int	n;
-    REQUEST(xPanoramiXQueryVersionReq);
+	REQUEST(xPanoramiXQueryVersionReq);
+	register int n;
 
-    swaps(&stuff->length,n);
-    REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
-    return ProcPanoramiXQueryVersion(client);
+	swaps(&stuff->length,n);
+	REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
+	return ProcPanoramiXQueryVersion(client);
 }
 
 static int
-#if NeedFunctionPrototypes      
 SProcPanoramiXGetState(ClientPtr client)
-#else
-SProcPanoramiXGetState(client)
-        register ClientPtr      client;
-#endif
 {
 	REQUEST(xPanoramiXGetStateReq);
-	register int			n;
+	register int n;
 
  	swaps (&stuff->length, n);	
 	REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
-
+	return ProcPanoramiXGetState(client);
 }
 
 static int 
-#if NeedFunctionPrototypes      
 SProcPanoramiXGetScreenCount(ClientPtr client)
-#else
-SProcPanoramixGetScreenCount(client)
-	register ClientPtr	client;
-#endif
 {
 	REQUEST(xPanoramiXGetScreenCountReq);
-	register int			n;
+	register int n;
 
 	swaps (&stuff->length, n);
 	REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
@@ -119,29 +104,43 @@ SProcPanoramixGetScreenCount(client)
 }
 
 static int 
-#if NeedFunctionPrototypes      
 SProcPanoramiXGetScreenSize(ClientPtr client)
-#else 
-SProcPanoramiXGetScreenSize(client)
-        register ClientPtr      client;
-#endif 
 {
 	REQUEST(xPanoramiXGetScreenSizeReq);
-    	WindowPtr			pWin;
-	register int			n;
+	register int n;
 
 	swaps (&stuff->length, n);
 	REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
 	return ProcPanoramiXGetScreenSize(client);
 }
 
+
+static int 
+SProcXineramaIsActive(ClientPtr client)
+{
+	REQUEST(xXineramaIsActiveReq);
+	register int n;
+
+	swaps (&stuff->length, n);
+	REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
+	return ProcXineramaIsActive(client);
+}
+
+
+static int 
+SProcXineramaQueryScreens(ClientPtr client)
+{
+	REQUEST(xXineramaQueryScreensReq);
+	register int n;
+
+	swaps (&stuff->length, n);
+	REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
+	return ProcXineramaQueryScreens(client);
+}
+
+
 int
-#if NeedFunctionPrototypes      
 SProcPanoramiXDispatch (ClientPtr client)
-#else
-SProcPanoramiXDispatch (client) 
-    ClientPtr   client;
-#endif
 {   REQUEST(xReq);
     switch (stuff->data)
     {
@@ -153,6 +152,10 @@ SProcPanoramiXDispatch (client)
 	     return SProcPanoramiXGetScreenCount(client);
 	case X_PanoramiXGetScreenSize:
 	     return SProcPanoramiXGetScreenSize(client);
-    return BadRequest;
+	case X_XineramaIsActive:
+	     return SProcXineramaIsActive(client);
+	case X_XineramaQueryScreens:
+	     return SProcXineramaQueryScreens(client);
     }
+    return BadRequest;
 }