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

display: Remove an unused code path for enabling the compositor

Browse Source
This commit is contained in:
Jasper St. Pierre 2013-02-07 06:48:12 -05:00
parent d8f569eaf5
commit c64eb94724
3 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/display.c
View File

@ -381,8 +381,7 @@ sn_error_trap_pop (SnDisplay *sn_display,
#endif
static void
enable_compositor (MetaDisplay *display,
gboolean composite_windows)
enable_compositor (MetaDisplay *display)
{
GSList *list;
@ -408,9 +407,6 @@ enable_compositor (MetaDisplay *display,
meta_compositor_manage_screen (screen->display->compositor,
screen);
if (composite_windows)
meta_screen_composite_all_windows (screen);
}
}
@ -906,10 +902,7 @@ meta_display_open (void)
return FALSE;
}
/* We don't composite the windows here because they will be composited
faster with the call to meta_screen_manage_all_windows further down
the code */
enable_compositor (the_display, FALSE);
enable_compositor (the_display);
meta_display_grab (the_display);

2
src/core/screen-private.h
View File

@ -241,8 +241,6 @@ void meta_screen_update_showing_desktop_hint (MetaScreen *screen);
gboolean meta_screen_apply_startup_properties (MetaScreen *screen,
MetaWindow *window);
void meta_screen_composite_all_windows (MetaScreen *screen);
void meta_screen_restacked (MetaScreen *screen);
void meta_screen_workspace_switched (MetaScreen *screen,

28
src/core/screen.c
View File

@ -1069,34 +1069,6 @@ meta_screen_manage_all_windows (MetaScreen *screen)
meta_display_ungrab (screen->display);
}
void
meta_screen_composite_all_windows (MetaScreen *screen)
{
MetaDisplay *display;
GSList *windows, *tmp;
display = screen->display;
if (!display->compositor)
return;
windows = meta_display_list_windows (display,
META_LIST_INCLUDE_OVERRIDE_REDIRECT);
for (tmp = windows; tmp != NULL; tmp = tmp->next)
{
MetaWindow *window = tmp->data;
meta_compositor_add_window (display->compositor, window);
if (window->visible_to_compositor)
meta_compositor_show_window (display->compositor, window,
META_COMP_EFFECT_NONE);
}
g_slist_free (windows);
/* initialize the compositor's view of the stacking order */
meta_stack_tracker_sync_stack (screen->stack_tracker);
}
/**
* meta_screen_for_x_screen:
* @xscreen: an X screen structure.