Xnest: simplify disabling unsupported extension
Instead of strange #undef hacks in various places, just go the straight route and set the corresponding no*Extension flags on server startup. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1632>
This commit is contained in:
parent
a647cc8a41
commit
ec13a6a61f
|
@ -25,6 +25,7 @@ is" without express or implied warranty.
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
#include "servermd.h"
|
#include "servermd.h"
|
||||||
|
#include "extinit.h"
|
||||||
|
|
||||||
#include "Xnest.h"
|
#include "Xnest.h"
|
||||||
|
|
||||||
|
@ -54,6 +55,19 @@ Window xnestParentWindow = 0;
|
||||||
int
|
int
|
||||||
ddxProcessArgument(int argc, char *argv[], int i)
|
ddxProcessArgument(int argc, char *argv[], int i)
|
||||||
{
|
{
|
||||||
|
/* disable some extensions we currently don't support yet */
|
||||||
|
#ifdef MITSHM
|
||||||
|
noMITShmExtension = TRUE;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef COMPOSITE
|
||||||
|
noCompositeExtension = TRUE;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef DPMSExtension
|
||||||
|
noDPMSExtension = TRUE;
|
||||||
|
#endif
|
||||||
|
|
||||||
if (!strcmp(argv[i], "-display")) {
|
if (!strcmp(argv[i], "-display")) {
|
||||||
if (++i < argc) {
|
if (++i < argc) {
|
||||||
xnestDisplayName = argv[i];
|
xnestDisplayName = argv[i];
|
||||||
|
|
|
@ -31,6 +31,4 @@
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#include <xkb-config.h>
|
#include <xkb-config.h>
|
||||||
|
|
||||||
#undef MITSHM
|
|
||||||
|
|
||||||
#endif /* XNEST_CONFIG_H */
|
#endif /* XNEST_CONFIG_H */
|
||||||
|
|
Loading…
Reference in New Issue