isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-20 06:25:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

tests: Override X11 display number

Browse Source 
As with the Wayland display name, to avoid clashes with already an
running Xwayland or Xorg instance, override the X11 display name to
something less likely to cause a clash.

https://gitlab.gnome.org/GNOME/mutter/issues/193
This commit is contained in:
Jonas Ådahl 2018-11-12 11:29:44 +01:00
parent fe1d9fb4a7
commit bd624e4dfb
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tests/test-utils.c
View File

@ -27,6 +27,7 @@
#include "core/display-private.h" #include "core/display-private.h"
#include "core/window-private.h" #include "core/window-private.h"
#include "wayland/meta-wayland.h" #include "wayland/meta-wayland.h"
#include "wayland/meta-xwayland.h"
#include "x11/meta-x11-display-private.h" #include "x11/meta-x11-display-private.h"
struct _TestClient { struct _TestClient {
@ -94,6 +95,7 @@ test_init (int *argc,
ensure_test_client_path (*argc, *argv); ensure_test_client_path (*argc, *argv);
meta_wayland_override_display_name ("mutter-test-display"); meta_wayland_override_display_name ("mutter-test-display");
meta_xwayland_override_display_number (512);
} }
AsyncWaiter * AsyncWaiter *

16
src/wayland/meta-xwayland.c
View File

@ -59,6 +59,8 @@ G_DEFINE_TYPE (MetaWaylandSurfaceRoleXWayland,
meta_wayland_surface_role_xwayland, meta_wayland_surface_role_xwayland,
META_TYPE_WAYLAND_ACTOR_SURFACE) META_TYPE_WAYLAND_ACTOR_SURFACE)
static int display_number_override = -1;
void void
meta_xwayland_associate_window_with_surface (MetaWindow *window, meta_xwayland_associate_window_with_surface (MetaWindow *window,
MetaWaylandSurface *surface) MetaWaylandSurface *surface)
@ -371,6 +373,12 @@ x_io_error (Display *display)
return 0; return 0;
} }
void
meta_xwayland_override_display_number (int number)
{
display_number_override = number;
}
static gboolean static gboolean
choose_xdisplay (MetaXWaylandManager *manager) choose_xdisplay (MetaXWaylandManager *manager)
{ {
@ -378,11 +386,9 @@ choose_xdisplay (MetaXWaylandManager *manager)
char *lock_file = NULL; char *lock_file = NULL;
gboolean fatal = FALSE; gboolean fatal = FALSE;
/* Hack to keep the unused Xwayland instance on if (display_number_override != -1)
* the login screen from taking the prime :0 display display = display_number_override;
* number. else if (!g_getenv ("RUNNING_UNDER_GDM"))
*/
if (g_getenv ("RUNNING_UNDER_GDM") != NULL)
display = 1024; display = 1024;
do do

3
src/wayland/meta-xwayland.h
View File

@ -30,6 +30,9 @@
#include "meta/types.h" #include "meta/types.h"
#include "wayland/meta-wayland-types.h" #include "wayland/meta-wayland-types.h"
void
meta_xwayland_override_display_number (int number);
void void
meta_xwayland_handle_wl_surface_id (MetaWindow *window, meta_xwayland_handle_wl_surface_id (MetaWindow *window,
guint32 surface_id); guint32 surface_id);