X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo.h;h=3c137681773cbcade850405a85a2dc25509ffb44;hb=refs%2Fbuilds%2F20140215033017%2Fpspp;hp=77889d11aa9158b055d79db98bf285f8e847b91f;hpb=6071f2f1e380283d430a712c259ecd403f0ed410;p=pspp

diff --git a/src/output/cairo.h b/src/output/cairo.h
index 77889d11aa..3c13768177 100644
--- a/src/output/cairo.h
+++ b/src/output/cairo.h
@@ -31,14 +31,17 @@ struct string_map;
 struct xr_driver *xr_driver_create (cairo_t *, struct string_map *options);
 void xr_driver_destroy (struct xr_driver *);
 
+
 /* Functions for rendering a single output item to a Cairo context.
    Output items are never broken across multiple pages.
    Used by PSPPIRE to render in the GUI. */
 struct xr_rendering *xr_rendering_create (struct xr_driver *,
                                           const struct output_item *,
                                           cairo_t *);
+
+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 *);
+void xr_rendering_draw_all (struct xr_rendering *r, cairo_t *cr);
 
 /* Functions for rendering a series of output items to a series of Cairo
    contexts, with pagination, possibly including headers.
@@ -78,11 +81,27 @@ 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);
+
+
 /* Render charts with Cairo. */
-void xr_draw_chart (const struct chart_item *, cairo_t *,
-                    double x, double y, double width, double height);
 char *xr_draw_png_chart (const struct chart_item *,
-                         const char *file_name_template, int number);
+                         const char *file_name_template, int number,
+                         const struct xr_color *fg,
+			 const struct xr_color *bg);
+
 
 #endif  /* HAVE_CAIRO */