XQuartz: Handle Pseudorami init in miinitext
(cherry picked from commit a585c94fed
)
This commit is contained in:
parent
fa9680a730
commit
f3042a63be
|
@ -44,7 +44,7 @@ Equipment Corporation.
|
||||||
#include <X11/extensions/panoramiXproto.h>
|
#include <X11/extensions/panoramiXproto.h>
|
||||||
#include "globals.h"
|
#include "globals.h"
|
||||||
|
|
||||||
extern int noPseudoramiXExtension;
|
Bool noPseudoramiXExtension = FALSE;
|
||||||
extern int noPanoramiXExtension;
|
extern int noPanoramiXExtension;
|
||||||
|
|
||||||
extern int ProcPanoramiXQueryVersion (ClientPtr client);
|
extern int ProcPanoramiXQueryVersion (ClientPtr client);
|
||||||
|
|
|
@ -39,11 +39,13 @@
|
||||||
#include "quartzAudio.h"
|
#include "quartzAudio.h"
|
||||||
#include "pseudoramiX.h"
|
#include "pseudoramiX.h"
|
||||||
#define _APPLEWM_SERVER_
|
#define _APPLEWM_SERVER_
|
||||||
#include "X11/extensions/applewm.h"
|
|
||||||
#include "applewmExt.h"
|
#include "applewmExt.h"
|
||||||
|
|
||||||
#include "X11Application.h"
|
#include "X11Application.h"
|
||||||
|
|
||||||
|
#include <X11/extensions/applewm.h>
|
||||||
|
#include <X11/extensions/randr.h>
|
||||||
|
|
||||||
// X headers
|
// X headers
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
#include "windowstr.h"
|
#include "windowstr.h"
|
||||||
|
@ -69,7 +71,6 @@ int quartzServerVisible = TRUE;
|
||||||
int quartzServerQuitting = FALSE;
|
int quartzServerQuitting = FALSE;
|
||||||
DevPrivateKey quartzScreenKey = &quartzScreenKey;
|
DevPrivateKey quartzScreenKey = &quartzScreenKey;
|
||||||
int aquaMenuBarHeight = 0;
|
int aquaMenuBarHeight = 0;
|
||||||
int noPseudoramiXExtension = FALSE;
|
|
||||||
QuartzModeProcsPtr quartzProcs = NULL;
|
QuartzModeProcsPtr quartzProcs = NULL;
|
||||||
const char *quartzOpenGLBundle = NULL;
|
const char *quartzOpenGLBundle = NULL;
|
||||||
|
|
||||||
|
@ -165,13 +166,6 @@ void QuartzInitOutput(
|
||||||
|
|
||||||
// Do display mode specific initialization
|
// Do display mode specific initialization
|
||||||
quartzProcs->DisplayInit();
|
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);
|
extern void _InitHLTB(void);
|
||||||
|
|
||||||
_InitHLTB();
|
_InitHLTB();
|
||||||
X11ControllerMain(argc, argv, server_thread, NULL);
|
X11ControllerMain(argc, (const char **)argv, server_thread, NULL);
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -206,6 +206,9 @@ extern Bool noXkbExtension;
|
||||||
#ifdef PANORAMIX
|
#ifdef PANORAMIX
|
||||||
extern Bool noPanoramiXExtension;
|
extern Bool noPanoramiXExtension;
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef INXQUARTZ
|
||||||
|
extern Bool noPseudoramiXExtension;
|
||||||
|
#endif
|
||||||
#ifdef XINPUT
|
#ifdef XINPUT
|
||||||
extern Bool noXInputExtension;
|
extern Bool noXInputExtension;
|
||||||
#endif
|
#endif
|
||||||
|
@ -274,6 +277,9 @@ extern void MultibufferExtensionInit(INITARGS);
|
||||||
#ifdef PANORAMIX
|
#ifdef PANORAMIX
|
||||||
extern void PanoramiXExtensionInit(INITARGS);
|
extern void PanoramiXExtensionInit(INITARGS);
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef INXQUARTZ
|
||||||
|
extern void PseudoramiXExtensionInit(INITARGS);
|
||||||
|
#endif
|
||||||
#ifdef XINPUT
|
#ifdef XINPUT
|
||||||
extern void XInputExtensionInit(INITARGS);
|
extern void XInputExtensionInit(INITARGS);
|
||||||
#endif
|
#endif
|
||||||
|
@ -533,6 +539,9 @@ InitExtensions(argc, argv)
|
||||||
if (!noPanoramiXExtension) PanoramiXExtensionInit();
|
if (!noPanoramiXExtension) PanoramiXExtensionInit();
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef INXQUARTZ
|
||||||
|
if(!noPseudoramiXExtension) PseudoramiXExtensionInit();
|
||||||
|
#endif
|
||||||
#ifdef SHAPE
|
#ifdef SHAPE
|
||||||
if (!noShapeExtension) ShapeExtensionInit();
|
if (!noShapeExtension) ShapeExtensionInit();
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue
Block a user