XQuartz: Handle Pseudorami init in miinitext
This commit is contained in:
parent
7a5cc7bfbb
commit
a585c94fed
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user