output: Move text_item and group_item usage closer to the SPV model.

[pspp] / src / output / cairo.h

diff --git a/src/output/cairo.h b/src/output/cairo.h
index 7ed828f515d61b24d7c5153cde9dc831dd7d44fe..b1d06922eef7903e0c7972e911e6c6c58b2ad286 100644 (file)
--- a/src/output/cairo.h
+++ b/src/output/cairo.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2014 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,7 +23,9 @@
 
 #include <cairo/cairo.h>
 
+struct cell_color;
 struct chart_item;
+struct output_driver;
 struct output_item;
 struct string_map;
 
@@ -38,11 +40,12 @@ void xr_driver_destroy (struct xr_driver *);
 struct xr_rendering *xr_rendering_create (struct xr_driver *,
                                           const struct output_item *,
                                           cairo_t *);
+void xr_rendering_destroy (struct xr_rendering *);
 
 void xr_rendering_apply_options (struct xr_rendering *, struct string_map *o);
 void xr_rendering_measure (struct xr_rendering *, int *w, int *h);
-void xr_rendering_draw (struct xr_rendering *, cairo_t *,
-                        int x, int y, int w, int h);
+void xr_rendering_draw (struct xr_rendering *r, cairo_t *cr,
+                        int x0, int y0, int x1, int y1);
 
 /* Functions for rendering a series of output items to a series of Cairo
    contexts, with pagination, possibly including headers.
@@ -82,26 +85,16 @@ void xr_driver_output_item (struct xr_driver *, const struct output_item *);
 bool xr_driver_need_new_page (const struct xr_driver *);
 bool xr_driver_is_page_blank (const struct xr_driver *);
 
-struct xr_color
-{
-  double red;
-  double green;
-  double blue;
-};
-
-struct output_driver;
-struct string_map;
-
 void parse_color (struct output_driver *d, struct string_map *options,
                  const char *key, const char *default_value,
-                 struct xr_color *color);
+                 struct cell_color *);
 
 
 /* Render charts with Cairo. */
 char *xr_draw_png_chart (const struct chart_item *,
                          const char *file_name_template, int number,
-                         const struct xr_color *fg,
-                        const struct xr_color *bg);
+                         const struct cell_color *fg,
+                        const struct cell_color *bg);
 
 
 #endif  /* HAVE_CAIRO */