frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xquartz: Disable COMPOSITE at runtime 

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
(cherry picked from commit 2567388a29)
This commit is contained in:
Jeremy Huddleston Sequoia 2022-11-27 22:23:43 -08:00
parent aa0d8d440c
commit 8ea43dd8bf
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/xquartz/mach-startup/bundle-main.c
View File

@ -72,6 +72,10 @@ FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1, 2) _X_NORETURN;
extern int noPanoramiXExtension; extern int noPanoramiXExtension;
#ifdef COMPOSITE
extern Bool noCompositeExtension;
#endif
#define DEFAULT_CLIENT X11BINDIR "/xterm" #define DEFAULT_CLIENT X11BINDIR "/xterm"
#define DEFAULT_STARTX X11BINDIR "/startx -- " X11BINDIR "/Xquartz" #define DEFAULT_STARTX X11BINDIR "/startx -- " X11BINDIR "/Xquartz"
#define DEFAULT_SHELL "/bin/sh" #define DEFAULT_SHELL "/bin/sh"
@ -635,6 +639,11 @@ main(int argc, char **argv, char **envp)
/* The server must not run the PanoramiX operations. */ /* The server must not run the PanoramiX operations. */
noPanoramiXExtension = TRUE; noPanoramiXExtension = TRUE;
#ifdef COMPOSITE
/* https://gitlab.freedesktop.org/xorg/xserver/-/issues/1409 */
noCompositeExtension = TRUE;
#endif
/* Setup the initial crasherporter info */ /* Setup the initial crasherporter info */
strlcpy(__crashreporter_info_buff__, __crashreporter_info__base, strlcpy(__crashreporter_info_buff__, __crashreporter_info__base,
sizeof(__crashreporter_info_buff__)); sizeof(__crashreporter_info_buff__));