xserver: Branch 'xorg-server-1.4-apple'
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Fri Dec 21 01:27:21 PST 2007
hw/xquartz/pseudoramiX.c | 2 +-
hw/xquartz/quartz.c | 12 +++---------
hw/xquartz/quartzStartup.c | 2 +-
mi/miinitext.c | 9 +++++++++
4 files changed, 14 insertions(+), 11 deletions(-)
New commits:
commit b585e48cff517916fc7d694811e4ee7b54f72e66
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date: Fri Dec 21 01:24:06 2007 -0800
XQuartz: Handle Pseudorami init in miinitext
(cherry picked from commit a585c94fedd4ecbc87524703c01bb128fc2aa951)
diff --git a/hw/xquartz/pseudoramiX.c b/hw/xquartz/pseudoramiX.c
index b19c605..4a9d8e1 100644
--- a/hw/xquartz/pseudoramiX.c
+++ b/hw/xquartz/pseudoramiX.c
@@ -44,7 +44,7 @@ Equipment Corporation.
#include <X11/extensions/panoramiXproto.h>
#include "globals.h"
-extern int noPseudoramiXExtension;
+Bool noPseudoramiXExtension = FALSE;
extern int noPanoramiXExtension;
extern int ProcPanoramiXQueryVersion (ClientPtr client);
diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index 549ad09..81c3325 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -39,11 +39,13 @@
#include "quartzAudio.h"
#include "pseudoramiX.h"
#define _APPLEWM_SERVER_
-#include "X11/extensions/applewm.h"
#include "applewmExt.h"
#include "X11Application.h"
+#include <X11/extensions/applewm.h>
+#include <X11/extensions/randr.h>
+
// X headers
#include "scrnintstr.h"
#include "windowstr.h"
@@ -69,7 +71,6 @@ int quartzServerVisible = TRUE;
int quartzServerQuitting = FALSE;
int quartzScreenIndex = 0;
int aquaMenuBarHeight = 0;
-int noPseudoramiXExtension = FALSE;
QuartzModeProcsPtr quartzProcs = NULL;
const char *quartzOpenGLBundle = NULL;
@@ -173,13 +174,6 @@ void QuartzInitOutput(
// Do display mode specific initialization
quartzProcs->DisplayInit();
-
- // Init PseudoramiX 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);
- }
}
diff --git a/hw/xquartz/quartzStartup.c b/hw/xquartz/quartzStartup.c
index 8600ec8..1b2a226 100644
--- a/hw/xquartz/quartzStartup.c
+++ b/hw/xquartz/quartzStartup.c
@@ -106,6 +106,6 @@ void DarwinHandleGUI(int argc, char **argv, char **envp) {
extern void _InitHLTB(void);
_InitHLTB();
- X11ControllerMain(argc, argv, server_thread, NULL);
+ X11ControllerMain(argc, (const char **)argv, server_thread, NULL);
exit(0);
}
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 02000ef..6c11622 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -206,6 +206,9 @@ extern Bool noXkbExtension;
#ifdef PANORAMIX
extern Bool noPanoramiXExtension;
#endif
+#ifdef INXQUARTZ
+extern Bool noPseudoramiXExtension;
+#endif
#ifdef XINPUT
extern Bool noXInputExtension;
#endif
@@ -271,6 +274,9 @@ extern void MultibufferExtensionInit(INITARGS);
#ifdef PANORAMIX
extern void PanoramiXExtensionInit(INITARGS);
#endif
+#ifdef INXQUARTZ
+extern void PseudoramiXExtensionInit(INITARGS);
+#endif
#ifdef XINPUT
extern void XInputExtensionInit(INITARGS);
#endif
@@ -532,6 +538,9 @@ InitExtensions(argc, argv)
if (!noPanoramiXExtension) PanoramiXExtensionInit();
# endif
#endif
+#ifdef INXQUARTZ
+ if(!noPseudoramiXExtension) PseudoramiXExtensionInit();
+#endif
#ifdef SHAPE
if (!noShapeExtension) ShapeExtensionInit();
#endif
More information about the xorg-commit
mailing list