Remove color_set() virtual function ... it's not absolutely necessary for

Fri Nov 19 17:44:33 2004  Owen Taylor  <otaylor@redhat.com>

        * pango/pango-renderer.[ch]: Remove color_set() virtual
        function ... it's not absolutely necessary for chaining
        renderers, and it's not clear that chaining renderers
        is actually useful, anyways.

        * pango/pango-renderer.[ch] (pango_renderer_set_color): Constify
        color argument.

        * pango/pango-render.c: Fix various bugs.

        * pango/pango-attributes.[ch] (pango_attr_shape_new_with_data):
        Add the ability to create a shape attribute with user data.

        * pango/pango-renderer.[ch] (PangoRendererClass): Add a draw_shape
        virtual function, to draw content for PangoAttrShape.

        * pango/pangoxft-fontmap.c (pango_xft_shutdown_display):
        Add note to docs that XCloseDisplay() will automatically take care
        of releasing Pango's allocated resources for the display.

        * docs/Makefile.am (SCAN_OPTIONS): Add the appropriate
        --deprecated-guards option.

        * docs/tmpl/xft-fonts.sgml: Add long description.

        * docs/tmpl/x-fonts.sgml: Document as dead.

1 files changed, 15 insertions, 10 deletions

diff --git a/pango/pango-renderer.h b/pango/pango-renderer.h
index 5c587f85..eace2967 100644
--- a/pango/pango-renderer.h
+++ b/pango/pango-renderer.h
@@ -91,12 +91,13 @@ struct _PangoRenderer
  * @draw_error_underline: draws a squiggly line that approximately
  * covers the given rectangle in the style of an underline used to
  * indicate a spelling error. 
+ * @draw_shape: draw content for a glyph shaped with #PangoAttrShape.
+ *   @x, @y are the coordinates of the left edge of the baseline,
+ *   in user coordinates.
  * @draw_trapezoid: draws a trapezoidal filled area
  * @draw_glyph: draws a single glyph
  * @part_changed: do renderer specific processing when rendering
  *  attributes change
- * @color_set: updates the renderer when a color has changed.
- *   if @color is %NULL, means that the color has been unset
  * @begin: Do renderer-specific initialization before drawing
  * @end: Do renderer-specific cleanup after drawing
  * @prepare_run: updates the renderer for a new run
@@ -133,6 +134,12 @@ struct _PangoRendererClass
 				int                width,
 				int                height);
 
+  /* Nothing is drawn for shaped glyphs unless this is implemented */
+  void (*draw_shape) (PangoRenderer  *renderer,
+		      PangoAttrShape *attr,
+		      int             x,
+		      int             y);
+
   /* These two must be implemented and take coordinates in
    * device space as doubles.
    */
@@ -154,9 +161,6 @@ struct _PangoRendererClass
    */
   void (*part_changed) (PangoRenderer   *renderer,
 			PangoRenderPart  part);
-  void (*color_set) (PangoRenderer  *renderer,
-		     PangoRenderPart part,
-		     PangoColor     *color);
 
   /* Paired around drawing operations
    */
@@ -222,11 +226,12 @@ void pango_renderer_deactivate           (PangoRenderer    *renderer);
 
 void        pango_renderer_part_changed (PangoRenderer   *renderer,
 					 PangoRenderPart  part);
-void        pango_renderer_set_color    (PangoRenderer   *renderer,
-					 PangoRenderPart  part,
-					 PangoColor      *color);
-PangoColor *pango_renderer_get_color    (PangoRenderer   *renderer,
-					 PangoRenderPart  part);
+
+void        pango_renderer_set_color (PangoRenderer    *renderer,
+				      PangoRenderPart   part,
+				      const PangoColor *color);
+PangoColor *pango_renderer_get_color (PangoRenderer    *renderer,
+				      PangoRenderPart   part);
 
 void                        pango_renderer_set_matrix (PangoRenderer     *renderer,
 						       const PangoMatrix *matrix);