[Xorg-commit] xc/programs/Xserver/hw/darwin/quartz Imakefile,1.1.4.1,1.1.4.2 pseudorama.c,1.1.4.1,1.1.4.2 pseudorama.h,1.1.4.1,1.1.4.2 quartz.c,1.1.4.2,1.1.4.3 quartzCocoa.m,1.1.4.1,1.1.4.2 quartzCommon.h,1.1.4.1,1.1.4.2
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Thu Dec 18 21:29:45 EET 2003
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
Imakefile pseudorama.c pseudorama.h quartz.c quartzCocoa.m
quartzCommon.h
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: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/Imakefile,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- Imakefile 26 Nov 2003 22:48:44 -0000 1.1.4.1
+++ Imakefile 18 Dec 2003 19:29:12 -0000 1.1.4.2
@@ -1,3 +1,4 @@
+XCOMM $XdotOrg$
XCOMM $XFree86: xc/programs/Xserver/hw/darwin/quartz/Imakefile,v 1.12 2003/11/11 01:29:47 torrey Exp $
#include <Server.tmpl>
@@ -14,7 +15,7 @@
quartzPasteboard.c \
quartzKeyboard.c \
quartzStartup.c \
- pseudoramiX.c
+ pseudorama.c
OBJS = Preferences.o \
XApplication.o \
@@ -27,7 +28,7 @@
quartzPasteboard.o \
quartzKeyboard.o \
quartzStartup.o \
- pseudoramiX.o
+ pseudorama.o
INCLUDES = -I. -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \
-I$(XINCLUDESRC) -I$(FONTINCSRC) -I$(SERVERSRC)/render \
Index: pseudorama.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/pseudorama.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
--- pseudorama.c 26 Nov 2003 22:48:44 -0000 1.1.4.1
+++ pseudorama.c 18 Dec 2003 19:29:12 -0000 1.1.4.2
@@ -1,11 +1,12 @@
+/* $XdotOrg$ */
/*
- * Minimal implementation of PanoramiX/Xinerama
+ * Minimal implementation of Xinerama/Xinerama
*
* This is used in rootless mode where the underlying window server
* already provides an abstracted view of multiple screens as one
* large screen area.
*
- * This code is largely based on panoramiX.c, which contains the
+ * This code is largely based on xinerama.c, which contains the
* following copyright notice:
*/
/*****************************************************************
@@ -32,35 +33,35 @@
dealings in this Software without prior written authorization from Digital
Equipment Corporation.
******************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.c,v 1.3 2003/04/30 23:15:39 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudorama.c,v 1.3 2003/04/30 23:15:39 torrey Exp $ */
-#include "pseudoramiX.h"
+#include "pseudorama.h"
#include "extnsionst.h"
#include "dixstruct.h"
#include "window.h"
-#include "panoramiXproto.h"
+#include "xineramaProto.h"
#include "globals.h"
-extern int ProcPanoramiXQueryVersion (ClientPtr client);
+extern int ProcXineramaQueryVersion (ClientPtr client);
-static void PseudoramiXResetProc(ExtensionEntry *extEntry);
+static void PseudoramaResetProc(ExtensionEntry *extEntry);
-static int ProcPseudoramiXQueryVersion(ClientPtr client);
-static int ProcPseudoramiXGetState(ClientPtr client);
-static int ProcPseudoramiXGetScreenCount(ClientPtr client);
-static int ProcPseudoramiXGetScreenSize(ClientPtr client);
-static int ProcPseudoramiXIsActive(ClientPtr client);
-static int ProcPseudoramiXQueryScreens(ClientPtr client);
-static int ProcPseudoramiXDispatch(ClientPtr client);
+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 ProcPseudoramaDispatch(ClientPtr client);
-static int SProcPseudoramiXQueryVersion(ClientPtr client);
-static int SProcPseudoramiXGetState(ClientPtr client);
-static int SProcPseudoramiXGetScreenCount(ClientPtr client);
-static int SProcPseudoramiXGetScreenSize(ClientPtr client);
-static int SProcPseudoramiXIsActive(ClientPtr client);
-static int SProcPseudoramiXQueryScreens(ClientPtr client);
-static int SProcPseudoramiXDispatch(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 SProcPseudoramaDispatch(ClientPtr client);
typedef struct {
@@ -68,33 +69,33 @@
int y;
int w;
int h;
-} PseudoramiXScreenRec;
+} PseudoramaScreenRec;
-static PseudoramiXScreenRec *pseudoramiXScreens = NULL;
-static int pseudoramiXScreensAllocated = 0;
-static int pseudoramiXNumScreens = 0;
-static unsigned long pseudoramiXGeneration = 0;
+static PseudoramaScreenRec *pseudoramaScreens = NULL;
+static int pseudoramaScreensAllocated = 0;
+static int pseudoramaNumScreens = 0;
+static unsigned long pseudoramaGeneration = 0;
-// Add a PseudoramiX screen.
+// Add a Pseudorama screen.
// The rest of the X server will know nothing about this screen.
// Can be called before or after extension init.
// Screens must be re-added once per generation.
void
-PseudoramiXAddScreen(int x, int y, int w, int h)
+PseudoramaAddScreen(int x, int y, int w, int h)
{
- PseudoramiXScreenRec *s;
+ PseudoramaScreenRec *s;
- if (noPseudoramiXExtension) return;
+ if (noPseudoramaExtension) return;
- if (pseudoramiXNumScreens == pseudoramiXScreensAllocated) {
- pseudoramiXScreensAllocated += pseudoramiXScreensAllocated + 1;
- pseudoramiXScreens = xrealloc(pseudoramiXScreens,
- pseudoramiXScreensAllocated *
- sizeof(PseudoramiXScreenRec));
+ if (pseudoramaNumScreens == pseudoramaScreensAllocated) {
+ pseudoramaScreensAllocated += pseudoramaScreensAllocated + 1;
+ pseudoramaScreens = xrealloc(pseudoramaScreens,
+ pseudoramaScreensAllocated *
+ sizeof(PseudoramaScreenRec));
}
- s = &pseudoramiXScreens[pseudoramiXNumScreens++];
+ s = &pseudoramaScreens[pseudoramaNumScreens++];
s->x = x;
s->y = y;
s->w = w;
@@ -102,319 +103,190 @@
}
-// Initialize PseudoramiX.
-// Copied from PanoramiXExtensionInit
-void PseudoramiXExtensionInit(int argc, char *argv[])
+// Initialize Pseudorama.
+// Copied from XineramaExtensionInit
+void PseudoramaExtensionInit(int argc, char *argv[])
{
Bool success = FALSE;
ExtensionEntry *extEntry;
- if (noPseudoramiXExtension) return;
+ if (noPseudoramaExtension) return;
- if (pseudoramiXNumScreens == 1) {
+ if (pseudoramaNumScreens == 1) {
// Only one screen - disable Xinerama extension.
- noPseudoramiXExtension = TRUE;
+ noPseudoramaExtension = TRUE;
return;
}
- // The server must not run the PanoramiX operations.
- noPanoramiXExtension = TRUE;
+ // The server must not run the Xinerama operations.
+ noXineramaExtension = TRUE;
- if (pseudoramiXGeneration != serverGeneration) {
- extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0,
- ProcPseudoramiXDispatch,
- SProcPseudoramiXDispatch,
- PseudoramiXResetProc,
+ if (pseudoramaGeneration != serverGeneration) {
+ extEntry = AddExtension(XINERAMA_PROTOCOL_NAME, 0, 0,
+ ProcPseudoramaDispatch,
+ SProcPseudoramaDispatch,
+ PseudoramaResetProc,
StandardMinorOpcode);
if (!extEntry) {
- ErrorF("PseudoramiXExtensionInit(): AddExtension failed\n");
+ ErrorF("PseudoramaExtensionInit(): AddExtension failed\n");
} else {
- pseudoramiXGeneration = serverGeneration;
+ pseudoramaGeneration = serverGeneration;
success = TRUE;
}
}
if (!success) {
- ErrorF("%s Extension (PseudoramiX) failed to initialize\n",
- PANORAMIX_PROTOCOL_NAME);
+ ErrorF("%s Extension (Pseudorama) failed to initialize\n",
+ XINERAMA_PROTOCOL_NAME);
return;
}
}
-static void PseudoramiXResetProc(ExtensionEntry *extEntry)
+static void PseudoramaResetProc(ExtensionEntry *extEntry)
{
- pseudoramiXNumScreens = 0;
+ pseudoramaNumScreens = 0;
}
-// was PanoramiX
-static int ProcPseudoramiXQueryVersion(ClientPtr client)
+// was Xinerama
+static int ProcPseudoramaQueryVersion(ClientPtr client)
{
- return ProcPanoramiXQueryVersion(client);
+ return ProcXineramaQueryVersion(client);
}
-
-// was PanoramiX
-static int ProcPseudoramiXGetState(ClientPtr client)
+// was Xinerama
+static int ProcPseudoramaGetData(ClientPtr client)
{
- REQUEST(xPanoramiXGetStateReq);
- WindowPtr pWin;
- xPanoramiXGetStateReply rep;
- register int n;
+ REQUEST(xXineramaGetDataReq);
+ WindowPtr pWin;
+ xXineramaGetDataReply rep;
- REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
+ REQUEST_SIZE_MATCH(xXineramaGetDataReq);
pWin = LookupWindow (stuff->window, client);
- if (!pWin)
+ if (!pWin) {
+ client->errorValue = stuff->window;
return BadWindow;
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
- rep.state = !noPseudoramiXExtension;
- if (client->swapped) {
- swaps (&rep.sequenceNumber, n);
- swapl (&rep.length, n);
- swaps (&rep.state, n);
}
- WriteToClient (client, sizeof (xPanoramiXGetStateReply), (char *) &rep);
- return client->noClientException;
-}
-
-
-// was PanoramiX
-static int ProcPseudoramiXGetScreenCount(ClientPtr client)
-{
- REQUEST(xPanoramiXGetScreenCountReq);
- WindowPtr pWin;
- xPanoramiXGetScreenCountReply rep;
- register int n;
-
- REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
- pWin = LookupWindow (stuff->window, client);
- if (!pWin)
- return BadWindow;
rep.type = X_Reply;
- rep.length = 0;
rep.sequenceNumber = client->sequence;
- rep.ScreenCount = pseudoramiXNumScreens;
+ rep.num_rects = noPseudoramaExtension ? 0 : pseudoramaNumScreens;
+ rep.length = rep.num_rects * sz_xXineramaRectangle >> 2;
if (client->swapped) {
+ int n;
swaps (&rep.sequenceNumber, n);
swapl (&rep.length, n);
- swaps (&rep.ScreenCount, n);
+ swaps (&rep.num_rects, n);
}
- WriteToClient (client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep);
- return client->noClientException;
-}
+ WriteToClient (client, sizeof(xXineramaGetDataReply), (char *)&rep);
+ if (rep.num_rects) {
+ xXineramaRectangle scratch;
+ int i;
-// was PanoramiX
-static int ProcPseudoramiXGetScreenSize(ClientPtr client)
-{
- REQUEST(xPanoramiXGetScreenSizeReq);
- WindowPtr pWin;
- xPanoramiXGetScreenSizeReply rep;
- register int n;
+ for (i = 0; i < pseudoramaNumScreens; i++) {
+ scratch.x = scratch.y = 0;
+ scratch.width = pseudoramaScreens[stuff->screen].w;
+ scratch.height = pseudoramaScreens[stuff->screen].h;
- REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
- pWin = LookupWindow (stuff->window, client);
- if (!pWin)
- return BadWindow;
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
- /* screen dimensions */
- rep.width = pseudoramiXScreens[stuff->screen].w;
- // was panoramiXdataPtr[stuff->screen].width;
- rep.height = pseudoramiXScreens[stuff->screen].h;
- // was panoramiXdataPtr[stuff->screen].height;
- if (client->swapped) {
- swaps (&rep.sequenceNumber, n);
- swapl (&rep.length, n);
- swaps (&rep.width, n);
- swaps (&rep.height, n);
+ if (client->swapped) {
+ int n;
+ swaps (&scratch.width, n);
+ swaps (&scratch.height, n);
+ }
+ WriteToClient (client, sz_xXineramaRectangle, (char *) &scratch);
+ }
}
- WriteToClient (client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep);
+
return client->noClientException;
}
// was Xinerama
-static int ProcPseudoramiXIsActive(ClientPtr client)
+static int ProcPseudoramaActive(ClientPtr client)
{
- /* REQUEST(xXineramaIsActiveReq); */
+ /* REQUEST(xXineramaActiveReq); */
xXineramaIsActiveReply rep;
- REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
+ REQUEST_SIZE_MATCH(xXineramaActiveReq);
+
+ if(!(pWin = LookupWindow (stuff->window, client))) {
+ client->errorValue = stuff->window;
+ return BadWindow;
+ }
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
- rep.state = !noPseudoramiXExtension;
+ rep.active = !noPseudoramaExtension;
if (client->swapped) {
- register int n;
+ int n;
swaps (&rep.sequenceNumber, n);
swapl (&rep.length, n);
- swapl (&rep.state, n);
}
WriteToClient (client, sizeof (xXineramaIsActiveReply), (char *) &rep);
return client->noClientException;
}
-
// was Xinerama
-static int ProcPseudoramiXQueryScreens(ClientPtr client)
-{
- /* REQUEST(xXineramaQueryScreensReq); */
- xXineramaQueryScreensReply rep;
-
- REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
-
- rep.type = X_Reply;
- rep.sequenceNumber = client->sequence;
- rep.number = noPseudoramiXExtension ? 0 : pseudoramiXNumScreens;
- rep.length = rep.number * sz_XineramaScreenInfo >> 2;
- if (client->swapped) {
- register int n;
- swaps (&rep.sequenceNumber, n);
- swapl (&rep.length, n);
- swapl (&rep.number, n);
- }
- WriteToClient (client, sizeof (xXineramaQueryScreensReply), (char *) &rep);
-
- if (!noPseudoramiXExtension) {
- xXineramaScreenInfo scratch;
- int i;
-
- for(i = 0; i < pseudoramiXNumScreens; i++) {
- scratch.x_org = pseudoramiXScreens[i].x;
- scratch.y_org = pseudoramiXScreens[i].y;
- scratch.width = pseudoramiXScreens[i].w;
- scratch.height = pseudoramiXScreens[i].h;
-
- if(client->swapped) {
- register int n;
- swaps (&scratch.x_org, n);
- swaps (&scratch.y_org, n);
- swaps (&scratch.width, n);
- swaps (&scratch.height, n);
- }
- WriteToClient (client, sz_XineramaScreenInfo, (char *) &scratch);
- }
- }
-
- return client->noClientException;
-}
-
-
-// was PanoramiX
-static int ProcPseudoramiXDispatch (ClientPtr client)
+static int ProcPseudoramaDispatch (ClientPtr client)
{ REQUEST(xReq);
switch (stuff->data)
{
- case X_PanoramiXQueryVersion:
- return ProcPseudoramiXQueryVersion(client);
- case X_PanoramiXGetState:
- return ProcPseudoramiXGetState(client);
- case X_PanoramiXGetScreenCount:
- return ProcPseudoramiXGetScreenCount(client);
- case X_PanoramiXGetScreenSize:
- return ProcPseudoramiXGetScreenSize(client);
- case X_XineramaIsActive:
- return ProcPseudoramiXIsActive(client);
+ case X_XineramaQueryVersion:
+ return ProcPseudoramaQueryVersion(client);
+ case X_XineramaActive:
+ return ProcPseudoramaActive(client);
case X_XineramaQueryScreens:
- return ProcPseudoramiXQueryScreens(client);
+ return ProcPseudoramaGetData(client);
}
return BadRequest;
}
-
-
static int
-SProcPseudoramiXQueryVersion (ClientPtr client)
+SProcPseudoramaQueryVersion (ClientPtr client)
{
- REQUEST(xPanoramiXQueryVersionReq);
+ REQUEST(xXineramaQueryVersionReq);
register int n;
swaps(&stuff->length,n);
- REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
- return ProcPseudoramiXQueryVersion(client);
+ REQUEST_SIZE_MATCH (xXineramaQueryVersionReq);
+ return ProcPseudoramaQueryVersion(client);
}
static int
-SProcPseudoramiXGetState(ClientPtr client)
+SProcPseudoramaGetData(ClientPtr client)
{
- REQUEST(xPanoramiXGetStateReq);
+ REQUEST(xXineramaGetDataReq);
register int n;
swaps (&stuff->length, n);
- REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
- return ProcPseudoramiXGetState(client);
-}
-
-static int
-SProcPseudoramiXGetScreenCount(ClientPtr client)
-{
- REQUEST(xPanoramiXGetScreenCountReq);
- register int n;
-
- swaps (&stuff->length, n);
- REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
- return ProcPseudoramiXGetScreenCount(client);
-}
-
-static int
-SProcPseudoramiXGetScreenSize(ClientPtr client)
-{
- REQUEST(xPanoramiXGetScreenSizeReq);
- register int n;
-
- swaps (&stuff->length, n);
- REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
- return ProcPseudoramiXGetScreenSize(client);
-}
-
-
-static int
-SProcPseudoramiXIsActive(ClientPtr client)
-{
- REQUEST(xXineramaIsActiveReq);
- register int n;
-
- swaps (&stuff->length, n);
- REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
- return ProcPseudoramiXIsActive(client);
+ REQUEST_SIZE_MATCH(xXineramaGetDataReq);
+ return ProcPseudoramaGetData(client);
}
-
static int
-SProcPseudoramiXQueryScreens(ClientPtr client)
+SProcPseudoramaActive(ClientPtr client)
{
- REQUEST(xXineramaQueryScreensReq);
+ REQUEST(xXineramaActiveReq);
register int n;
swaps (&stuff->length, n);
- REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
- return ProcPseudoramiXQueryScreens(client);
+ REQUEST_SIZE_MATCH(xXineramaActiveReq);
+ return ProcPseudoramaActive(client);
}
-
static int
-SProcPseudoramiXDispatch (ClientPtr client)
+SProcPseudoramaDispatch (ClientPtr client)
{ REQUEST(xReq);
switch (stuff->data)
{
- case X_PanoramiXQueryVersion:
- return SProcPseudoramiXQueryVersion(client);
- case X_PanoramiXGetState:
- return SProcPseudoramiXGetState(client);
- case X_PanoramiXGetScreenCount:
- return SProcPseudoramiXGetScreenCount(client);
- case X_PanoramiXGetScreenSize:
- return SProcPseudoramiXGetScreenSize(client);
- case X_XineramaIsActive:
- return SProcPseudoramiXIsActive(client);
- case X_XineramaQueryScreens:
- return SProcPseudoramiXQueryScreens(client);
+ case X_XineramaQueryVersion:
+ return SProcPseudoramaQueryVersion(client);
+ case X_XineramaGetData:
+ return SProcPseudoramaGetData(client);
+ case X_XineramaActive:
+ return SProcPseudoramaActive(client);
}
return BadRequest;
}
Index: pseudorama.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/pseudorama.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- pseudorama.h 26 Nov 2003 22:48:44 -0000 1.1.4.1
+++ pseudorama.h 18 Dec 2003 19:29:12 -0000 1.1.4.2
@@ -1,9 +1,10 @@
+/* $XdotOrg$ */
/*
- * Minimal implementation of PanoramiX/Xinerama
+ * Minimal implementation of Xinerama
*/
/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.h,v 1.2 2003/04/30 23:15:39 torrey Exp $ */
-extern int noPseudoramiXExtension;
+extern int noPseudoramaExtension;
-void PseudoramiXAddScreen(int x, int y, int w, int h);
-void PseudoramiXExtensionInit(int argc, char *argv[]);
+void PseudoramaAddScreen(int, int, int, int);
+void PseudoramaExtensionInit(int, char **);
Index: quartz.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/quartz.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
--- quartz.c 6 Dec 2003 13:24:23 -0000 1.1.4.2
+++ quartz.c 18 Dec 2003 19:29:12 -0000 1.1.4.3
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/**************************************************************
*
* Quartz-specific support for the Darwin X Server
@@ -29,14 +30,13 @@
* holders shall not be used in advertising or otherwise to promote the sale,
* use or other dealings in this Software without prior written authorization.
*/
-/* $XdotOrg$ */
/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.14 2003/11/24 05:39:02 torrey Exp $ */
#include "quartzCommon.h"
#include "quartz.h"
#include "darwin.h"
#include "quartzAudio.h"
-#include "pseudoramiX.h"
+#include "pseudorama.h"
#define _APPLEWM_SERVER_
#include "applewm.h"
#include "applewmExt.h"
@@ -61,7 +61,7 @@
int quartzServerQuitting = FALSE;
int quartzScreenIndex = 0;
int aquaMenuBarHeight = 0;
-int noPseudoramiXExtension = TRUE;
+int noPseudoramaExtension = TRUE;
QuartzModeProcsPtr quartzProcs = NULL;
const char *quartzOpenGLBundle = NULL;
@@ -140,11 +140,11 @@
// Do display mode specific initialization
quartzProcs->DisplayInit();
- // Init PseudoramiX implementation of Xinerama.
+ // Init Pseudorama implementation of Xinerama.
// This should be in InitExtensions, but that causes link errors
- // for servers that don't link in pseudoramiX.c.
- if (!noPseudoramiXExtension) {
- PseudoramiXExtensionInit(argc, argv);
+ // for servers that don't link in pseudorama.c.
+ if (!noPseudoramaExtension) {
+ PseudoramaExtensionInit(argc, argv);
}
}
Index: quartzCocoa.m
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- quartzCocoa.m 26 Nov 2003 22:48:44 -0000 1.1.4.1
+++ quartzCocoa.m 18 Dec 2003 19:29:12 -0000 1.1.4.2
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/**************************************************************
*
* Quartz-specific support for the Darwin X Server
@@ -44,11 +45,11 @@
#include <Cocoa/Cocoa.h>
#import "Preferences.h"
-#include "pseudoramiX.h"
+#include "pseudorama.h"
extern void FatalError(const char *, ...);
extern char *display;
-extern int noPanoramiXExtension;
+extern int noXineramaExtension;
/*
@@ -67,14 +68,14 @@
// quartzRootless has already been set
if (quartzRootless) {
- // Use PseudoramiX instead of Xinerama
- noPanoramiXExtension = TRUE;
- noPseudoramiXExtension = ![Preferences xinerama];
+ // Use Pseudorama instead of Xinerama
+ noXineramaExtension = TRUE;
+ noPseudoramaExtension = ![Preferences xinerama];
quartzUseAGL = [Preferences useAGL];
} else {
- noPanoramiXExtension = ![Preferences xinerama];
- noPseudoramiXExtension = TRUE;
+ noXineramaExtension = ![Preferences xinerama];
+ noPseudoramaExtension = TRUE;
// Full screen can't use AGL for GLX
quartzUseAGL = FALSE;
Index: quartzCommon.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- quartzCommon.h 26 Nov 2003 22:48:44 -0000 1.1.4.1
+++ quartzCommon.h 18 Dec 2003 19:29:12 -0000 1.1.4.2
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
/*
* quartzCommon.h
*
@@ -52,7 +53,7 @@
typedef struct {
// List of CoreGraphics displays that this X11 screen covers.
// This is more than one CG display for video mirroring and
- // rootless PseudoramiX mode.
+ // rootless Pseudorama mode.
// No CG display will be covered by more than one X11 screen.
int displayCount;
CGDirectDisplayID *displayIDs;
More information about the xorg-commit
mailing list