diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2021-01-21 18:56:18 +0100 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2021-01-25 15:14:35 +0000 |
| commit | d8e75027a4ab7939e8d21c95174dea2b2b9c813f (patch) | |
| tree | 3f31143ce371c6eebcfadf095ab2f322747aeeda | |
| parent | fb38c451b5bdf9db9c89530a366a6841c4b70ac4 (diff) | |
| download | mutter-d8e75027a4ab7939e8d21c95174dea2b2b9c813f.tar.gz | |
xwayland: Split Xwayland display name getter into two
One for the public channel, and one for the private maintainance
channel. Use the public one for test clients, otherwise tests become
flaky, and the private one for MetaX11Display.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1681>
| -rw-r--r-- | src/tests/test-utils.c | 2 | ||||
| -rw-r--r-- | src/wayland/meta-wayland.c | 8 | ||||
| -rw-r--r-- | src/wayland/meta-wayland.h | 4 | ||||
| -rw-r--r-- | src/x11/meta-x11-display.c | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/src/tests/test-utils.c b/src/tests/test-utils.c index 28cf97164..dc8de3175 100644 --- a/src/tests/test-utils.c +++ b/src/tests/test-utils.c @@ -440,7 +440,7 @@ test_client_new (const char *id, g_assert (meta_is_wayland_compositor ()); compositor = meta_wayland_compositor_get_default (); wayland_display_name = meta_wayland_get_wayland_display_name (compositor); - x11_display_name = meta_wayland_get_xwayland_display_name (compositor); + x11_display_name = meta_wayland_get_public_xwayland_display_name (compositor); g_subprocess_launcher_setenv (launcher, "WAYLAND_DISPLAY", wayland_display_name, diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c index 7da43d911..ef7a495b5 100644 --- a/src/wayland/meta-wayland.c +++ b/src/wayland/meta-wayland.c @@ -503,7 +503,13 @@ meta_wayland_get_wayland_display_name (MetaWaylandCompositor *compositor) } const char * -meta_wayland_get_xwayland_display_name (MetaWaylandCompositor *compositor) +meta_wayland_get_public_xwayland_display_name (MetaWaylandCompositor *compositor) +{ + return compositor->xwayland_manager.public_connection.name; +} + +const char * +meta_wayland_get_private_xwayland_display_name (MetaWaylandCompositor *compositor) { return compositor->xwayland_manager.private_connection.name; } diff --git a/src/wayland/meta-wayland.h b/src/wayland/meta-wayland.h index e59bb97bc..454330e4f 100644 --- a/src/wayland/meta-wayland.h +++ b/src/wayland/meta-wayland.h @@ -70,7 +70,9 @@ META_EXPORT_TEST const char *meta_wayland_get_wayland_display_name (MetaWaylandCompositor *compositor); META_EXPORT_TEST -const char *meta_wayland_get_xwayland_display_name (MetaWaylandCompositor *compositor); +const char *meta_wayland_get_public_xwayland_display_name (MetaWaylandCompositor *compositor); + +const char *meta_wayland_get_private_xwayland_display_name (MetaWaylandCompositor *compositor); void meta_wayland_compositor_restore_shortcuts (MetaWaylandCompositor *compositor, ClutterInputDevice *source); diff --git a/src/x11/meta-x11-display.c b/src/x11/meta-x11-display.c index ce62a6a17..f11684f14 100644 --- a/src/x11/meta-x11-display.c +++ b/src/x11/meta-x11-display.c @@ -1044,7 +1044,7 @@ meta_x11_get_display_name (void) compositor = meta_wayland_compositor_get_default (); - return meta_wayland_get_xwayland_display_name (compositor); + return meta_wayland_get_private_xwayland_display_name (compositor); } else #endif |