[mutter/wip/carlosg/xwayland-on-demand: 5/7] compositor: Add explicit API call to redirect X11 windows



commit b76c4a4992a612a329286010c5c2911c2ef48dab
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri May 24 21:04:56 2019 +0200

    compositor: Add explicit API call to redirect X11 windows
    
    This is not useful yet, but will be when Xwayland may restart

 src/compositor/compositor-private.h | 2 ++
 src/compositor/compositor.c         | 9 +++++++++
 src/core/display.c                  | 2 ++
 3 files changed, 13 insertions(+)
---
diff --git a/src/compositor/compositor-private.h b/src/compositor/compositor-private.h
index b08746d24..eb0bfd25c 100644
--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@@ -71,4 +71,6 @@ MetaCloseDialog * meta_compositor_create_close_dialog (MetaCompositor *composito
 MetaInhibitShortcutsDialog * meta_compositor_create_inhibit_shortcuts_dialog (MetaCompositor *compositor,
                                                                               MetaWindow     *window);
 
+void meta_compositor_redirect_x11_windows (MetaCompositor *compositor);
+
 #endif /* META_COMPOSITOR_PRIVATE_H */
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index f015c92f4..0e17c359f 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -514,6 +514,15 @@ redirect_windows (MetaX11Display *x11_display)
     }
 }
 
+void
+meta_compositor_redirect_x11_windows (MetaCompositor *compositor)
+{
+  MetaDisplay *display = compositor->display;
+
+  if (display->x11_display)
+    redirect_windows (display->x11_display);
+}
+
 void
 meta_compositor_manage (MetaCompositor *compositor)
 {
diff --git a/src/core/display.c b/src/core/display.c
index 226dd4656..d38b2fb3a 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -650,6 +650,8 @@ meta_display_init_x11 (MetaDisplay  *display,
   if (!display->display_opening)
     meta_display_manage_all_windows (display);
 
+  meta_compositor_redirect_x11_windows (display->compositor);
+
   return TRUE;
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]