From 9b75dd368d7a7ea8773a4a2fc663b83bca91f6ab Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Fri, 3 May 2013 00:57:28 +0100
Subject: Adds a --nested option

This adds a --nested option to request that mutter no longer run as a
classic X compositor with an output window mapped on the X Composite
Overlay Window and also not assume it is running directly under X.

The intention is that in this mode Mutter will itself launch a headless
X server and display output will be handled by Clutter and Cogl. This
will enable running Mutter nested as an application within an X session.

This patch introduces the internal idea that mutter is running as a
"display server" as a means to condition the way mutter operates in
various ways throughout the code base.

Later we also expect to add a --kms option as another way of enabling
this display server mode that will assume full control of the display
hardware instead of running as a nested application.
---
 src/core/mutter.c |  9 +++++++++
 src/core/util.c   | 13 +++++++++++++
 src/meta/util.h   |  2 ++
 3 files changed, 24 insertions(+)

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,8 +46,15 @@ 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,
@@ -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);
-- 
cgit v1.2.1