mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-29 21:46:40 +00:00
XQuartz: Handle Pseudorami init in miinitext
(cherry picked from commit a585c94fedd4ecbc87524703c01bb128fc2aa951)
This commit is contained in:
parent
fa9680a730
commit
f3042a63be
4 changed files with 14 additions and 11 deletions
|
|
@ -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;
|
||||
DevPrivateKey quartzScreenKey = &quartzScreenKey;
|
||||
int aquaMenuBarHeight = 0;
|
||||
int noPseudoramiXExtension = FALSE;
|
||||
QuartzModeProcsPtr quartzProcs = NULL;
|
||||
const char *quartzOpenGLBundle = NULL;
|
||||
|
||||
|
|
@ -165,13 +166,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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue