gdk: Make _gdk_window_ref_cairo_surface() protected and use it

... instead of _gdk_drawable_ref_cairo_surface() where appropriate.
Also, don't implement the drawable->create_cairo_surface vfunc anymore.

This is in preparation for the split of GdkWindow from GdkDrawable.

diff --git a/gdk/gdkcairo.c b/gdk/gdkcairo.c
index 7fe0ccc770e8890a0d99cbae8b2d45f5d749a578..a82e97f75b530089e3001231cc4b005d19cfacd5 100644 (file)
--- a/gdk/gdkcairo.c
+++ b/gdk/gdkcairo.c
@@ -299,7 +299,7 @@ gdk_cairo_set_source_window (cairo_t   *cr,
   g_return_if_fail (cr != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
 
-  surface = _gdk_drawable_ref_cairo_surface (GDK_DRAWABLE (window));
+  surface = _gdk_window_ref_cairo_surface (window);
   cairo_set_source_surface (cr, surface, x, y);
   cairo_surface_destroy (surface);
 }

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index f25672fd58c190d835d27157d3bd809eaf0e6292..445c255bfb3d08ac8fc851af64fb57c6a5605bea 100644 (file)
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -327,6 +327,9 @@ cairo_surface_t * _gdk_drawable_create_cairo_surface (GdkDrawable *drawable,
  * Interfaces used by windowing code *
  *************************************/
 
+cairo_surface_t *
+           _gdk_window_ref_cairo_surface (GdkWindow *window);
+
 void       _gdk_window_impl_new          (GdkWindow      *window,
                                          GdkWindow      *real_parent,
                                          GdkScreen      *screen,

diff --git a/gdk/gdkoffscreenwindow.c b/gdk/gdkoffscreenwindow.c
index f7c071b16c3950b69ebe34d7a6b457fc19a0f623..9f321eb4f2afeb8be8c1ed964af26b216daa6476 100644 (file)
--- a/gdk/gdkoffscreenwindow.c
+++ b/gdk/gdkoffscreenwindow.c
@@ -160,7 +160,7 @@ _gdk_offscreen_window_create_surface (GdkWindow *offscreen,
 
   g_return_val_if_fail (GDK_IS_OFFSCREEN_WINDOW (private->impl), NULL);
 
-  similar = _gdk_drawable_ref_cairo_surface ((GdkWindow *)private->parent);
+  similar = _gdk_window_ref_cairo_surface ((GdkWindow *)private->parent);
 
   if (gdk_window_get_visual (offscreen) ==
       gdk_screen_get_rgba_visual (gdk_window_get_screen (offscreen)))

diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index 3869099e08136c07d35b88a8ac92f5b6f7b75269..fd14b9e352dbb48165753f111e05c50311e6a0b4 100644 (file)
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -91,7 +91,7 @@ gdk_pixbuf_get_from_window (GdkWindow   *src,
   g_return_val_if_fail (GDK_IS_WINDOW (src), NULL);
   g_return_val_if_fail (gdk_window_is_viewable (src), NULL);
 
-  surface = _gdk_drawable_ref_cairo_surface (src);
+  surface = _gdk_window_ref_cairo_surface (src);
   dest = gdk_pixbuf_get_from_surface (surface,
                                       src_x, src_y,
                                       width, height);

diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 776a03bf10189eaf57de39365bbc377db177cc79..911fbc223c0bffb97012cbd4b141545af05573a8 100644 (file)
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -219,10 +219,6 @@ typedef struct {
 
 /* Global info */
 
-static cairo_surface_t *gdk_window_ref_cairo_surface (GdkDrawable *drawable);
-static cairo_surface_t *gdk_window_create_cairo_surface (GdkDrawable *drawable,
-                                                        int width,
-                                                        int height);
 static void             gdk_window_drop_cairo_surface (GdkWindowObject *private);
 
 static void gdk_window_free_paint_stack (GdkWindow *window);
@@ -370,7 +366,6 @@ static void
 gdk_window_class_init (GdkWindowObjectClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GdkDrawableClass *drawable_class = GDK_DRAWABLE_CLASS (klass);
 
   parent_class = g_type_class_peek_parent (klass);
 
@@ -378,9 +373,6 @@ gdk_window_class_init (GdkWindowObjectClass *klass)
   object_class->set_property = gdk_window_set_property;
   object_class->get_property = gdk_window_get_property;
 
-  drawable_class->ref_cairo_surface = gdk_window_ref_cairo_surface;
-  drawable_class->create_cairo_surface = gdk_window_create_cairo_surface;
-
   klass->create_surface = _gdk_offscreen_window_create_surface;
 
   quark_pointer_window = g_quark_from_static_string ("gtk-pointer-window");
@@ -2748,7 +2740,7 @@ gdk_window_get_content (GdkWindow *window)
 
   g_return_val_if_fail (GDK_IS_WINDOW (window), 0);
 
-  surface = _gdk_drawable_ref_cairo_surface (window);
+  surface = _gdk_window_ref_cairo_surface (window);
   content = cairo_surface_get_content (surface);
   cairo_surface_destroy (surface);
 
@@ -3647,7 +3639,7 @@ gdk_window_clear_backing_region_direct (GdkWindow *window,
   if (GDK_WINDOW_DESTROYED (window))
     return;
 
-  paint.surface = _gdk_drawable_ref_cairo_surface (window);
+  paint.surface = _gdk_window_ref_cairo_surface (window);
 
   cr = setup_backing_rect (window, &paint, 0, 0);
 
@@ -3698,14 +3690,14 @@ gdk_window_cairo_surface_destroy (void *data)
 }
 
 static cairo_surface_t *
-gdk_window_create_cairo_surface (GdkDrawable *drawable,
+gdk_window_create_cairo_surface (GdkWindow *window,
                                 int width,
                                 int height)
 {
-  GdkWindowObject *private = GDK_WINDOW_OBJECT(drawable);
+  GdkWindowObject *private = GDK_WINDOW_OBJECT (window);
   cairo_surface_t *surface, *subsurface;
   
-  surface =_gdk_drawable_ref_cairo_surface (private->impl);
+  surface = _gdk_drawable_ref_cairo_surface (private->impl);
   if (gdk_window_has_impl (private))
     return surface;
 
@@ -3719,12 +3711,16 @@ gdk_window_create_cairo_surface (GdkDrawable *drawable,
 }
 
 
-static cairo_surface_t *
-gdk_window_ref_cairo_surface (GdkDrawable *drawable)
+cairo_surface_t *
+_gdk_window_ref_cairo_surface (GdkWindow *window)
 {
-  GdkWindowObject *private = (GdkWindowObject*) drawable;
+  GdkWindowObject *private;
   cairo_surface_t *surface;
 
+  g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
+
+  private = (GdkWindowObject*) window;
+
   if (private->paint_stack)
     {
       GdkWindowPaint *paint = private->paint_stack->data;
@@ -3736,18 +3732,18 @@ gdk_window_ref_cairo_surface (GdkDrawable *drawable)
     {
 
       /* This will be drawing directly to the window, so flush implicit paint */
-      gdk_window_flush ((GdkWindow *)drawable);
+      gdk_window_flush (window);
 
       if (!private->cairo_surface)
        {
-         private->cairo_surface = _gdk_drawable_create_cairo_surface (drawable,
-                                                                       private->width,
-                                                                       private->height);
+         private->cairo_surface = gdk_window_create_cairo_surface (window,
+                                                                    private->width,
+                                                                    private->height);
 
          if (private->cairo_surface)
            {
              cairo_surface_set_user_data (private->cairo_surface, &gdk_window_cairo_key,
-                                          drawable, gdk_window_cairo_surface_destroy);
+                                          window, gdk_window_cairo_surface_destroy);
            }
        }
       else
@@ -3786,7 +3782,7 @@ gdk_cairo_create (GdkWindow *window)
 
   private = (GdkWindowObject*) window;
 
-  surface = _gdk_drawable_ref_cairo_surface (window);
+  surface = _gdk_window_ref_cairo_surface (window);
   cr = cairo_create (surface);
 
   if (!private->paint_stack)
@@ -10056,7 +10052,7 @@ gdk_window_create_similar_surface (GdkWindow *     window,
 
   g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
   
-  window_surface = _gdk_drawable_ref_cairo_surface (window);
+  window_surface = _gdk_window_ref_cairo_surface (window);
 
   surface = cairo_surface_create_similar (window_surface,
                                           content,