[mutter] Remove XOR gc only used in removed reduced-resources mode



commit 14987f2b218cec39121a6c75a11589bb393b800f
Author: Owen W. Taylor <otaylor fishsoup net>
Date:   Mon Nov 23 10:20:55 2009 -0500

    Remove XOR gc only used in removed reduced-resources mode
    
    Remove screen.root_xor_gc; this was only used for XOR drawing
    in reduced-resources mode, which was removed.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=602740

 src/core/screen-private.h |    3 ---
 src/core/screen.c         |   43 -------------------------------------------
 2 files changed, 0 insertions(+), 46 deletions(-)
---
diff --git a/src/core/screen-private.h b/src/core/screen-private.h
index a1ba83e..594f537 100644
--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@@ -129,9 +129,6 @@ struct _MetaScreen
   
   int closing;
 
-  /* gc for XOR on root window */
-  GC root_xor_gc;
-
   /* Managed by compositor.c */
   gpointer compositor_data;
   
diff --git a/src/core/screen.c b/src/core/screen.c
index 26890c8..329035c 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -707,35 +707,6 @@ meta_screen_new (MetaDisplay *display,
   screen->compositor_data = NULL;
   screen->guard_window = None;
 
-  {
-    XFontStruct *font_info;
-    XGCValues gc_values;
-    gulong value_mask = 0;
-    
-    gc_values.subwindow_mode = IncludeInferiors;
-    value_mask |= GCSubwindowMode;
-    gc_values.function = GXinvert;
-    value_mask |= GCFunction;
-    gc_values.line_width = META_WIREFRAME_XOR_LINE_WIDTH;
-    value_mask |= GCLineWidth;
-
-    font_info = XLoadQueryFont (screen->display->xdisplay, "fixed");
-
-    if (font_info != NULL)
-      {
-        gc_values.font = font_info->fid;
-        value_mask |= GCFont;
-        XFreeFontInfo (NULL, font_info, 1);
-      }
-    else
-      meta_warning ("xserver doesn't have 'fixed' font.\n");
-
-    screen->root_xor_gc = XCreateGC (screen->display->xdisplay,
-                                     screen->xroot,
-                                     value_mask,
-                                     &gc_values);
-  }
-  
   screen->monitor_infos = NULL;
   screen->n_monitor_infos = 0;
   screen->last_monitor_index = 0;  
@@ -831,7 +802,6 @@ meta_screen_free (MetaScreen *screen,
                   guint32     timestamp)
 {
   MetaDisplay *display;
-  XGCValues gc_values = { 0 };
 
   display = screen->display;
 
@@ -886,19 +856,6 @@ meta_screen_free (MetaScreen *screen,
   if (screen->work_area_later != 0)
     g_source_remove (screen->work_area_later);
 
-
-  if (XGetGCValues (screen->display->xdisplay,
-                    screen->root_xor_gc,
-                    GCFont,
-                    &gc_values))
-    {
-      XUnloadFont (screen->display->xdisplay,
-                   gc_values.font);
-    }
-
-  XFreeGC (screen->display->xdisplay,
-           screen->root_xor_gc);
-  
   if (screen->monitor_infos)
     g_free (screen->monitor_infos);
   



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