[xorg-commit-diffs] xc/programs/Xserver/hw/darwin/quartz pseudoramiX.c, 1.1.4.2, 1.1.4.3 pseudoramiX.h, 1.1.4.2, 1.1.4.3 Imakefile, 1.1.4.4, 1.1.4.5 quartz.c, 1.1.4.5, 1.1.4.6 quartzCocoa.m, 1.1.4.5, 1.1.4.6 quartzCommon.h, 1.1.4.3, 1.1.4.4 pseudorama.c, 1.1.4.4, NONE pseudorama.h, 1.1.4.3, NONE

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz
In directory pdx:/home/eich/tstbuild/xc/programs/Xserver/hw/darwin/quartz

Modified Files:
      Tag: XORG-CURRENT
	Imakefile quartz.c quartzCocoa.m quartzCommon.h 
Added Files:
      Tag: XORG-CURRENT
	pseudoramiX.c pseudoramiX.h 
Removed Files:
      Tag: XORG-CURRENT
	pseudorama.c pseudorama.h 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	




Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/Imakefile,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/Imakefile	5 Mar 2004 13:39:59 -0000	1.1.4.4
+++ b/Imakefile	15 Apr 2004 10:15:55 -0000	1.1.4.5
@@ -14,7 +14,7 @@
         quartzPasteboard.c \
         quartzKeyboard.c \
         quartzStartup.c \
-        pseudorama.c
+        pseudoramiX.c
 
 OBJS =  Preferences.o \
         XApplication.o \
@@ -27,7 +27,7 @@
         quartzPasteboard.o \
         quartzKeyboard.o \
         quartzStartup.o \
-        pseudorama.o
+        pseudoramiX.o
 
 INCLUDES = -I. -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC) -I$(FONTINCSRC) -I$(SERVERSRC)/render \

Index: quartz.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/quartz.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/quartz.c	5 Mar 2004 13:39:59 -0000	1.1.4.5
+++ b/quartz.c	15 Apr 2004 10:15:55 -0000	1.1.4.6
@@ -36,7 +36,7 @@
 #include "quartz.h"
 #include "darwin.h"
 #include "quartzAudio.h"
-#include "pseudorama.h"
+#include "pseudoramiX.h"
 #define _APPLEWM_SERVER_
 #include "applewm.h"
 #include "applewmExt.h"
@@ -140,9 +140,9 @@
     // Do display mode specific initialization
     quartzProcs->DisplayInit();
 
-    // Init Pseudorama implementation of Xinerama.
+    // Init PseudoramiX implementation of Xinerama.
     // This should be in InitExtensions, but that causes link errors
-    // for servers that don't link in pseudorama.c.
+    // for servers that don't link in pseudoramiX.c.
     if (!noPseudoramiXExtension) {
         PseudoramiXExtensionInit(argc, argv);
     }

Index: quartzCocoa.m
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/quartzCocoa.m,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/quartzCocoa.m	5 Mar 2004 13:39:59 -0000	1.1.4.5
+++ b/quartzCocoa.m	15 Apr 2004 10:15:55 -0000	1.1.4.6
@@ -45,7 +45,7 @@
 #include <Cocoa/Cocoa.h>
 
 #import "Preferences.h"
-#include "pseudorama.h"
+#include "pseudoramiX.h"
 
 extern void FatalError(const char *, ...);
 extern char *display;
@@ -68,7 +68,7 @@
 
     // quartzRootless has already been set
     if (quartzRootless) {
-        // Use Pseudorama instead of Xinerama
+        // Use PseudoramiX instead of Xinerama
         noPanoramiXExtension = TRUE;
         noPseudoramiXExtension = ![Preferences xinerama];
 

Index: quartzCommon.h
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -d -r1.1.4.3 -r1.1.4.4
--- a/quartzCommon.h	5 Mar 2004 13:39:59 -0000	1.1.4.3
+++ b/quartzCommon.h	15 Apr 2004 10:15:55 -0000	1.1.4.4
@@ -53,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 Pseudorama mode.
+    // rootless PseudoramiX mode.
     // No CG display will be covered by more than one X11 screen.
     int displayCount;
     CGDirectDisplayID *displayIDs;

--- pseudorama.c DELETED ---

--- pseudorama.h DELETED ---