[mutter/wip/carlosg/x11less-preparations: 8/13] core: Add explicit init/shutdown_x11() MetaDisplay calls

[Carlos Garnacho <carlosg src gnome org>]

commit d1f1a2baf87b52fd56cc9d20cbb5b2bf31b9533c
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Dec 10 13:40:54 2018 +0100

    core: Add explicit init/shutdown_x11() MetaDisplay calls
    
    The lifetime of MetaX11Display is still tied to MetaDisplay, but these
    calls will be useful when it's actually affordable to decouple those.
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/420

 src/core/display-private.h |  4 ++++
 src/core/display.c         | 46 +++++++++++++++++++++++++++++++++++-----------
 2 files changed, 39 insertions(+), 11 deletions(-)
---
diff --git a/src/core/display-private.h b/src/core/display-private.h
index be2f44433..7ff572a1c 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -427,4 +427,8 @@ MetaWindow *meta_display_get_window_from_id (MetaDisplay *display,
                                              uint64_t     window_id);
 uint64_t    meta_display_generate_window_id (MetaDisplay *display);
 
+gboolean meta_display_init_x11     (MetaDisplay  *display,
+                                    GError      **error);
+void     meta_display_shutdown_x11 (MetaDisplay  *display);
+
 #endif
diff --git a/src/core/display.c b/src/core/display.c
index 01e97dafd..c732cf7f0 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -631,6 +631,38 @@ on_ui_scaling_factor_changed (MetaSettings *settings,
   meta_display_reload_cursor (display);
 }
 
+gboolean
+meta_display_init_x11 (MetaDisplay  *display,
+                       GError      **error)
+{
+  MetaX11Display *x11_display;
+
+  g_assert (display->x11_display == NULL);
+
+  x11_display = meta_x11_display_new (display, error);
+  if (!x11_display)
+    return FALSE;
+
+  display->x11_display = x11_display;
+  g_signal_emit (display, display_signals[X11_DISPLAY_OPENED], 0);
+  meta_x11_display_create_guard_window (x11_display);
+
+  if (!display->display_opening)
+    meta_display_manage_all_windows (display);
+  return TRUE;
+}
+
+void
+meta_display_shutdown_x11 (MetaDisplay *display)
+{
+  if (!display->x11_display)
+    return;
+
+  g_signal_emit (display, display_signals[X11_DISPLAY_CLOSING], 0);
+  g_object_run_dispose (G_OBJECT (display->x11_display));
+  g_clear_object (&display->x11_display);
+}
+
 /**
  * meta_display_open:
  *
@@ -646,7 +678,6 @@ meta_display_open (void)
 {
   GError *error = NULL;
   MetaDisplay *display;
-  MetaX11Display *x11_display;
   int i;
   guint32 timestamp;
   Window old_active_xwindow = None;
@@ -730,10 +761,8 @@ meta_display_open (void)
 
   if (meta_should_autostart_x11_display ())
     {
-      x11_display = meta_x11_display_new (display, &error);
-      g_assert (x11_display != NULL); /* Required, for now */
-      display->x11_display = x11_display;
-      g_signal_emit (display, display_signals[X11_DISPLAY_OPENED], 0);
+      if (!meta_display_init_x11 (display, &error))
+        g_error ("Failed to start Xwayland: %s", error->message);
 
       timestamp = display->x11_display->timestamp;
     }
@@ -955,12 +984,7 @@ meta_display_close (MetaDisplay *display,
   if (display->compositor)
     meta_compositor_destroy (display->compositor);
 
-  if (display->x11_display)
-    {
-      g_signal_emit (display, display_signals[X11_DISPLAY_CLOSING], 0);
-      g_object_run_dispose (G_OBJECT (display->x11_display));
-      g_clear_object (&display->x11_display);
-    }
+  meta_display_shutdown_x11 (display);
 
   meta_display_shutdown_keys (display);