xserver: Branch 'master'
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Apr 7 23:13:08 UTC 2021
hw/xquartz/Makefile.am | 1 -
hw/xquartz/meson.build | 1 -
hw/xquartz/xpr/xprScreen.c | 6 ++++--
mi/miinitext.c | 9 ---------
4 files changed, 4 insertions(+), 13 deletions(-)
New commits:
commit 65b27d82f2c6c3eecbc7370765ee7c036b245b2f
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Sun Apr 4 16:10:28 2021 -0700
xquartz: Call PseudoramiXExtensionInit() through InitOutput() just like xwin
Fixes: https://github.com/XQuartz/XQuartz/issues/140
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
diff --git a/hw/xquartz/Makefile.am b/hw/xquartz/Makefile.am
index 342a998b2..bcc6dabfe 100644
--- a/hw/xquartz/Makefile.am
+++ b/hw/xquartz/Makefile.am
@@ -3,7 +3,6 @@ AM_CFLAGS = $(DIX_CFLAGS)
AM_OBJCFLAGS = $(DIX_CFLAGS)
AM_CPPFLAGS = \
-DXSERVER_VERSION=\"$(VERSION)\" \
- -DINXQUARTZ \
-DUSE_NEW_CLUT \
-DXFree86Server \
-I$(top_srcdir)/miext/rootless \
diff --git a/hw/xquartz/meson.build b/hw/xquartz/meson.build
index 9e321b059..ec143b599 100644
--- a/hw/xquartz/meson.build
+++ b/hw/xquartz/meson.build
@@ -36,7 +36,6 @@ srcs_libxquartz = [
]
libxquartz_defs = [
- '-DINXQUARTZ',
'-DUSE_NEW_CLUT',
'-DX11LIBDIR="@0@"'.format(join_paths(get_option('prefix'),
get_option('libdir'))),
diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index 270d6eb00..562d6a0c3 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -281,10 +281,12 @@ xprDisplayInit(void)
/* With PseudoramiX, the X server only sees one screen; only PseudoramiX
itself knows about all of the screens. */
- if (noPseudoramiXExtension)
+ if (noPseudoramiXExtension) {
darwinScreensFound = displayCount;
- else
+ } else {
+ PseudoramiXExtensionInit();
darwinScreensFound = 1;
+ }
if (xp_init(XP_BACKGROUND_EVENTS | XP_NO_DEFERRED_UPDATES) != Success)
FatalError("Could not initialize the Xplugin library.");
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 8cb26d0c4..2e4aba534 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -100,9 +100,6 @@ SOFTWARE.
#include "misc.h"
#include "extension.h"
#include "extinit.h"
-#ifdef INXQUARTZ
-#include "nonsdk_extinit.h"
-#endif
#include "micmap.h"
#include "os.h"
#include "globals.h"
@@ -129,12 +126,6 @@ static const ExtensionModule staticExtensions[] = {
#endif
#ifdef PANORAMIX
{PanoramiXExtensionInit, "XINERAMA", &noPanoramiXExtension},
-#endif
-#ifdef INXQUARTZ
- /* PseudoramiXExtensionInit must be done before RRExtensionInit, or
- * XQuartz will render windows offscreen.
- */
- {PseudoramiXExtensionInit, "PseudoramiX", &noPseudoramiXExtension},
#endif
/* must be before Render to layer DisplayCursor correctly */
{XFixesExtensionInit, "XFIXES", &noXFixesExtension},
More information about the xorg-commit
mailing list