diff options
| -rw-r--r-- | src/core/mutter.c | 9 | ||||
| -rw-r--r-- | src/core/util.c | 13 | ||||
| -rw-r--r-- | src/meta/util.h | 2 |
3 files changed, 24 insertions, 0 deletions
diff --git a/src/core/mutter.c b/src/core/mutter.c index 3216726cf..2afdff2a9 100644 --- a/src/core/mutter.c +++ b/src/core/mutter.c @@ -46,9 +46,16 @@ print_version (const gchar *option_name, } static gchar *plugin = "default"; +static gboolean opt_nested = FALSE; GOptionEntry mutter_options[] = { { + "nested", 0, 0, G_OPTION_ARG_NONE, + &opt_nested, + N_("Run nested as an application for testing"), + NULL, + }, + { "version", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, print_version, N_("Print version"), @@ -77,6 +84,8 @@ main (int argc, char **argv) exit (1); } + meta_set_is_display_server (opt_nested); + if (plugin) meta_plugin_manager_load (plugin); diff --git a/src/core/util.c b/src/core/util.c index 92a33e453..b37cc000f 100644 --- a/src/core/util.c +++ b/src/core/util.c @@ -55,6 +55,7 @@ static gint verbose_topics = 0; static gboolean is_debugging = FALSE; static gboolean replace_current = FALSE; static int no_prefix = 0; +static gboolean is_display_server = FALSE; #ifdef WITH_VERBOSE_MODE static FILE* logfile = NULL; @@ -194,6 +195,18 @@ meta_set_replace_current_wm (gboolean setting) replace_current = setting; } +gboolean +meta_is_display_server (void) +{ + return is_display_server; +} + +void +meta_set_is_display_server (gboolean value) +{ + is_display_server = value; +} + char * meta_g_utf8_strndup (const gchar *src, gsize n) diff --git a/src/meta/util.h b/src/meta/util.h index be87190b0..c0252bb11 100644 --- a/src/meta/util.h +++ b/src/meta/util.h @@ -37,6 +37,8 @@ void meta_set_debugging (gboolean setting); gboolean meta_is_syncing (void); void meta_set_syncing (gboolean setting); void meta_set_replace_current_wm (gboolean setting); +gboolean meta_is_display_server (void); +void meta_set_is_display_server (gboolean setting); void meta_debug_spew_real (const char *format, ...) G_GNUC_PRINTF (1, 2); |