[gtk+/rendering-cleanup: 13/142] style: Convert draw_shadow_gap vfunc to a Cairo version

[Benjamin Otte <otte src gnome org>]

commit 9e51ec964d2fdecc4856cc28cfcc10be4c20cf4f
Author: Benjamin Otte <otte redhat com>
Date:   Mon Aug 16 16:09:11 2010 +0200

    style: Convert draw_shadow_gap vfunc to a Cairo version

 gtk/gtkstyle.c                       |   81 ++++++++++++++++++++++++++--------
 gtk/gtkstyle.h                       |   44 ++++++++++++-------
 modules/engines/pixbuf/pixbuf-draw.c |    7 +--
 3 files changed, 94 insertions(+), 38 deletions(-)
---
diff --git a/gtk/gtkstyle.c b/gtk/gtkstyle.c
index eb6cd7d..71c4307 100644
--- a/gtk/gtkstyle.c
+++ b/gtk/gtkstyle.c
@@ -199,10 +199,9 @@ static void gtk_default_draw_tab        (GtkStyle        *style,
 					 gint             width,
 					 gint             height);
 static void gtk_default_draw_shadow_gap (GtkStyle        *style,
-					 GdkWindow       *window,
+					 cairo_t         *cr,
 					 GtkStateType     state_type,
 					 GtkShadowType    shadow_type,
-					 GdkRectangle    *area,
 					 GtkWidget       *widget,
 					 const gchar     *detail,
 					 gint             x,
@@ -3032,10 +3031,9 @@ gtk_default_draw_tab (GtkStyle      *style,
 
 static void 
 gtk_default_draw_shadow_gap (GtkStyle       *style,
-                             GdkWindow      *window,
+                             cairo_t        *cr,
                              GtkStateType    state_type,
                              GtkShadowType   shadow_type,
-                             GdkRectangle   *area,
                              GtkWidget      *widget,
                              const gchar    *detail,
                              gint            x,
@@ -3050,9 +3048,6 @@ gtk_default_draw_shadow_gap (GtkStyle       *style,
   GdkColor *color2 = NULL;
   GdkColor *color3 = NULL;
   GdkColor *color4 = NULL;
-  cairo_t *cr;
-  
-  sanitize_size (window, &width, &height);
   
   switch (shadow_type)
     {
@@ -3085,13 +3080,6 @@ gtk_default_draw_shadow_gap (GtkStyle       *style,
       break;
     }
 
-  cr = gdk_cairo_create (window);
-  if (area)
-    {
-      gdk_cairo_rectangle (cr, area);
-      cairo_clip (cr);
-    }
-  
   switch (shadow_type)
     {
     case GTK_SHADOW_NONE:
@@ -3235,8 +3223,6 @@ gtk_default_draw_shadow_gap (GtkStyle       *style,
           break;
         }
     }
-
-  cairo_destroy (cr);
 }
 
 static void 
@@ -5558,13 +5544,72 @@ gtk_paint_shadow_gap (GtkStyle           *style,
                       gint                gap_x,
                       gint                gap_width)
 {
+  cairo_t *cr;
+
   g_return_if_fail (GTK_IS_STYLE (style));
   g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow_gap != NULL);
   g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
 
-  GTK_STYLE_GET_CLASS (style)->draw_shadow_gap (style, window, state_type, shadow_type,
-                                                (GdkRectangle *) area, widget, detail,
+  sanitize_size (window, &width, &height);
+  
+  cr = gtk_style_cairo_create (window, area);
+
+  gtk_cairo_paint_shadow_gap (style, cr, state_type, shadow_type,
+                              widget, detail,
+                              x, y, width, height, gap_side, gap_x, gap_width);
+
+  cairo_destroy (cr);
+}
+
+
+/**
+ * gtk_cairo_paint_shadow_gap:
+ * @style: a #GtkStyle
+ * @cr: a #cairo_t
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+ * @widget: (allow-none): the widget
+ * @detail: (allow-none): a style detail
+ * @x: x origin of the rectangle
+ * @y: y origin of the rectangle
+ * @width: width of the rectangle
+ * @height: width of the rectangle
+ * @gap_side: side in which to leave the gap
+ * @gap_x: starting position of the gap
+ * @gap_width: width of the gap
+ *
+ * Draws a shadow around the given rectangle in @cr
+ * using the given style and state and shadow type, leaving a 
+ * gap in one side.
+*/
+void
+gtk_cairo_paint_shadow_gap (GtkStyle           *style,
+                            cairo_t            *cr,
+                            GtkStateType        state_type,
+                            GtkShadowType       shadow_type,
+                            GtkWidget          *widget,
+                            const gchar        *detail,
+                            gint                x,
+                            gint                y,
+                            gint                width,
+                            gint                height,
+                            GtkPositionType     gap_side,
+                            gint                gap_x,
+                            gint                gap_width)
+{
+  g_return_if_fail (GTK_IS_STYLE (style));
+  g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow_gap != NULL);
+  g_return_if_fail (cr != NULL);
+  g_return_if_fail (width >= 0);
+  g_return_if_fail (height >= 0);
+
+  cairo_save (cr);
+
+  GTK_STYLE_GET_CLASS (style)->draw_shadow_gap (style, cr, state_type, shadow_type,
+                                                widget, detail,
                                                 x, y, width, height, gap_side, gap_x, gap_width);
+
+  cairo_restore (cr);
 }
 
 
diff --git a/gtk/gtkstyle.h b/gtk/gtkstyle.h
index 0a2b66b..79ff274 100644
--- a/gtk/gtkstyle.h
+++ b/gtk/gtkstyle.h
@@ -264,10 +264,9 @@ struct _GtkStyleClass
 				 gint			 width,
 				 gint			 height);
   void (*draw_shadow_gap)	(GtkStyle		*style,
-				 GdkWindow		*window,
+				 cairo_t                *cr,
 				 GtkStateType		 state_type,
 				 GtkShadowType		 shadow_type,
-				 GdkRectangle		*area,
 				 GtkWidget		*widget,
 				 const gchar		*detail,
 				 gint			 x,
@@ -650,20 +649,33 @@ void gtk_cairo_paint_tab         (GtkStyle           *style,
                                   gint                y,
                                   gint                width,
                                   gint                height);
-void gtk_paint_shadow_gap  (GtkStyle           *style,
-			    GdkWindow          *window,
-			    GtkStateType        state_type,
-			    GtkShadowType       shadow_type,
-			    const GdkRectangle *area,
-			    GtkWidget          *widget,
-			    const gchar        *detail,
-			    gint                x,
-			    gint                y,
-			    gint                width,
-			    gint                height,
-			    GtkPositionType     gap_side,
-			    gint                gap_x,
-			    gint                gap_width);
+void gtk_paint_shadow_gap        (GtkStyle           *style,
+                                  GdkWindow          *window,
+                                  GtkStateType        state_type,
+                                  GtkShadowType       shadow_type,
+                                  const GdkRectangle *area,
+                                  GtkWidget          *widget,
+                                  const gchar        *detail,
+                                  gint                x,
+                                  gint                y,
+                                  gint                width,
+                                  gint                height,
+                                  GtkPositionType     gap_side,
+                                  gint                gap_x,
+                                  gint                gap_width);
+void gtk_cairo_paint_shadow_gap  (GtkStyle           *style,
+                                  cairo_t            *cr,
+                                  GtkStateType        state_type,
+                                  GtkShadowType       shadow_type,
+                                  GtkWidget          *widget,
+                                  const gchar        *detail,
+                                  gint                x,
+                                  gint                y,
+                                  gint                width,
+                                  gint                height,
+                                  GtkPositionType     gap_side,
+                                  gint                gap_x,
+                                  gint                gap_width);
 void gtk_paint_box_gap     (GtkStyle           *style,
 			    GdkWindow          *window,
 			    GtkStateType        state_type,
diff --git a/modules/engines/pixbuf/pixbuf-draw.c b/modules/engines/pixbuf/pixbuf-draw.c
index f91ed8d..a63cc2b 100644
--- a/modules/engines/pixbuf/pixbuf-draw.c
+++ b/modules/engines/pixbuf/pixbuf-draw.c
@@ -769,10 +769,9 @@ draw_tab (GtkStyle     *style,
 
 static void
 draw_shadow_gap (GtkStyle       *style,
-		 GdkWindow      *window,
+		 cairo_t        *cr,
 		 GtkStateType    state,
 		 GtkShadowType   shadow,
-		 GdkRectangle   *area,
 		 GtkWidget      *widget,
 		 const gchar    *detail,
 		 gint            x,
@@ -794,9 +793,9 @@ draw_shadow_gap (GtkStyle       *style,
   match_data.shadow = shadow;
   match_data.state = state;
   
-  if (!draw_gap_image_no_cairo (style, window, area, widget, &match_data, FALSE,
+  if (!draw_gap_image (style, cr, widget, &match_data, FALSE,
 		       x, y, width, height, gap_side, gap_x, gap_width))
-    parent_class->draw_shadow_gap (style, window, state, shadow, area, widget, detail,
+    parent_class->draw_shadow_gap (style, cr, state, shadow, widget, detail,
 				   x, y, width, height, gap_side, gap_x, gap_width);
 }