X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo.h;h=4c32ca7ded1261436bf00b051b511f4c14edac99;hb=ac2fba558fc64d7f1a554e9388d5adfe5ad22f0e;hp=77889d11aa9158b055d79db98bf285f8e847b91f;hpb=6071f2f1e380283d430a712c259ecd403f0ed410;p=pspp

diff --git a/src/output/cairo.h b/src/output/cairo.h
index 77889d11aa..4c32ca7ded 100644
--- 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;
 
@@ -31,14 +33,19 @@ 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_measure (struct xr_rendering *, int *w, int *h);
-void xr_rendering_draw (struct xr_rendering *, 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 (const struct xr_rendering *, 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.
@@ -78,11 +85,17 @@ 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 *);
 
+void parse_color (struct output_driver *d, struct string_map *options,
+		  const char *key, const char *default_value,
+		  struct cell_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 cell_color *fg,
+			 const struct cell_color *bg);
+
 
 #endif  /* HAVE_CAIRO */