display: Clean up screen management code

This commit is contained in:
Jasper St. Pierre 2014-02-07 19:52:34 -05:00
parent def5e86673
commit 6561b53346

View File

@ -808,12 +808,7 @@ meta_display_open (void)
screen = meta_screen_new (the_display, i, timestamp); screen = meta_screen_new (the_display, i, timestamp);
if (screen) if (!screen)
screens = g_slist_prepend (screens, screen);
the_display->screens = screens;
if (screens == NULL)
{ {
/* This would typically happen because all the screens already /* This would typically happen because all the screens already
* have window managers. * have window managers.
@ -822,24 +817,19 @@ meta_display_open (void)
return FALSE; return FALSE;
} }
screens = g_slist_prepend (screens, screen);
the_display->screens = screens;
enable_compositor (the_display); enable_compositor (the_display);
/* Now manage all existing windows */ meta_screen_create_guard_window (screen);
tmp = the_display->screens;
while (tmp != NULL)
{
MetaScreen *screen = tmp->data;
meta_screen_create_guard_window (screen); /* We know that if mutter is running as a Wayland compositor,
* we start out with no windows.
/* We know that if mutter is running as a Wayland compositor, */
* we start out with no windows. if (!meta_is_wayland_compositor ())
*/ meta_screen_manage_all_windows (screen);
if (!meta_is_wayland_compositor ())
meta_screen_manage_all_windows (screen);
tmp = tmp->next;
}
{ {
Window focus; Window focus;