isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-07-23 18:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

x11: Open window decoration X11 connection earlier

Browse Source 
If we wait with opening the X11 window decoration GDK connection, we
might end up with a terminated X11 server before we finish
initializing, depending on the things happening after spawning Xwayland
and before opening the MetaX11Dispaly. In gnome-shell, this involves
e.g. creating a couple of temporary X11 connections, and on disconnect,
if they happen to be the last client, the X server will terminate
itself.

https://bugzilla.gnome.org/show_bug.cgi?id=759538
This commit is contained in:
Jonas Ådahl
2017-12-26 15:58:54 +08:00
parent 1caaf0cd1e
commit f635876eac
3 changed files with 97 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/main.c
View File

@ -612,6 +612,22 @@ meta_init (void)
meta_fatal ("Can't specify both SM save file and SM client id\n");
meta_main_loop = g_main_loop_new (NULL, FALSE);
/*
* We need to make sure the first client connecting to the X server
* (e.g. Xwayland started from meta_wayland_init() above) is a permanent one,
* so prepare the GDK X11 connection now already. Without doing this, if
* there are any functionality that relies on X11 after here before
* meta_display_open(), the X server will terminate itself when such a client
* disconnects before the permanent GDK client connects.
*/
if (meta_should_autostart_x11_display ())
{
GError *error = NULL;
if (!meta_x11_init_gdk_display (&error))
g_error ("Failed to open X11 display: %s", error->message);
}
}
/**