[mutter/wip/carlosg/xwayland-on-demand: 6/10] compositor: Add explicit API call to redirect X11 windows
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/xwayland-on-demand: 6/10] compositor: Add explicit API call to redirect X11 windows
- Date: Sat, 25 May 2019 22:44:46 +0000 (UTC)
commit 235f8e1ff8b9ee1a23b3f54633e7e5fecc8cd15f
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 | 12 ++++++++++--
src/core/display.c | 2 ++
3 files changed, 14 insertions(+), 2 deletions(-)
---
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..a68eb7eb9 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)
{
@@ -593,8 +602,7 @@ meta_compositor_manage (MetaCompositor *compositor)
compositor->have_x11_sync_object = meta_sync_ring_init (xdisplay);
}
- if (display->x11_display)
- redirect_windows (display->x11_display);
+ meta_compositor_redirect_x11_windows (compositor);
compositor->plugin_mgr = meta_plugin_manager_new (compositor);
}
diff --git a/src/core/display.c b/src/core/display.c
index 60222a9a8..5f4283aaf 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_xwindows (display);
+ meta_compositor_redirect_x11_windows (display->compositor);
+
return TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]