brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/utils: Spawn Xwayland before X11 test client

Browse Source 
This is so we can add our async waiter up front. Using
XOpenDisplay(NULL) didn't work; for some reason it dead locked when
XInitThreads() had been called prior.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1681>
This commit is contained in:
Jonas Ådahl 2021-01-21 18:59:50 +01:00 committed by Marge Bot
parent 02859221ea
commit 798fc63755
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -422,6 +422,18 @@ test_client_alarm_filter (MetaX11Display *x11_display,
return FALSE; return FALSE;
} }
static gpointer
spawn_xwayland (gpointer user_data)
{
xcb_connection_t *connection;
connection = xcb_connect (NULL, NULL);
g_assert_nonnull (connection);
xcb_disconnect (connection);
return NULL;
}
TestClient * TestClient *
test_client_new (const char *id, test_client_new (const char *id,
MetaWindowClientType type, MetaWindowClientType type,
@ -474,7 +486,22 @@ test_client_new (const char *id,
client->loop = g_main_loop_new (NULL, FALSE); client->loop = g_main_loop_new (NULL, FALSE);
if (client->type == META_WINDOW_CLIENT_TYPE_X11) if (client->type == META_WINDOW_CLIENT_TYPE_X11)
client->waiter = async_waiter_new (); {
MetaDisplay *display = meta_get_display ();
if (!display->x11_display)
{
GThread *thread;
thread = g_thread_new ("Mutter Spawn Xwayland Thread",
spawn_xwayland,
NULL);
test_wait_for_x11_display ();
g_thread_join (thread);
}
client->waiter = async_waiter_new ();
}
return client; return client;
} }