isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-05 08:04:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

context/main: Disable X11 specific options

Browse Source 
Related: https://gitlab.gnome.org/GNOME/mutter/-/issues/2272
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2429>
This commit is contained in:
Bilal Elmoussaoui 2022-05-26 14:54:15 +02:00 committed by Marge Bot
parent 62330f273d
commit 89d036cca0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/meta-context-main.c
View File

@ -466,8 +466,10 @@ meta_context_main_create_backend (MetaContext *context,
compositor_type = meta_context_get_compositor_type (context); compositor_type = meta_context_get_compositor_type (context);
switch (compositor_type) switch (compositor_type)
{ {
#ifdef HAVE_X11
case META_COMPOSITOR_TYPE_X11: case META_COMPOSITOR_TYPE_X11:
return create_x11_cm_backend (context, error); return create_x11_cm_backend (context, error);
#endif
case META_COMPOSITOR_TYPE_WAYLAND: case META_COMPOSITOR_TYPE_WAYLAND:
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
if (context_main->options.nested) if (context_main->options.nested)
@ -549,6 +551,7 @@ meta_context_main_add_option_entries (MetaContextMain *context_main)
{ {
MetaContext *context = META_CONTEXT (context_main); MetaContext *context = META_CONTEXT (context_main);
GOptionEntry options[] = { GOptionEntry options[] = {
#ifdef HAVE_X11
{ {
"replace", 'r', 0, G_OPTION_ARG_NONE, "replace", 'r', 0, G_OPTION_ARG_NONE,
&context_main->options.x11.replace, &context_main->options.x11.replace,
@ -585,6 +588,7 @@ meta_context_main_add_option_entries (MetaContextMain *context_main)
N_("Make X calls synchronous"), N_("Make X calls synchronous"),
NULL NULL
}, },
#endif
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
{ {
"wayland", 0, 0, G_OPTION_ARG_NONE, "wayland", 0, 0, G_OPTION_ARG_NONE,
@ -633,11 +637,13 @@ meta_context_main_add_option_entries (MetaContextMain *context_main)
&context_main->options.unsafe_mode, &context_main->options.unsafe_mode,
"Run in unsafe mode" "Run in unsafe mode"
}, },
#ifdef HAVE_X11
{ {
"x11", 0, 0, G_OPTION_ARG_NONE, "x11", 0, 0, G_OPTION_ARG_NONE,
&context_main->options.x11.force, &context_main->options.x11.force,
N_("Run with X11 backend") N_("Run with X11 backend")
}, },
#endif
{ NULL } { NULL }
}; };