Merge branch 'disable-xtest-on-xwayland' into 'master'

WIP: xwayland: Disable the XTEST extension by default

See merge request xorg/xserver!452
This commit is contained in:
Olivier Fourdan 2025-12-10 02:04:16 +01:00
commit 61b72d5346

View file

@ -477,3 +477,19 @@ InitOutput(ScreenInfo * screen_info, int argc, char **argv)
listen_on_fds();
}
}
int
main(int argc, char *argv[], char *envp[])
{
#ifdef XTEST
/* Most features from the XTEST extension cannot work on Wayland,
* disable the XTEST extension so apps aren't tempted to use it.
*
* Using the standard command line option "+extension XTEST"
* can re-enable it at runtime, if really needed.
*/
noTestExtensions = TRUE;
#endif
return dix_main(argc, argv, envp);
}