diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2020-02-28 18:59:39 +0100 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2020-02-28 20:20:35 +0000 |
| commit | 4b513a31ae11927b6db10dfcab13b7ad07cd6bc3 (patch) | |
| tree | 5002edad8dad31ba74363591e9a62e6d3c211bc6 /src/compositor/meta-compositor-x11.c | |
| parent | 25c9e66c732485b95157325cd48267a51ed3c853 (diff) | |
| download | mutter-4b513a31ae11927b6db10dfcab13b7ad07cd6bc3.tar.gz | |
compositor: Shuffle x11 compositing bits in MetaCompositor
Given that on Wayland we are pretty much guaranteed to finish MetaX11Display
setup after the MetaCompositor is enabled, we may drop the
meta_compositor_manage() x11 initialization bits, and move them into the
MetaX11Compositor subclass where it's actually needed.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/944
Diffstat (limited to 'src/compositor/meta-compositor-x11.c')
| -rw-r--r-- | src/compositor/meta-compositor-x11.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/compositor/meta-compositor-x11.c b/src/compositor/meta-compositor-x11.c index fce3f830c..1737e97f5 100644 --- a/src/compositor/meta-compositor-x11.c +++ b/src/compositor/meta-compositor-x11.c @@ -109,6 +109,8 @@ meta_compositor_x11_manage (MetaCompositor *compositor) MetaBackend *backend = meta_get_backend (); Window xwindow; + meta_x11_display_set_cm_selection (display->x11_display); + compositor_x11->output = display->x11_display->composite_overlay_window; xwindow = meta_backend_x11_get_xwindow (META_BACKEND_X11 (backend)); @@ -135,6 +137,8 @@ meta_compositor_x11_manage (MetaCompositor *compositor) XMapWindow (xdisplay, compositor_x11->output); compositor_x11->have_x11_sync_object = meta_sync_ring_init (xdisplay); + + meta_compositor_redirect_x11_windows (META_COMPOSITOR (compositor)); } static void |