X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo.c;h=776f7f5de80ffa09af3d9f8d6592214d8a1f9127;hb=c8091ec93ae9d9ae1d34cfaf6fbfa0d05ef9586c;hp=a415e5bd8701626a5584038b4e5bcd9ee2345048;hpb=6071f2f1e380283d430a712c259ecd403f0ed410;p=pspp diff --git a/src/output/cairo.c b/src/output/cairo.c index a415e5bd87..558f9e56a5 100644 --- a/src/output/cairo.c +++ b/src/output/cairo.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 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 @@ -20,24 +20,33 @@ #include "libpspp/assertion.h" #include "libpspp/cast.h" +#include "libpspp/hash-functions.h" #include "libpspp/message.h" +#include "libpspp/pool.h" #include "libpspp/start-date.h" #include "libpspp/str.h" #include "libpspp/string-map.h" #include "libpspp/version.h" +#include "data/file-handle-def.h" #include "output/cairo-chart.h" +#include "output/cairo-fsm.h" #include "output/chart-item-provider.h" #include "output/charts/boxplot.h" #include "output/charts/np-plot.h" #include "output/charts/piechart.h" +#include "output/charts/barchart.h" #include "output/charts/plot-hist.h" #include "output/charts/roc-chart.h" +#include "output/charts/spreadlevel-plot.h" #include "output/charts/scree.h" +#include "output/charts/scatterplot.h" #include "output/driver-provider.h" +#include "output/group-item.h" #include "output/message-item.h" #include "output/options.h" +#include "output/page-eject-item.h" +#include "output/page-setup-item.h" #include "output/render.h" -#include "output/tab.h" #include "output/table-item.h" #include "output/table.h" #include "output/text-item.h" @@ -45,14 +54,18 @@ #include #include #include + #include +#include +#include #include #include #include #include #include -#include "gl/error.h" +#include "gl/c-ctype.h" +#include "gl/c-strcase.h" #include "gl/intprops.h" #include "gl/minmax.h" #include "gl/xalloc.h" @@ -64,9 +77,9 @@ #define H TABLE_HORZ #define V TABLE_VERT -/* Measurements as we present to the rest of PSPP. */ +/* The unit used for internal measurements is inch/(72 * XR_POINT). + (Thus, XR_POINT units represent one point.) */ #define XR_POINT PANGO_SCALE -#define XR_INCH (XR_POINT * 72) /* Conversions to and from points. */ static double @@ -75,6 +88,10 @@ xr_to_pt (int x) return x / (double) XR_POINT; } +/* Dimensions for drawing lines in tables. */ +#define XR_LINE_WIDTH (XR_POINT / 2) /* Width of an ordinary line. */ +#define XR_LINE_SPACE XR_POINT /* Space between double lines. */ + /* Output types. */ enum xr_output_type { @@ -83,93 +100,50 @@ enum xr_output_type XR_SVG }; -/* Cairo fonts. */ -enum xr_font_type - { - XR_FONT_PROPORTIONAL, - XR_FONT_EMPHASIS, - XR_FONT_FIXED, - XR_N_FONTS - }; - -/* A font for use with Cairo. */ -struct xr_font - { - char *string; - PangoFontDescription *desc; - PangoLayout *layout; - PangoFontMetrics *metrics; - }; - -/* An output item whose rendering is in progress. */ -struct xr_render_fsm - { - /* Renders as much of itself as it can on the current page. Returns true - if rendering is complete, false if the output item needs another - page. */ - bool (*render) (struct xr_render_fsm *, struct xr_driver *); - - /* Destroys the output item. */ - void (*destroy) (struct xr_render_fsm *); - }; - /* Cairo output driver. */ struct xr_driver { struct output_driver driver; /* User parameters. */ - bool headers; /* Draw headers at top of page? */ - - struct xr_font fonts[XR_N_FONTS]; - int font_height; /* In XR units. */ + PangoFontDescription *fonts[XR_N_FONTS]; int width; /* Page width minus margins. */ int length; /* Page length minus margins and header. */ - int left_margin; /* Left margin in XR units. */ - int right_margin; /* Right margin in XR units. */ - int top_margin; /* Top margin in XR units. */ - int bottom_margin; /* Bottom margin in XR units. */ + int left_margin; /* Left margin in inch/(72 * XR_POINT). */ + int right_margin; /* Right margin in inch/(72 * XR_POINT). */ + int top_margin; /* Top margin in inch/(72 * XR_POINT). */ + int bottom_margin; /* Bottom margin in inch/(72 * XR_POINT). */ - int line_gutter; /* Space around lines. */ - int line_space; /* Space between lines. */ - int line_width; /* Width of lines. */ + int min_break[TABLE_N_AXES]; /* Min cell size to break across pages. */ + int object_spacing; /* Space between output objects. */ - enum xr_output_type file_type; /* Type of output file. */ + struct cell_color bg; /* Background color */ + struct cell_color fg; /* Foreground color */ + bool transparent; /* true -> do not render background */ + bool systemcolors; /* true -> do not change colors */ + + int initial_page_number; + + struct page_heading headings[2]; /* Top and bottom headings. */ + int headings_height[2]; /* Internal state. */ - struct render_params *params; - char *command_name; - char *title; - char *subtitle; + struct xr_fsm_style *style; + double font_scale; + int char_width, char_height; cairo_t *cairo; + cairo_surface_t *surface; int page_number; /* Current page number. */ int y; - struct xr_render_fsm *fsm; + struct xr_fsm *fsm; }; static const struct output_driver_class cairo_driver_class; -static void draw_headers (struct xr_driver *); static void xr_driver_destroy_fsm (struct xr_driver *); static void xr_driver_run_fsm (struct xr_driver *); - -static bool load_font (struct xr_driver *, struct xr_font *); -static void free_font (struct xr_font *); - -static void xr_draw_line (void *, int bb[TABLE_N_AXES][2], - enum render_line_style styles[TABLE_N_AXES][2]); -static void xr_measure_cell_width (void *, const struct table_cell *, - int *min, int *max); -static int xr_measure_cell_height (void *, const struct table_cell *, - int width); -static void xr_draw_cell (void *, const struct table_cell *, - int bb[TABLE_N_AXES][2], - int clip[TABLE_N_AXES][2]); - -static struct xr_render_fsm *xr_render_output_item ( - struct xr_driver *, const struct output_item *); /* Output driver basics. */ @@ -187,181 +161,363 @@ opt (struct output_driver *d, struct string_map *options, const char *key, return driver_option_get (d, options, key, default_value); } +static PangoFontDescription * +parse_font (const char *font, int default_size, bool bold, bool italic) +{ + if (!c_strcasecmp (font, "Monospaced")) + font = "Monospace"; + + PangoFontDescription *desc = pango_font_description_from_string (font); + if (desc == NULL) + return NULL; + + /* If the font description didn't include an explicit font size, then set it + to DEFAULT_SIZE, which is in inch/72000 units. */ + if (!(pango_font_description_get_set_fields (desc) & PANGO_FONT_MASK_SIZE)) + pango_font_description_set_size (desc, + (default_size / 1000.0) * PANGO_SCALE); + + pango_font_description_set_weight (desc, (bold + ? PANGO_WEIGHT_BOLD + : PANGO_WEIGHT_NORMAL)); + pango_font_description_set_style (desc, (italic + ? PANGO_STYLE_ITALIC + : PANGO_STYLE_NORMAL)); + + return desc; +} + +static PangoFontDescription * +parse_font_option (struct output_driver *d, struct string_map *options, + const char *key, const char *default_value, + int default_size, bool bold, bool italic) +{ + char *string = parse_string (opt (d, options, key, default_value)); + PangoFontDescription *desc = parse_font (string, default_size, bold, italic); + if (!desc) + { + msg (MW, _("`%s': bad font specification"), string); + + /* Fall back to DEFAULT_VALUE, which had better be a valid font + description. */ + desc = parse_font (default_value, default_size, bold, italic); + assert (desc != NULL); + } + free (string); + + return desc; +} + +static void +apply_options (struct xr_driver *xr, struct string_map *o) +{ + struct output_driver *d = &xr->driver; + + /* In inch/72000 units used by parse_paper_size() and parse_dimension(). */ + int left_margin, right_margin; + int top_margin, bottom_margin; + int paper_width, paper_length; + int font_size; + int min_break[TABLE_N_AXES]; + + /* Scale factor from inch/72000 to inch/(72 * XR_POINT). */ + const double scale = XR_POINT / 1000.; + + int i; + + for (i = 0; i < XR_N_FONTS; i++) + if (xr->fonts[i] != NULL) + pango_font_description_free (xr->fonts[i]); + + font_size = parse_int (opt (d, o, "font-size", "10000"), 1000, 1000000); + xr->fonts[XR_FONT_FIXED] = parse_font_option + (d, o, "fixed-font", "monospace", font_size, false, false); + xr->fonts[XR_FONT_PROPORTIONAL] = parse_font_option ( + d, o, "prop-font", "sans serif", font_size, false, false); + + xr->fg = parse_color (opt (d, o, "foreground-color", "#000000000000")); + xr->bg = parse_color (opt (d, o, "background-color", "#FFFFFFFFFFFF")); + + xr->transparent = parse_boolean (opt (d, o, "transparent", "false")); + xr->systemcolors = parse_boolean (opt (d, o, "systemcolors", "false")); + + /* Get dimensions. */ + parse_paper_size (opt (d, o, "paper-size", ""), &paper_width, &paper_length); + left_margin = parse_dimension (opt (d, o, "left-margin", ".5in")); + right_margin = parse_dimension (opt (d, o, "right-margin", ".5in")); + top_margin = parse_dimension (opt (d, o, "top-margin", ".5in")); + bottom_margin = parse_dimension (opt (d, o, "bottom-margin", ".5in")); + + min_break[H] = parse_dimension (opt (d, o, "min-hbreak", NULL)) * scale; + min_break[V] = parse_dimension (opt (d, o, "min-vbreak", NULL)) * scale; + + int object_spacing = (parse_dimension (opt (d, o, "object-spacing", NULL)) + * scale); + + /* Convert to inch/(XR_POINT * 72). */ + xr->left_margin = left_margin * scale; + xr->right_margin = right_margin * scale; + xr->top_margin = top_margin * scale; + xr->bottom_margin = bottom_margin * scale; + xr->width = (paper_width - left_margin - right_margin) * scale; + xr->length = (paper_length - top_margin - bottom_margin) * scale; + xr->min_break[H] = min_break[H] >= 0 ? min_break[H] : xr->width / 2; + xr->min_break[V] = min_break[V] >= 0 ? min_break[V] : xr->length / 2; + xr->object_spacing = object_spacing >= 0 ? object_spacing : XR_POINT * 12; + + /* There are no headings so headings_height can stay 0. */ +} + static struct xr_driver * -xr_allocate (const char *name, int device_type, struct string_map *o) +xr_allocate (const char *name, int device_type, struct string_map *o, + double font_scale) { - struct output_driver *d; - struct xr_driver *xr; + struct xr_driver *xr = xzalloc (sizeof *xr); + struct output_driver *d = &xr->driver; - xr = xzalloc (sizeof *xr); - d = &xr->driver; output_driver_init (d, &cairo_driver_class, name, device_type); - xr->headers = true; - xr->font_height = XR_POINT * 10; - xr->fonts[XR_FONT_FIXED].string - = parse_string (opt (d, o, "fixed-font", "monospace")); - xr->fonts[XR_FONT_PROPORTIONAL].string - = parse_string (opt (d, o, "prop-font", "serif")); - xr->fonts[XR_FONT_EMPHASIS].string - = parse_string (opt (d, o, "emph-font", "serif italic")); - xr->line_gutter = XR_POINT; - xr->line_space = XR_POINT; - xr->line_width = XR_POINT / 2; - xr->page_number = 1; + + /* This is a nasty kluge for an issue that does not make sense. On any + surface other than a screen (e.g. for output to PDF or PS or SVG), the + fonts are way too big by default. A "9-point" font seems to appear about + 16 points tall. We use a scale factor for these surfaces to help, but the + underlying issue is a mystery. */ + xr->font_scale = font_scale; + + apply_options (xr, o); return xr; } -static bool -xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) +static int +pango_to_xr (int pango) { - int i; + return (XR_POINT != PANGO_SCALE + ? ceil (pango * (1. * XR_POINT / PANGO_SCALE)) + : pango); +} - xr->cairo = cairo; +static int +xr_to_pango (int xr) +{ + return (XR_POINT != PANGO_SCALE + ? ceil (xr * (1. / XR_POINT * PANGO_SCALE)) + : xr); +} - cairo_set_line_width (xr->cairo, xr_to_pt (xr->line_width)); +static void +xr_measure_fonts (cairo_t *cairo, PangoFontDescription *fonts[XR_N_FONTS], + int *char_width, int *char_height) +{ + *char_width = 0; + *char_height = 0; + for (int i = 0; i < XR_N_FONTS; i++) + { + PangoLayout *layout = pango_cairo_create_layout (cairo); + pango_layout_set_font_description (layout, fonts[i]); - for (i = 0; i < XR_N_FONTS; i++) - if (!load_font (xr, &xr->fonts[i])) - return false; + pango_layout_set_text (layout, "0", 1); + + int cw, ch; + pango_layout_get_size (layout, &cw, &ch); + *char_width = MAX (*char_width, pango_to_xr (cw)); + *char_height = MAX (*char_height, pango_to_xr (ch)); + + g_object_unref (G_OBJECT (layout)); + } +} - if (xr->params == NULL) +static int +get_layout_height (PangoLayout *layout) +{ + int w, h; + pango_layout_get_size (layout, &w, &h); + return h; +} + +static int +xr_render_page_heading (cairo_t *cairo, const PangoFontDescription *font, + const struct page_heading *ph, int page_number, + int width, bool draw, int base_y) +{ + PangoLayout *layout = pango_cairo_create_layout (cairo); + pango_layout_set_font_description (layout, font); + + int y = 0; + for (size_t i = 0; i < ph->n; i++) { - int single_width, double_width; - - xr->params = xmalloc (sizeof *xr->params); - xr->params->draw_line = xr_draw_line; - xr->params->measure_cell_width = xr_measure_cell_width; - xr->params->measure_cell_height = xr_measure_cell_height; - xr->params->draw_cell = xr_draw_cell; - xr->params->aux = xr; - xr->params->size[H] = xr->width; - xr->params->size[V] = xr->length; - xr->params->font_size[H] = xr->font_height / 2; /* XXX */ - xr->params->font_size[V] = xr->font_height; - - single_width = 2 * xr->line_gutter + xr->line_width; - double_width = 2 * xr->line_gutter + xr->line_space + 2 * xr->line_width; - for (i = 0; i < TABLE_N_AXES; i++) + const struct page_paragraph *pp = &ph->paragraphs[i]; + + char *markup = output_driver_substitute_heading_vars (pp->markup, + page_number); + pango_layout_set_markup (layout, markup, -1); + free (markup); + + pango_layout_set_alignment ( + layout, + (pp->halign == TABLE_HALIGN_LEFT ? PANGO_ALIGN_LEFT + : pp->halign == TABLE_HALIGN_CENTER ? PANGO_ALIGN_CENTER + : pp->halign == TABLE_HALIGN_MIXED ? PANGO_ALIGN_LEFT + : PANGO_ALIGN_RIGHT)); + pango_layout_set_width (layout, xr_to_pango (width)); + if (draw) { - xr->params->line_widths[i][RENDER_LINE_NONE] = 0; - xr->params->line_widths[i][RENDER_LINE_SINGLE] = single_width; - xr->params->line_widths[i][RENDER_LINE_DOUBLE] = double_width; + cairo_save (cairo); + cairo_translate (cairo, 0, xr_to_pt (y + base_y)); + pango_cairo_show_layout (cairo, layout); + cairo_restore (cairo); } + + y += pango_to_xr (get_layout_height (layout)); } - return true; -} + g_object_unref (G_OBJECT (layout)); -static struct output_driver * -xr_create (const char *file_name, enum settings_output_devices device_type, - struct string_map *o, enum xr_output_type file_type) -{ - enum { MIN_WIDTH = 3, MIN_LENGTH = 3 }; - struct output_driver *d; - struct xr_driver *xr; - cairo_surface_t *surface; - cairo_status_t status; - double width_pt, length_pt; - int paper_width, paper_length; + return y; +} - xr = xr_allocate (file_name, device_type, o); - d = &xr->driver; +static int +xr_measure_headings (cairo_surface_t *surface, + const PangoFontDescription *font, + const struct page_heading headings[2], + int width, int object_spacing, int height[2]) +{ + cairo_t *cairo = cairo_create (surface); + int total = 0; + for (int i = 0; i < 2; i++) + { + int h = xr_render_page_heading (cairo, font, &headings[i], -1, + width, false, 0); - xr->headers = parse_boolean (opt (d, o, "headers", "true")); + /* If the top heading is nonempty, add some space below it. */ + if (h && i == 0) + h += object_spacing; - xr->file_type = file_type; + if (height) + height[i] = h; + total += h; + } + cairo_destroy (cairo); + return total; +} - parse_paper_size (opt (d, o, "paper-size", ""), &paper_width, &paper_length); - xr->left_margin = parse_dimension (opt (d, o, "left-margin", ".5in")); - xr->right_margin = parse_dimension (opt (d, o, "right-margin", ".5in")); - xr->top_margin = parse_dimension (opt (d, o, "top-margin", ".5in")); - xr->bottom_margin = parse_dimension (opt (d, o, "bottom-margin", ".5in")); - - if (xr->headers) - xr->top_margin += 3 * xr->font_height; - xr->width = paper_width - xr->left_margin - xr->right_margin; - xr->length = paper_length - xr->top_margin - xr->bottom_margin; - - width_pt = paper_width / 1000.0; - length_pt = paper_length / 1000.0; - if (xr->file_type == XR_PDF) - surface = cairo_pdf_surface_create (file_name, width_pt, length_pt); - else if (xr->file_type == XR_PS) - surface = cairo_ps_surface_create (file_name, width_pt, length_pt); - else if (xr->file_type == XR_SVG) - surface = cairo_svg_surface_create (file_name, width_pt, length_pt); - else - NOT_REACHED (); +static bool +xr_check_fonts (cairo_surface_t *surface, + PangoFontDescription *fonts[XR_N_FONTS], + int usable_width, int usable_length) +{ + cairo_t *cairo = cairo_create (surface); + int char_width, char_height; + xr_measure_fonts (cairo, fonts, &char_width, &char_height); + cairo_destroy (cairo); - status = cairo_surface_status (surface); - if (status != CAIRO_STATUS_SUCCESS) + bool ok = true; + enum { MIN_WIDTH = 3, MIN_LENGTH = 3 }; + if (usable_width / char_width < MIN_WIDTH) { - error (0, 0, _("error opening output file \"%s\": %s"), - file_name, cairo_status_to_string (status)); - cairo_surface_destroy (surface); - goto error; + msg (ME, _("The defined page is not wide enough to hold at least %d " + "characters in the default font. In fact, there's only " + "room for %d characters."), + MIN_WIDTH, usable_width / char_width); + ok = false; + } + if (usable_length / char_height < MIN_LENGTH) + { + msg (ME, _("The defined page is not long enough to hold at least %d " + "lines in the default font. In fact, there's only " + "room for %d lines."), + MIN_LENGTH, usable_length / char_height); + ok = false; } + return ok; +} - xr->cairo = cairo_create (surface); - cairo_surface_destroy (surface); +static void +xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) +{ + xr->cairo = cairo; - cairo_translate (xr->cairo, - xr_to_pt (xr->left_margin), - xr_to_pt (xr->top_margin)); + cairo_set_line_width (xr->cairo, xr_to_pt (XR_LINE_WIDTH)); - if (!xr_set_cairo (xr, xr->cairo)) - goto error; + xr_measure_fonts (xr->cairo, xr->fonts, &xr->char_width, &xr->char_height); - if (xr->width / (xr->font_height / 2) < MIN_WIDTH) + if (xr->style == NULL) { - error (0, 0, _("The defined page is not wide enough to hold at least %d " - "characters in the default font. In fact, there's only " - "room for %d characters."), - MIN_WIDTH, - xr->width / (xr->font_height / 2)); - goto error; + xr->style = xmalloc (sizeof *xr->style); + *xr->style = (struct xr_fsm_style) { + .ref_cnt = 1, + .size = { [H] = xr->width, [V] = xr->length }, + .min_break = { [H] = xr->min_break[H], [V] = xr->min_break[V] }, + .use_system_colors = xr->systemcolors, + .transparent = xr->transparent, + .font_scale = xr->font_scale, + }; + + for (size_t i = 0; i < XR_N_FONTS; i++) + xr->style->fonts[i] = pango_font_description_copy (xr->fonts[i]); } - if (xr->length / xr->font_height < MIN_LENGTH) + if (!xr->systemcolors) + cairo_set_source_rgb (xr->cairo, + xr->fg.r / 255.0, xr->fg.g / 255.0, xr->fg.b / 255.0); +} + +static struct output_driver * +xr_create (struct file_handle *fh, enum settings_output_devices device_type, + struct string_map *o, enum xr_output_type file_type) +{ + const char *file_name = fh_get_file_name (fh); + struct xr_driver *xr = xr_allocate (file_name, device_type, o, 72.0 / 128.0); + double width_pt = xr_to_pt (xr->width + xr->left_margin + xr->right_margin); + double length_pt = xr_to_pt (xr->length + xr->top_margin + xr->bottom_margin); + if (file_type == XR_PDF) + xr->surface = cairo_pdf_surface_create (file_name, width_pt, length_pt); + else if (file_type == XR_PS) + xr->surface = cairo_ps_surface_create (file_name, width_pt, length_pt); + else if (file_type == XR_SVG) + xr->surface = cairo_svg_surface_create (file_name, width_pt, length_pt); + else + NOT_REACHED (); + + cairo_status_t status = cairo_surface_status (xr->surface); + if (status != CAIRO_STATUS_SUCCESS) { - error (0, 0, _("The defined page is not long " - "enough to hold margins and headers, plus least %d " - "lines of the default fonts. In fact, there's only " - "room for %d lines."), - MIN_LENGTH, - xr->length / xr->font_height); + msg (ME, _("error opening output file `%s': %s"), + file_name, cairo_status_to_string (status)); goto error; } - draw_headers (xr); + if (!xr_check_fonts (xr->surface, xr->fonts, xr->width, xr->length)) + goto error; + fh_unref (fh); return &xr->driver; error: + fh_unref (fh); output_driver_destroy (&xr->driver); return NULL; } static struct output_driver * -xr_pdf_create (const char *file_name, enum settings_output_devices device_type, +xr_pdf_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o) { - return xr_create (file_name, device_type, o, XR_PDF); + return xr_create (fh, device_type, o, XR_PDF); } static struct output_driver * -xr_ps_create (const char *file_name, enum settings_output_devices device_type, +xr_ps_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o) { - return xr_create (file_name, device_type, o, XR_PS); + return xr_create (fh, device_type, o, XR_PS); } static struct output_driver * -xr_svg_create (const char *file_name, enum settings_output_devices device_type, +xr_svg_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o) { - return xr_create (file_name, device_type, o, XR_SVG); + return xr_create (fh, device_type, o, XR_SVG); } static void @@ -374,21 +530,22 @@ xr_destroy (struct output_driver *driver) if (xr->cairo != NULL) { - cairo_status_t status; - - cairo_surface_finish (cairo_get_target (xr->cairo)); - status = cairo_status (xr->cairo); + cairo_surface_finish (xr->surface); + cairo_status_t status = cairo_status (xr->cairo); if (status != CAIRO_STATUS_SUCCESS) - error (0, 0, _("error drawing output for %s driver: %s"), - output_driver_get_name (driver), - cairo_status_to_string (status)); + fprintf (stderr, _("error drawing output for %s driver: %s"), + output_driver_get_name (driver), + cairo_status_to_string (status)); + cairo_surface_destroy (xr->surface); + cairo_destroy (xr->cairo); } - free (xr->command_name); for (i = 0; i < XR_N_FONTS; i++) - free_font (&xr->fonts[i]); - free (xr->params); + if (xr->fonts[i] != NULL) + pango_font_description_free (xr->fonts[i]); + + xr_fsm_style_unref (xr->style); free (xr); } @@ -401,30 +558,46 @@ xr_flush (struct output_driver *driver) } static void -xr_init_caption_cell (const char *caption, struct table_cell *cell) +xr_update_page_setup (struct output_driver *driver, + const struct page_setup *ps) { - cell->contents = caption; - cell->options = TAB_LEFT; - cell->destructor = NULL; -} + struct xr_driver *xr = xr_driver_cast (driver); -static struct render_page * -xr_render_table_item (struct xr_driver *xr, const struct table_item *item, - int *caption_heightp) -{ - const char *caption = table_item_get_caption (item); + xr->initial_page_number = ps->initial_page_number; + xr->object_spacing = ps->object_spacing * 72 * XR_POINT; + + if (xr->cairo) + return; - if (caption != NULL) + int usable[TABLE_N_AXES]; + for (int i = 0; i < 2; i++) + usable[i] = (ps->paper[i] + - (ps->margins[i][0] + ps->margins[i][1])) * 72 * XR_POINT; + + int headings_height[2]; + usable[V] -= xr_measure_headings ( + xr->surface, xr->fonts[XR_FONT_PROPORTIONAL], ps->headings, + usable[H], xr->object_spacing, headings_height); + + enum table_axis h = ps->orientation == PAGE_LANDSCAPE; + enum table_axis v = !h; + if (!xr_check_fonts (xr->surface, xr->fonts, usable[h], usable[v])) + return; + + for (int i = 0; i < 2; i++) { - /* XXX doesn't do well with very large captions */ - struct table_cell cell; - xr_init_caption_cell (caption, &cell); - *caption_heightp = xr_measure_cell_height (xr, &cell, xr->width); + page_heading_uninit (&xr->headings[i]); + page_heading_copy (&xr->headings[i], &ps->headings[i]); + xr->headings_height[i] = headings_height[i]; } - else - *caption_heightp = 0; - - return render_page_create (xr->params, table_item_get_table (item)); + xr->width = usable[h]; + xr->length = usable[v]; + xr->left_margin = ps->margins[h][0] * 72 * XR_POINT; + xr->right_margin = ps->margins[h][1] * 72 * XR_POINT; + xr->top_margin = ps->margins[v][0] * 72 * XR_POINT; + xr->bottom_margin = ps->margins[v][1] * 72 * XR_POINT; + cairo_pdf_surface_set_size (xr->surface, + ps->paper[h] * 72.0, ps->paper[v] * 72.0); } static void @@ -432,32 +605,67 @@ xr_submit (struct output_driver *driver, const struct output_item *output_item) { struct xr_driver *xr = xr_driver_cast (driver); + if (is_page_setup_item (output_item)) + { + xr_update_page_setup (driver, + to_page_setup_item (output_item)->page_setup); + return; + } + + if (!xr->cairo) + { + xr->page_number = xr->initial_page_number - 1; + xr_set_cairo (xr, cairo_create (xr->surface)); + cairo_save (xr->cairo); + xr_driver_next_page (xr, xr->cairo); + } + xr_driver_output_item (xr, output_item); while (xr_driver_need_new_page (xr)) { + cairo_restore (xr->cairo); cairo_show_page (xr->cairo); + cairo_save (xr->cairo); xr_driver_next_page (xr, xr->cairo); } } /* Functions for rendering a series of output items to a series of Cairo - contexts, with pagination, possibly including headers. + contexts, with pagination. Used by PSPPIRE for printing, and by the basic Cairo output driver above as its underlying implementation. See the big comment in cairo.h for intended usage. */ -/* Gives new page CAIRO to XR for output. CAIRO may be null to skip actually - rendering the page (which might be useful to find out how many pages an - output document has without actually rendering it). */ +/* Gives new page CAIRO to XR for output. */ void xr_driver_next_page (struct xr_driver *xr, cairo_t *cairo) { + if (!xr->transparent) + { + cairo_save (cairo); + cairo_set_source_rgb (cairo, + xr->bg.r / 255.0, xr->bg.g / 255.0, xr->bg.b / 255.0); + cairo_rectangle (cairo, 0, 0, xr->width, xr->length); + cairo_fill (cairo); + cairo_restore (cairo); + } + cairo_translate (cairo, + xr_to_pt (xr->left_margin), + xr_to_pt (xr->top_margin + xr->headings_height[0])); + xr->page_number++; xr->cairo = cairo; xr->y = 0; - draw_headers (xr); + + xr_render_page_heading (xr->cairo, xr->fonts[XR_FONT_PROPORTIONAL], + &xr->headings[0], xr->page_number, xr->width, true, + -xr->headings_height[0]); + xr_render_page_heading (xr->cairo, xr->fonts[XR_FONT_PROPORTIONAL], + &xr->headings[1], xr->page_number, xr->width, true, + xr->length); + xr_driver_run_fsm (xr); } @@ -469,7 +677,7 @@ xr_driver_output_item (struct xr_driver *xr, const struct output_item *output_item) { assert (xr->fsm == NULL); - xr->fsm = xr_render_output_item (xr, output_item); + xr->fsm = xr_fsm_create (output_item, xr->style, xr->cairo); xr_driver_run_fsm (xr); } @@ -482,8 +690,7 @@ xr_driver_need_new_page (const struct xr_driver *xr) return xr->fsm != NULL; } -/* Returns true if the current page doesn't have any content yet (besides - headers, if enabled). */ +/* Returns true if the current page doesn't have any content yet. */ bool xr_driver_is_page_blank (const struct xr_driver *xr) { @@ -493,403 +700,32 @@ xr_driver_is_page_blank (const struct xr_driver *xr) static void xr_driver_destroy_fsm (struct xr_driver *xr) { - if (xr->fsm != NULL) - { - xr->fsm->destroy (xr->fsm); - xr->fsm = NULL; - } + xr_fsm_destroy (xr->fsm); + xr->fsm = NULL; } static void xr_driver_run_fsm (struct xr_driver *xr) { - if (xr->fsm != NULL && !xr->fsm->render (xr->fsm, xr)) - xr_driver_destroy_fsm (xr); -} - -static void -xr_layout_cell (struct xr_driver *, const struct table_cell *, - int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], - PangoWrapMode, int *width, int *height); - -static void -dump_line (struct xr_driver *xr, int x0, int y0, int x1, int y1) -{ - cairo_new_path (xr->cairo); - cairo_move_to (xr->cairo, xr_to_pt (x0), xr_to_pt (y0 + xr->y)); - cairo_line_to (xr->cairo, xr_to_pt (x1), xr_to_pt (y1 + xr->y)); - cairo_stroke (xr->cairo); -} - -/* Draws a horizontal line X0...X2 at Y if LEFT says so, - shortening it to X0...X1 if SHORTEN is true. - Draws a horizontal line X1...X3 at Y if RIGHT says so, - shortening it to X2...X3 if SHORTEN is true. */ -static void -horz_line (struct xr_driver *xr, int x0, int x1, int x2, int x3, int y, - enum render_line_style left, enum render_line_style right, - bool shorten) -{ - if (left != RENDER_LINE_NONE && right != RENDER_LINE_NONE && !shorten) - dump_line (xr, x0, y, x3, y); - else - { - if (left != RENDER_LINE_NONE) - dump_line (xr, x0, y, shorten ? x1 : x2, y); - if (right != RENDER_LINE_NONE) - dump_line (xr, shorten ? x2 : x1, y, x3, y); - } -} - -/* Draws a vertical line Y0...Y2 at X if TOP says so, - shortening it to Y0...Y1 if SHORTEN is true. - Draws a vertical line Y1...Y3 at X if BOTTOM says so, - shortening it to Y2...Y3 if SHORTEN is true. */ -static void -vert_line (struct xr_driver *xr, int y0, int y1, int y2, int y3, int x, - enum render_line_style top, enum render_line_style bottom, - bool shorten) -{ - if (top != RENDER_LINE_NONE && bottom != RENDER_LINE_NONE && !shorten) - dump_line (xr, x, y0, x, y3); - else - { - if (top != RENDER_LINE_NONE) - dump_line (xr, x, y0, x, shorten ? y1 : y2); - if (bottom != RENDER_LINE_NONE) - dump_line (xr, x, shorten ? y2 : y1, x, y3); - } -} - -static void -xr_draw_line (void *xr_, int bb[TABLE_N_AXES][2], - enum render_line_style styles[TABLE_N_AXES][2]) -{ - const int x0 = bb[H][0]; - const int y0 = bb[V][0]; - const int x3 = bb[H][1]; - const int y3 = bb[V][1]; - const int top = styles[H][0]; - const int left = styles[V][0]; - const int bottom = styles[H][1]; - const int right = styles[V][1]; - - /* The algorithm here is somewhat subtle, to allow it to handle - all the kinds of intersections that we need. - - Three additional ordinates are assigned along the x axis. The - first is xc, midway between x0 and x3. The others are x1 and - x2; for a single vertical line these are equal to xc, and for - a double vertical line they are the ordinates of the left and - right half of the double line. - - yc, y1, and y2 are assigned similarly along the y axis. - - The following diagram shows the coordinate system and output - for double top and bottom lines, single left line, and no - right line: - - x0 x1 xc x2 x3 - y0 ________________________ - | # # | - | # # | - | # # | - | # # | - | # # | - y1 = y2 = yc |######### # | - | # # | - | # # | - | # # | - | # # | - y3 |________#_____#_______| - */ - struct xr_driver *xr = xr_; - - /* Offset from center of each line in a pair of double lines. */ - int double_line_ofs = (xr->line_space + xr->line_width) / 2; - - /* Are the lines along each axis single or double? - (It doesn't make sense to have different kinds of line on the - same axis, so we don't try to gracefully handle that case.) */ - bool double_vert = top == RENDER_LINE_DOUBLE || bottom == RENDER_LINE_DOUBLE; - bool double_horz = left == RENDER_LINE_DOUBLE || right == RENDER_LINE_DOUBLE; - - /* When horizontal lines are doubled, - the left-side line along y1 normally runs from x0 to x2, - and the right-side line along y1 from x3 to x1. - If the top-side line is also doubled, we shorten the y1 lines, - so that the left-side line runs only to x1, - and the right-side line only to x2. - Otherwise, the horizontal line at y = y1 below would cut off - the intersection, which looks ugly: - x0 x1 x2 x3 - y0 ________________________ - | # # | - | # # | - | # # | - | # # | - y1 |######### ########| - | | - | | - y2 |######################| - | | - | | - y3 |______________________| - It is more of a judgment call when the horizontal line is - single. We actually choose to cut off the line anyhow, as - shown in the first diagram above. - */ - bool shorten_y1_lines = top == RENDER_LINE_DOUBLE; - bool shorten_y2_lines = bottom == RENDER_LINE_DOUBLE; - bool shorten_yc_line = shorten_y1_lines && shorten_y2_lines; - int horz_line_ofs = double_vert ? double_line_ofs : 0; - int xc = (x0 + x3) / 2; - int x1 = xc - horz_line_ofs; - int x2 = xc + horz_line_ofs; - - bool shorten_x1_lines = left == RENDER_LINE_DOUBLE; - bool shorten_x2_lines = right == RENDER_LINE_DOUBLE; - bool shorten_xc_line = shorten_x1_lines && shorten_x2_lines; - int vert_line_ofs = double_horz ? double_line_ofs : 0; - int yc = (y0 + y3) / 2; - int y1 = yc - vert_line_ofs; - int y2 = yc + vert_line_ofs; - - if (!double_horz) - horz_line (xr, x0, x1, x2, x3, yc, left, right, shorten_yc_line); - else - { - horz_line (xr, x0, x1, x2, x3, y1, left, right, shorten_y1_lines); - horz_line (xr, x0, x1, x2, x3, y2, left, right, shorten_y2_lines); - } - - if (!double_vert) - vert_line (xr, y0, y1, y2, y3, xc, top, bottom, shorten_xc_line); - else - { - vert_line (xr, y0, y1, y2, y3, x1, top, bottom, shorten_x1_lines); - vert_line (xr, y0, y1, y2, y3, x2, top, bottom, shorten_x2_lines); - } -} - -static void -xr_measure_cell_width (void *xr_, const struct table_cell *cell, - int *min_width, int *max_width) -{ - struct xr_driver *xr = xr_; - int bb[TABLE_N_AXES][2]; - int clip[TABLE_N_AXES][2]; - int h; - - bb[H][0] = 0; - bb[H][1] = INT_MAX; - bb[V][0] = 0; - bb[V][1] = INT_MAX; - clip[H][0] = clip[H][1] = clip[V][0] = clip[V][1] = 0; - xr_layout_cell (xr, cell, bb, clip, PANGO_WRAP_WORD, max_width, &h); - - bb[H][1] = 1; - xr_layout_cell (xr, cell, bb, clip, PANGO_WRAP_WORD, min_width, &h); -} - -static int -xr_measure_cell_height (void *xr_, const struct table_cell *cell, int width) -{ - struct xr_driver *xr = xr_; - int bb[TABLE_N_AXES][2]; - int clip[TABLE_N_AXES][2]; - int w, h; - - bb[H][0] = 0; - bb[H][1] = width; - bb[V][0] = 0; - bb[V][1] = INT_MAX; - clip[H][0] = clip[H][1] = clip[V][0] = clip[V][1] = 0; - xr_layout_cell (xr, cell, bb, clip, PANGO_WRAP_WORD, &w, &h); - return h; -} - -static void -xr_draw_cell (void *xr_, const struct table_cell *cell, - int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2]) -{ - struct xr_driver *xr = xr_; - int w, h; - - xr_layout_cell (xr, cell, bb, clip, PANGO_WRAP_WORD, &w, &h); -} - -/* Writes STRING at location (X,Y) trimmed to the given MAX_WIDTH - and with the given cell OPTIONS for XR. */ -static int -draw_text (struct xr_driver *xr, const char *string, int x, int y, - int max_width, unsigned int options) -{ - struct table_cell cell; - int bb[TABLE_N_AXES][2]; - int w, h; - - cell.contents = string; - cell.options = options; - bb[H][0] = x; - bb[V][0] = y - xr->y; - bb[H][1] = x + max_width; - bb[V][1] = xr->font_height - xr->y; - xr_layout_cell (xr, &cell, bb, bb, PANGO_WRAP_WORD_CHAR, &w, &h); - return w; -} - -/* Writes LEFT left-justified and RIGHT right-justified within - (X0...X1) at Y. LEFT or RIGHT or both may be null. */ -static void -draw_header_line (struct xr_driver *xr, const char *left, const char *right, - int x0, int x1, int y) -{ - int right_width = 0; - if (right != NULL) - right_width = (draw_text (xr, right, x0, y, x1 - x0, TAB_RIGHT) - + xr->font_height / 2); - if (left != NULL) - draw_text (xr, left, x0, y, x1 - x0 - right_width, TAB_LEFT); -} - -/* Draw top of page headers for XR. */ -static void -draw_headers (struct xr_driver *xr) -{ - char *r1, *r2; - int x0, x1; - int y; - - if (!xr->headers || xr->cairo == NULL) - return; - - y = -3 * xr->font_height; - x0 = xr->font_height / 2; - x1 = xr->width - xr->font_height / 2; - - /* Draw box. */ - cairo_rectangle (xr->cairo, 0, xr_to_pt (y), xr_to_pt (xr->width), - xr_to_pt (2 * (xr->font_height - + xr->line_width + xr->line_gutter))); - cairo_save (xr->cairo); - cairo_set_source_rgb (xr->cairo, 0.9, 0.9, 0.9); - cairo_fill_preserve (xr->cairo); - cairo_restore (xr->cairo); - cairo_stroke (xr->cairo); - - y += xr->line_width + xr->line_gutter; - - r1 = xasprintf (_("%s - Page %d"), get_start_date (), xr->page_number); - r2 = xasprintf ("%s - %s", version, host_system); - - draw_header_line (xr, xr->title, r1, x0, x1, y); - y += xr->font_height; - - draw_header_line (xr, xr->subtitle, r2, x0, x1, y); - - free (r1); - free (r2); -} - -static void -xr_layout_cell (struct xr_driver *xr, const struct table_cell *cell, - int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], - PangoWrapMode wrap, int *width, int *height) -{ - struct xr_font *font; - - font = (cell->options & TAB_FIX ? &xr->fonts[XR_FONT_FIXED] - : cell->options & TAB_EMPH ? &xr->fonts[XR_FONT_EMPHASIS] - : &xr->fonts[XR_FONT_PROPORTIONAL]); - - pango_layout_set_text (font->layout, cell->contents, -1); - - pango_layout_set_alignment ( - font->layout, - ((cell->options & TAB_ALIGNMENT) == TAB_RIGHT ? PANGO_ALIGN_RIGHT - : (cell->options & TAB_ALIGNMENT) == TAB_LEFT ? PANGO_ALIGN_LEFT - : PANGO_ALIGN_CENTER)); - pango_layout_set_width (font->layout, - bb[H][1] == INT_MAX ? -1 : bb[H][1] - bb[H][0]); - pango_layout_set_wrap (font->layout, wrap); - - if (clip[H][0] != clip[H][1]) + if (xr->fsm != NULL) { cairo_save (xr->cairo); - - if (clip[H][1] != INT_MAX || clip[V][1] != INT_MAX) - { - double x0 = xr_to_pt (clip[H][0]); - double y0 = xr_to_pt (clip[V][0] + xr->y); - double x1 = xr_to_pt (clip[H][1]); - double y1 = xr_to_pt (clip[V][1] + xr->y); - - cairo_rectangle (xr->cairo, x0, y0, x1 - x0, y1 - y0); - cairo_clip (xr->cairo); - } - - cairo_translate (xr->cairo, - xr_to_pt (bb[H][0]), - xr_to_pt (bb[V][0] + xr->y)); - pango_cairo_show_layout (xr->cairo, font->layout); + cairo_translate (xr->cairo, 0, xr_to_pt (xr->y)); + int used = xr_fsm_draw_slice (xr->fsm, xr->cairo, xr->length - xr->y); + xr->y += used; cairo_restore (xr->cairo); - } - if (width != NULL || height != NULL) - { - int w, h; - - pango_layout_get_size (font->layout, &w, &h); - if (width != NULL) - *width = w; - if (height != NULL) - *height = h; + if (xr_fsm_is_empty (xr->fsm)) + xr_driver_destroy_fsm (xr); } } -/* Attempts to load FONT, initializing its other members based on - its 'string' member and the information in DRIVER. Returns true - if successful, otherwise false. */ -static bool -load_font (struct xr_driver *xr, struct xr_font *font) -{ - PangoContext *context; - PangoLanguage *language; - - font->desc = pango_font_description_from_string (font->string); - if (font->desc == NULL) - { - error (0, 0, _("\"%s\": bad font specification"), font->string); - return false; - } - pango_font_description_set_absolute_size (font->desc, xr->font_height); - - font->layout = pango_cairo_create_layout (xr->cairo); - pango_layout_set_font_description (font->layout, font->desc); - - language = pango_language_get_default (); - context = pango_layout_get_context (font->layout); - font->metrics = pango_context_get_metrics (context, font->desc, language); - - return true; -} - -/* Frees FONT. */ -static void -free_font (struct xr_font *font) -{ - free (font->string); - if (font->desc != NULL) - pango_font_description_free (font->desc); - pango_font_metrics_unref (font->metrics); - if (font->layout != NULL) - g_object_unref (font->layout); -} - -struct output_driver_factory pdf_driver_factory = { "pdf", xr_pdf_create }; -struct output_driver_factory ps_driver_factory = { "ps", xr_ps_create }; -struct output_driver_factory svg_driver_factory = { "svg", xr_svg_create }; +struct output_driver_factory pdf_driver_factory = + { "pdf", "pspp.pdf", xr_pdf_create }; +struct output_driver_factory ps_driver_factory = + { "ps", "pspp.ps", xr_ps_create }; +struct output_driver_factory svg_driver_factory = + { "svg", "pspp.svg", xr_svg_create }; static const struct output_driver_class cairo_driver_class = { @@ -899,114 +735,26 @@ static const struct output_driver_class cairo_driver_class = xr_flush, }; -/* GUI rendering helpers. */ - -struct xr_rendering - { - /* Table items. */ - struct render_page *page; - struct xr_driver *xr; - int title_height; - - /* Chart items. */ - struct chart_item *chart; - }; - -#define CHART_WIDTH 500 -#define CHART_HEIGHT 375 - struct xr_driver * xr_driver_create (cairo_t *cairo, struct string_map *options) { - struct xr_driver *xr = xr_allocate ("cairo", 0, options); - xr->width = INT_MAX / 8; - xr->length = INT_MAX / 8; - if (!xr_set_cairo (xr, cairo)) - { - output_driver_destroy (&xr->driver); - return NULL; - } + struct xr_driver *xr = xr_allocate ("cairo", 0, options, 1.0); + xr_set_cairo (xr, cairo); return xr; } -static struct xr_rendering * -xr_rendering_create_text (struct xr_driver *xr, const char *text, cairo_t *cr) -{ - struct table_item *table_item; - struct xr_rendering *r; - - table_item = table_item_create (table_from_string (0, text), NULL); - r = xr_rendering_create (xr, &table_item->output_item, cr); - table_item_unref (table_item); - - return r; -} - -struct xr_rendering * -xr_rendering_create (struct xr_driver *xr, const struct output_item *item, - cairo_t *cr) -{ - struct xr_rendering *r = NULL; - - if (is_text_item (item)) - r = xr_rendering_create_text (xr, text_item_get_text (to_text_item (item)), - cr); - else if (is_message_item (item)) - { - const struct message_item *message_item = to_message_item (item); - const struct msg *msg = message_item_get_msg (message_item); - char *s = msg_to_string (msg, NULL); - r = xr_rendering_create_text (xr, s, cr); - free (s); - } - else if (is_table_item (item)) - { - r = xzalloc (sizeof *r); - r->xr = xr; - xr_set_cairo (xr, cr); - r->page = xr_render_table_item (xr, to_table_item (item), - &r->title_height); - } - else if (is_chart_item (item)) - { - r = xzalloc (sizeof *r); - r->chart = to_chart_item (output_item_ref (item)); - } - - return r; -} - -void -xr_rendering_measure (struct xr_rendering *r, int *w, int *h) -{ - if (r->chart == NULL) - { - *w = render_page_get_size (r->page, H) / 1024; - *h = (render_page_get_size (r->page, V) + r->title_height) / 1024; - } - else - { - *w = CHART_WIDTH; - *h = CHART_HEIGHT; - } -} - +/* Destroy XR, which should have been created with xr_driver_create(). Any + cairo_t added to XR is not destroyed, because it is owned by the client. */ void -xr_rendering_draw (struct xr_rendering *r, cairo_t *cr) +xr_driver_destroy (struct xr_driver *xr) { - if (r->chart == NULL) + if (xr != NULL) { - struct xr_driver *xr = r->xr; - - xr_set_cairo (xr, cr); - xr->y = 0; - render_page_draw (r->page); + xr->cairo = NULL; + output_driver_destroy (&xr->driver); } - else - xr_draw_chart (r->chart, cr, 0, 0, CHART_WIDTH, CHART_HEIGHT); } - -void +static void xr_draw_chart (const struct chart_item *chart_item, cairo_t *cr, double x, double y, double width, double height) { @@ -1024,10 +772,16 @@ xr_draw_chart (const struct chart_item *chart_item, cairo_t *cr, xrchart_draw_np_plot (chart_item, cr, &geom); else if (is_piechart (chart_item)) xrchart_draw_piechart (chart_item, cr, &geom); + else if (is_barchart (chart_item)) + xrchart_draw_barchart (chart_item, cr, &geom); else if (is_roc_chart (chart_item)) xrchart_draw_roc (chart_item, cr, &geom); else if (is_scree (chart_item)) xrchart_draw_scree (chart_item, cr, &geom); + else if (is_spreadlevel_plot_chart (chart_item)) + xrchart_draw_spreadlevel (chart_item, cr, &geom); + else if (is_scatterplot_chart (chart_item)) + xrchart_draw_scatterplot (chart_item, cr, &geom); else NOT_REACHED (); xrchart_geometry_free (cr, &geom); @@ -1037,7 +791,9 @@ xr_draw_chart (const struct chart_item *chart_item, cairo_t *cr, char * xr_draw_png_chart (const struct chart_item *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) { const int width = 640; const int length = 480; @@ -1050,27 +806,24 @@ xr_draw_png_chart (const struct chart_item *item, number_pos = strchr (file_name_template, '#'); if (number_pos != NULL) - file_name = xasprintf ("%.*s%d%s", (int) (number_pos - file_name_template), + file_name = xasprintf ("%.*s%d%s.png", (int) (number_pos - file_name_template), file_name_template, number, number_pos + 1); else - file_name = xstrdup (file_name_template); + file_name = xasprintf ("%s.png", file_name_template); surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, length); cr = cairo_create (surface); - cairo_save (cr); - cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); - cairo_rectangle (cr, 0, 0, width, length); - cairo_fill (cr); - cairo_restore (cr); + cairo_set_source_rgb (cr, bg->r / 255.0, bg->g / 255.0, bg->b / 255.0); + cairo_paint (cr); - cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); + cairo_set_source_rgb (cr, fg->r / 255.0, fg->g / 255.0, fg->b / 255.0); xr_draw_chart (item, cr, 0.0, 0.0, width, length); status = cairo_surface_write_to_png (surface, file_name); if (status != CAIRO_STATUS_SUCCESS) - error (0, 0, _("error writing output file \"%s\": %s"), + msg (ME, _("error writing output file `%s': %s"), file_name, cairo_status_to_string (status)); cairo_destroy (cr); @@ -1078,254 +831,43 @@ xr_draw_png_chart (const struct chart_item *item, return file_name; } - -struct xr_table_state - { - struct xr_render_fsm fsm; - struct table_item *table_item; - struct render_break x_break; - struct render_break y_break; - int caption_height; - }; - -static bool -xr_table_render (struct xr_render_fsm *fsm, struct xr_driver *xr) -{ - struct xr_table_state *ts = UP_CAST (fsm, struct xr_table_state, fsm); - - for (;;) - { - struct render_page *y_slice; - int space; - - while (!render_break_has_next (&ts->y_break)) - { - struct render_page *x_slice; - - render_break_destroy (&ts->y_break); - if (!render_break_has_next (&ts->x_break)) - return false; - - x_slice = render_break_next (&ts->x_break, xr->width); - render_break_init (&ts->y_break, x_slice, V); - } - - space = xr->length - xr->y; - if (render_break_next_size (&ts->y_break) > space) - { - assert (xr->y > 0); - return true; - } - - y_slice = render_break_next (&ts->y_break, space); - if (ts->caption_height) - { - if (xr->cairo) - { - struct table_cell cell; - int bb[TABLE_N_AXES][2]; - - xr_init_caption_cell (table_item_get_caption (ts->table_item), - &cell); - bb[H][0] = 0; - bb[H][1] = xr->width; - bb[V][0] = 0; - bb[V][1] = ts->caption_height; - xr_draw_cell (xr, &cell, bb, bb); - } - xr->y += ts->caption_height; - ts->caption_height = 0; - } - - if (xr->cairo) - render_page_draw (y_slice); - xr->y += render_page_get_size (y_slice, V); - render_page_unref (y_slice); - } -} -static void -xr_table_destroy (struct xr_render_fsm *fsm) -{ - struct xr_table_state *ts = UP_CAST (fsm, struct xr_table_state, fsm); - - table_item_unref (ts->table_item); - render_break_destroy (&ts->x_break); - render_break_destroy (&ts->y_break); - free (ts); -} - -static struct xr_render_fsm * -xr_render_table (struct xr_driver *xr, const struct table_item *table_item) -{ - struct xr_table_state *ts; - struct render_page *page; - - ts = xmalloc (sizeof *ts); - ts->fsm.render = xr_table_render; - ts->fsm.destroy = xr_table_destroy; - ts->table_item = table_item_ref (table_item); - if (xr->y > 0) - xr->y += xr->font_height; - - page = xr_render_table_item (xr, table_item, &ts->caption_height); - xr->params->size[V] = xr->length - ts->caption_height; - - render_break_init (&ts->x_break, page, H); - render_break_init_empty (&ts->y_break); - - return &ts->fsm; -} - -struct xr_chart_state - { - struct xr_render_fsm fsm; - struct chart_item *chart_item; - }; - -static bool -xr_chart_render (struct xr_render_fsm *fsm, struct xr_driver *xr) -{ - struct xr_chart_state *cs = UP_CAST (fsm, struct xr_chart_state, fsm); - - if (xr->y > 0) - return true; - - if (xr->cairo != NULL) - xr_draw_chart (cs->chart_item, xr->cairo, 0.0, 0.0, - xr_to_pt (xr->width), xr_to_pt (xr->length)); - xr->y = xr->length; - - return false; -} - -static void -xr_chart_destroy (struct xr_render_fsm *fsm) -{ - struct xr_chart_state *cs = UP_CAST (fsm, struct xr_chart_state, fsm); - - chart_item_unref (cs->chart_item); - free (cs); -} - -static struct xr_render_fsm * -xr_render_chart (const struct chart_item *chart_item) -{ - struct xr_chart_state *cs; - - cs = xmalloc (sizeof *cs); - cs->fsm.render = xr_chart_render; - cs->fsm.destroy = xr_chart_destroy; - cs->chart_item = chart_item_ref (chart_item); - - return &cs->fsm; -} - -static bool -xr_eject_render (struct xr_render_fsm *fsm UNUSED, struct xr_driver *xr) -{ - return xr->y > 0; -} - -static void -xr_eject_destroy (struct xr_render_fsm *fsm UNUSED) -{ - /* Nothing to do. */ -} - -static struct xr_render_fsm * -xr_render_eject (void) -{ - static struct xr_render_fsm eject_renderer = - { - xr_eject_render, - xr_eject_destroy - }; - - return &eject_renderer; -} - -static struct xr_render_fsm * -xr_create_text_renderer (struct xr_driver *xr, const char *text) +char * +xr_draw_eps_chart (const struct chart_item *item, + const char *file_name_template, int number, + const struct cell_color *fg, + const struct cell_color *bg) { - struct table_item *table_item; - struct xr_render_fsm *fsm; + const int width = 640; + const int length = 480; - table_item = table_item_create (table_from_string (TAB_LEFT, text), NULL); - fsm = xr_render_table (xr, table_item); - table_item_unref (table_item); + cairo_surface_t *surface; + const char *number_pos; + char *file_name; + cairo_t *cr; - return fsm; -} + number_pos = strchr (file_name_template, '#'); + if (number_pos != NULL) + file_name = xasprintf ("%.*s%d%s.eps", (int) (number_pos - file_name_template), + file_name_template, number, number_pos + 1); + else + file_name = xasprintf ("%s.eps", file_name_template); -static struct xr_render_fsm * -xr_render_text (struct xr_driver *xr, const struct text_item *text_item) -{ - enum text_item_type type = text_item_get_type (text_item); - const char *text = text_item_get_text (text_item); + surface = cairo_ps_surface_create (file_name, width, length); + cairo_ps_surface_set_eps (surface, true); + cr = cairo_create (surface); - switch (type) - { - case TEXT_ITEM_TITLE: - free (xr->title); - xr->title = xstrdup (text); - draw_headers (xr); - break; - - case TEXT_ITEM_SUBTITLE: - free (xr->subtitle); - xr->subtitle = xstrdup (text); - draw_headers (xr); - break; - - case TEXT_ITEM_COMMAND_CLOSE: - break; - - case TEXT_ITEM_BLANK_LINE: - if (xr->y > 0) - xr->y += xr->font_height; - break; - - case TEXT_ITEM_EJECT_PAGE: - if (xr->y > 0) - return xr_render_eject (); - break; - - default: - return xr_create_text_renderer (xr, text); - } + cairo_set_source_rgb (cr, bg->r / 255.0, bg->g / 255.0, bg->b / 255.0); + cairo_paint (cr); - return NULL; -} + cairo_set_source_rgb (cr, fg->r / 255.0, fg->g / 255.0, fg->b / 255.0); -static struct xr_render_fsm * -xr_render_message (struct xr_driver *xr, - const struct message_item *message_item) -{ - const struct msg *msg = message_item_get_msg (message_item); - struct xr_render_fsm *fsm; - char *s; + xr_draw_chart (item, cr, 0.0, 0.0, width, length); - s = msg_to_string (msg, xr->command_name); - fsm = xr_create_text_renderer (xr, s); - free (s); + cairo_destroy (cr); + cairo_surface_destroy (surface); - return fsm; + return file_name; } -static struct xr_render_fsm * -xr_render_output_item (struct xr_driver *xr, - const struct output_item *output_item) -{ - if (is_table_item (output_item)) - return xr_render_table (xr, to_table_item (output_item)); - else if (is_chart_item (output_item)) - return xr_render_chart (to_chart_item (output_item)); - else if (is_text_item (output_item)) - return xr_render_text (xr, to_text_item (output_item)); - else if (is_message_item (output_item)) - return xr_render_message (xr, to_message_item (output_item)); - else - return NULL; -}