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

display: Clean up screen management code

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-02-07 19:52:34 -05:00
parent def5e86673
commit 6561b53346
1 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/display.c
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,13 +817,11 @@ meta_display_open (void)
return FALSE; return FALSE;
} }
enable_compositor (the_display); screens = g_slist_prepend (screens, screen);
/* Now manage all existing windows */ the_display->screens = screens;
tmp = the_display->screens;
while (tmp != NULL) enable_compositor (the_display);
{
MetaScreen *screen = tmp->data;
meta_screen_create_guard_window (screen); meta_screen_create_guard_window (screen);
@ -838,9 +831,6 @@ meta_display_open (void)
if (!meta_is_wayland_compositor ()) if (!meta_is_wayland_compositor ())
meta_screen_manage_all_windows (screen); meta_screen_manage_all_windows (screen);
tmp = tmp->next;
}
{ {
Window focus; Window focus;
int ret_to; int ret_to;