isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-13 16:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

main: Let the X11 CM backend deal with selecting the display

Browse Source 
It's specific to that backend, so do it there.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1833>
This commit is contained in:
Jonas Ådahl
2021-02-25 22:00:06 +01:00
committed by Marge Bot
parent 89053cc6f7
commit 6558d43cd5
2 changed files with 85 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/core/main.c
View File

@ -303,28 +303,6 @@ meta_get_option_context (void)
return ctx;
}
/**
* meta_select_display:
*
* Selects which display Mutter should use. It first tries to use
* @display_name as the display. If @display_name is %NULL then
* try to use the environment variable MUTTER_DISPLAY. If that
* also is %NULL, use the default - :0.0
*/
static void
meta_select_display (char *display_arg)
{
const char *display_name;
if (display_arg)
display_name = (const char *) display_arg;
else
display_name = g_getenv ("MUTTER_DISPLAY");
if (display_name)
g_setenv ("DISPLAY", display_name, TRUE);
}
void
meta_finalize (void)
{
@ -653,6 +631,19 @@ calculate_compositor_configuration (MetaCompositorType *compositor_type,
else
#endif /* HAVE_WAYLAND */
{
static const char *display_name_prop_names[] = {
"display-name",
};
static GValue display_name_prop_values[] = {
G_VALUE_INIT,
};
g_value_init (&display_name_prop_values[0], G_TYPE_STRING);
g_value_set_string (&display_name_prop_values[0], opt_display_name);
*n_properties = G_N_ELEMENTS (display_name_prop_values);
*prop_names = display_name_prop_names;
*prop_values = display_name_prop_values;
*backend_gtype = META_TYPE_BACKEND_X11_CM;
return;
}
@ -793,11 +784,6 @@ meta_init (void)
g_irepository_prepend_search_path (MUTTER_PKGLIBDIR);
#endif
/* NB: When running as a hybrid wayland compositor we run our own headless X
* server so the user can't control the X display to connect too. */
if (!meta_is_wayland_compositor ())
meta_select_display (opt_display_name);
meta_init_backend (backend_gtype, n_properties, prop_names, prop_values);
for (i = 0; i < n_properties; i++)