xquartz: Call PseudoramiXExtensionInit() through InitOutput() just like xwin
Fixes: https://github.com/XQuartz/XQuartz/issues/140 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
parent
34e2a64ce0
commit
65b27d82f2
|
@ -3,7 +3,6 @@ AM_CFLAGS = $(DIX_CFLAGS)
|
||||||
AM_OBJCFLAGS = $(DIX_CFLAGS)
|
AM_OBJCFLAGS = $(DIX_CFLAGS)
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-DXSERVER_VERSION=\"$(VERSION)\" \
|
-DXSERVER_VERSION=\"$(VERSION)\" \
|
||||||
-DINXQUARTZ \
|
|
||||||
-DUSE_NEW_CLUT \
|
-DUSE_NEW_CLUT \
|
||||||
-DXFree86Server \
|
-DXFree86Server \
|
||||||
-I$(top_srcdir)/miext/rootless \
|
-I$(top_srcdir)/miext/rootless \
|
||||||
|
|
|
@ -36,7 +36,6 @@ srcs_libxquartz = [
|
||||||
]
|
]
|
||||||
|
|
||||||
libxquartz_defs = [
|
libxquartz_defs = [
|
||||||
'-DINXQUARTZ',
|
|
||||||
'-DUSE_NEW_CLUT',
|
'-DUSE_NEW_CLUT',
|
||||||
'-DX11LIBDIR="@0@"'.format(join_paths(get_option('prefix'),
|
'-DX11LIBDIR="@0@"'.format(join_paths(get_option('prefix'),
|
||||||
get_option('libdir'))),
|
get_option('libdir'))),
|
||||||
|
|
|
@ -281,10 +281,12 @@ xprDisplayInit(void)
|
||||||
/* With PseudoramiX, the X server only sees one screen; only PseudoramiX
|
/* With PseudoramiX, the X server only sees one screen; only PseudoramiX
|
||||||
itself knows about all of the screens. */
|
itself knows about all of the screens. */
|
||||||
|
|
||||||
if (noPseudoramiXExtension)
|
if (noPseudoramiXExtension) {
|
||||||
darwinScreensFound = displayCount;
|
darwinScreensFound = displayCount;
|
||||||
else
|
} else {
|
||||||
|
PseudoramiXExtensionInit();
|
||||||
darwinScreensFound = 1;
|
darwinScreensFound = 1;
|
||||||
|
}
|
||||||
|
|
||||||
if (xp_init(XP_BACKGROUND_EVENTS | XP_NO_DEFERRED_UPDATES) != Success)
|
if (xp_init(XP_BACKGROUND_EVENTS | XP_NO_DEFERRED_UPDATES) != Success)
|
||||||
FatalError("Could not initialize the Xplugin library.");
|
FatalError("Could not initialize the Xplugin library.");
|
||||||
|
|
|
@ -100,9 +100,6 @@ SOFTWARE.
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "extension.h"
|
#include "extension.h"
|
||||||
#include "extinit.h"
|
#include "extinit.h"
|
||||||
#ifdef INXQUARTZ
|
|
||||||
#include "nonsdk_extinit.h"
|
|
||||||
#endif
|
|
||||||
#include "micmap.h"
|
#include "micmap.h"
|
||||||
#include "os.h"
|
#include "os.h"
|
||||||
#include "globals.h"
|
#include "globals.h"
|
||||||
|
@ -129,12 +126,6 @@ static const ExtensionModule staticExtensions[] = {
|
||||||
#endif
|
#endif
|
||||||
#ifdef PANORAMIX
|
#ifdef PANORAMIX
|
||||||
{PanoramiXExtensionInit, "XINERAMA", &noPanoramiXExtension},
|
{PanoramiXExtensionInit, "XINERAMA", &noPanoramiXExtension},
|
||||||
#endif
|
|
||||||
#ifdef INXQUARTZ
|
|
||||||
/* PseudoramiXExtensionInit must be done before RRExtensionInit, or
|
|
||||||
* XQuartz will render windows offscreen.
|
|
||||||
*/
|
|
||||||
{PseudoramiXExtensionInit, "PseudoramiX", &noPseudoramiXExtension},
|
|
||||||
#endif
|
#endif
|
||||||
/* must be before Render to layer DisplayCursor correctly */
|
/* must be before Render to layer DisplayCursor correctly */
|
||||||
{XFixesExtensionInit, "XFIXES", &noXFixesExtension},
|
{XFixesExtensionInit, "XFIXES", &noXFixesExtension},
|
||||||
|
|
Loading…
Reference in New Issue
Block a user