[Xorg-commit] xc/programs/Xserver/hw/darwin/quartz pseudorama.c,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

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

Modified Files:
      Tag: XORG-CURRENT
	pseudorama.c 
Log Message:
fixes


Index: pseudorama.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/pseudorama.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
--- pseudorama.c	18 Dec 2003 19:29:12 -0000	1.1.4.2
+++ pseudorama.c	21 Dec 2003 12:58:19 -0000	1.1.4.3
@@ -48,19 +48,13 @@
 static void PseudoramaResetProc(ExtensionEntry *extEntry);
 
 static int ProcPseudoramaQueryVersion(ClientPtr client);
-static int ProcPseudoramaGetState(ClientPtr client);
-static int ProcPseudoramaGetScreenCount(ClientPtr client);
-static int ProcPseudoramaGetScreenSize(ClientPtr client);
-static int ProcPseudoramaIsActive(ClientPtr client);
-static int ProcPseudoramaQueryScreens(ClientPtr client);
+static int ProcPseudoramaActive(ClientPtr client);
+static int ProcPseudoramaGetData(ClientPtr client);
 static int ProcPseudoramaDispatch(ClientPtr client);
 
 static int SProcPseudoramaQueryVersion(ClientPtr client);
-static int SProcPseudoramaGetState(ClientPtr client);
-static int SProcPseudoramaGetScreenCount(ClientPtr client);
-static int SProcPseudoramaGetScreenSize(ClientPtr client);
-static int SProcPseudoramaIsActive(ClientPtr client);
-static int SProcPseudoramaQueryScreens(ClientPtr client);
+static int SProcPseudoramaActive(ClientPtr client);
+static int SProcPseudoramaGetData(ClientPtr client);
 static int SProcPseudoramaDispatch(ClientPtr client);
 
 
@@ -186,8 +180,8 @@
 
 	for (i = 0; i < pseudoramaNumScreens; i++) {
 	    scratch.x = scratch.y = 0;
-	    scratch.width = pseudoramaScreens[stuff->screen].w;
-	    scratch.height = pseudoramaScreens[stuff->screen].h;
+	    scratch.width = pseudoramaScreens[i].w;
+	    scratch.height = pseudoramaScreens[i].h;
 
 	    if (client->swapped) {
 		int n;
@@ -205,8 +199,9 @@
 // was Xinerama
 static int ProcPseudoramaActive(ClientPtr client)
 {
-    /* REQUEST(xXineramaActiveReq); */
-    xXineramaIsActiveReply	rep;
+    REQUEST(xXineramaActiveReq);
+    WindowPtr			pWin;
+    xXineramaActiveReply	rep;
 
     REQUEST_SIZE_MATCH(xXineramaActiveReq);
 
@@ -224,7 +219,7 @@
 	swaps (&rep.sequenceNumber, n);
 	swapl (&rep.length, n);
     }
-    WriteToClient (client, sizeof (xXineramaIsActiveReply), (char *) &rep);
+    WriteToClient (client, sizeof (xXineramaActiveReply), (char *) &rep);
     return client->noClientException;
 }
 
@@ -237,7 +232,7 @@
 	     return ProcPseudoramaQueryVersion(client);
 	case X_XineramaActive:
 	     return ProcPseudoramaActive(client);
-	case X_XineramaQueryScreens:
+	case X_XineramaGetData:
 	     return ProcPseudoramaGetData(client);
     }
     return BadRequest;