[mutter] display: Remove an unused code path for enabling the compositor



commit c64eb9472418880634ebff541cc43b2f532f2e20
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Feb 7 06:48:12 2013 -0500

    display: Remove an unused code path for enabling the compositor

 src/core/display.c        |   11 ++---------
 src/core/screen-private.h |    2 --
 src/core/screen.c         |   28 ----------------------------
 3 files changed, 2 insertions(+), 39 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index f82eb2c..2e40976 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -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);
   
diff --git a/src/core/screen-private.h b/src/core/screen-private.h
index 4576f28..e1a7f07 100644
--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@@ -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,
diff --git a/src/core/screen.c b/src/core/screen.c
index 70a8b6b..89e99bd 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -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.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]