From 1c51c48606930b3a784c0bbc99a5a8eb2188ca5f Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Wed, 18 Feb 2004 00:59:14 +0000 Subject: GC caching, bug #125645 (based on patch by Brian Cameron) Wed Feb 18 01:44:59 2004 Soeren Sandmann GC caching, bug #125645 (based on patch by Brian Cameron) * gdk/gdkscreen.h (struct _GdkScreen): Add GC cache * gdk/gdkscreen.c (gdk_screen_dispose): New function. Unref the cached GC's here. * gdk/gdkdraw.c (_gdk_drawable_get_scratch_gc): New function to get a scratch gc. * gdk/gdkinternals.h: Declare the function here * gdk/gdkdraw.c (gdk_drawable_real_draw_pixbuf): Use _gdk_drawable_get_scratch_gc() instead of creating a new GC. * gdk/x11/gdkgeometry-x11.c (gdk_window_copy_area_scroll): same * gdk/x11/gdkdrawable-x11.c (draw_with_images): same * gdk/gdkwindow.c (gdk_window_get_composite_drawable): same * gdk/gdkwindow.c (gdk_window_end_paint): same * gdk/gdkpixmap.c (gdk_pixmap_colormap_new_from_pixbuf): same * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_threshold_alpha): same * gdk/gdkpixbuf-render.c (gdk_pixbuf_render_pixmap_and_mask_for_colormap): same --- gdk/gdkwindow.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'gdk/gdkwindow.c') diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index e06881e5c..4d278dcc2 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -1020,7 +1020,7 @@ gdk_window_end_paint (GdkWindow *window) gdk_region_get_clipbox (paint->region, &clip_box); - tmp_gc = gdk_gc_new (window); + tmp_gc = _gdk_drawable_get_scratch_gc (window, FALSE); _gdk_windowing_window_get_offsets (window, &x_offset, &y_offset); @@ -1033,7 +1033,6 @@ gdk_window_end_paint (GdkWindow *window) clip_box.x - x_offset, clip_box.y - y_offset, clip_box.width, clip_box.height); - g_object_unref (tmp_gc); g_object_unref (paint->pixmap); gdk_region_destroy (paint->region); g_free (paint); @@ -1398,7 +1397,7 @@ gdk_window_get_composite_drawable (GdkDrawable *drawable, return g_object_ref (drawable); tmp_pixmap = gdk_pixmap_new (drawable, width, height, -1); - tmp_gc = gdk_gc_new (tmp_pixmap); + tmp_gc = _gdk_drawable_get_scratch_gc (tmp_pixmap, FALSE); /* Copy the current window contents */ gdk_draw_drawable (tmp_pixmap, @@ -1427,8 +1426,6 @@ gdk_window_get_composite_drawable (GdkDrawable *drawable, *composite_x_offset = x; *composite_y_offset = y; - g_object_unref (tmp_gc); - return tmp_pixmap; } -- cgit v1.2.1