X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo.c;h=3e8c256f8193f31e4ffc71b513c7e034b4b28556;hb=bf3af6fb69dc94a6b3010e11e5d359e9e4abd5ba;hp=a98df2e6c18bc1d59a4cb4033879fec09b905242;hpb=1ce85b11b168b2f82fa9babe9c549c5b449dd41a;p=pspp diff --git a/src/output/cairo.c b/src/output/cairo.c index a98df2e6c1..3e8c256f81 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, 2011, 2012 Free Software Foundation, Inc. + Copyright (C) 2009, 2010, 2011, 2012, 2013, 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 @@ -47,13 +47,13 @@ #include #include #include +#include #include #include #include #include #include -#include "gl/error.h" #include "gl/intprops.h" #include "gl/minmax.h" #include "gl/xalloc.h" @@ -65,9 +65,8 @@ #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). */ #define XR_POINT PANGO_SCALE -#define XR_INCH (XR_POINT * 72) /* Conversions to and from points. */ static double @@ -123,17 +122,19 @@ struct xr_driver 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. */ - double bg_red, bg_green, bg_blue; /* Background color */ - double fg_red, fg_green, fg_blue; /* Foreground color */ + int min_break[TABLE_N_AXES]; /* Min cell size to break across pages. */ + + struct xr_color bg; /* Background color */ + struct xr_color fg; /* Foreground color */ /* Internal state. */ struct render_params *params; @@ -143,8 +144,9 @@ struct xr_driver char *subtitle; cairo_t *cairo; int page_number; /* Current page number. */ - int y; + int x, y; struct xr_render_fsm *fsm; + int nest; }; static const struct output_driver_class cairo_driver_class; @@ -161,6 +163,8 @@ static int xr_measure_cell_height (void *, const struct table_cell *, static void xr_draw_cell (void *, const struct table_cell *, int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2]); +static int xr_adjust_break (void *, const struct table_cell *, + int width, int height); static struct xr_render_fsm *xr_render_output_item ( struct xr_driver *, const struct output_item *); @@ -186,10 +190,10 @@ opt (struct output_driver *d, struct string_map *options, const char *key, Future implementations might allow things like "yellow" and "sky-blue-ultra-brown" */ -static void +void parse_color (struct output_driver *d, struct string_map *options, - const char *key, const char *default_value, - double *dred, double *dgreen, double *dblue) + const char *key, const char *default_value, + struct xr_color *color) { int red, green, blue; char *string = parse_string (opt (d, options, key, default_value)); @@ -207,15 +211,15 @@ parse_color (struct output_driver *d, struct string_map *options, free (string); /* Convert 16 bit ints to float */ - *dred = red / (double) 0xFFFF; - *dgreen = green / (double) 0xFFFF; - *dblue = blue / (double) 0xFFFF; + color->red = red / (double) 0xFFFF; + color->green = green / (double) 0xFFFF; + color->blue = blue / (double) 0xFFFF; } static PangoFontDescription * parse_font (struct output_driver *d, struct string_map *options, const char *key, const char *default_value, - int default_points) + int default_size) { PangoFontDescription *desc; char *string; @@ -225,7 +229,7 @@ parse_font (struct output_driver *d, struct string_map *options, desc = pango_font_description_from_string (string); if (desc == NULL) { - error (0, 0, _("`%s': bad font specification"), string); + msg (MW, _("`%s': bad font specification"), string); /* Fall back to DEFAULT_VALUE, which had better be a valid font description. */ @@ -235,10 +239,10 @@ parse_font (struct output_driver *d, struct string_map *options, free (string); /* If the font description didn't include an explicit font size, then set it - to DEFAULT_POINTS. */ + 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_points / 1000.0 * PANGO_SCALE); + (default_size / 1000.0) * PANGO_SCALE); return desc; } @@ -249,32 +253,61 @@ 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++) + { + struct xr_font *font = &xr->fonts[i]; + + if (font->desc != NULL) + pango_font_description_free (font->desc); + } - int font_points = parse_int (opt (d, o, "font-size", "10000"), 1000, 1000000); + font_size = parse_int (opt (d, o, "font-size", "10000"), 1000, 1000000); xr->fonts[XR_FONT_FIXED].desc = parse_font (d, o, "fixed-font", "monospace", - font_points); + font_size); xr->fonts[XR_FONT_PROPORTIONAL].desc = parse_font (d, o, "prop-font", - "serif", font_points); + "serif", font_size); xr->fonts[XR_FONT_EMPHASIS].desc = parse_font (d, o, "emph-font", - "serif italic", font_points); + "serif italic", font_size); - xr->line_gutter = XR_POINT; + xr->line_gutter = parse_dimension (opt (d, o, "gutter", "3pt")) * scale; xr->line_space = XR_POINT; xr->line_width = XR_POINT / 2; xr->page_number = 0; - parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &xr->bg_red, &xr->bg_green, &xr->bg_blue); - parse_color (d, o, "foreground-color", "#000000000000", &xr->fg_red, &xr->fg_green, &xr->fg_blue); + parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &xr->bg); + parse_color (d, o, "foreground-color", "#000000000000", &xr->fg); + /* Get dimensions. */ 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")); - - xr->width = paper_width - xr->left_margin - xr->right_margin; - xr->length = paper_length - xr->top_margin - xr->bottom_margin; + 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; + + /* 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; } static struct xr_driver * @@ -290,40 +323,31 @@ xr_allocate (const char *name, int device_type, struct string_map *o) return xr; } -static bool -xr_is_72dpi (cairo_t *cr) +static int +pango_to_xr (int pango) { - cairo_surface_type_t type; - cairo_surface_t *surface; + return (XR_POINT != PANGO_SCALE + ? ceil (pango * (1. * XR_POINT / PANGO_SCALE)) + : pango); +} - surface = cairo_get_target (cr); - type = cairo_surface_get_type (surface); - return type == CAIRO_SURFACE_TYPE_PDF || type == CAIRO_SURFACE_TYPE_PS; +static int +xr_to_pango (int xr) +{ + return (XR_POINT != PANGO_SCALE + ? ceil (xr * (1. / XR_POINT * PANGO_SCALE)) + : xr); } static bool xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) { - PangoContext *context; - PangoFontMap *map; int i; xr->cairo = cairo; cairo_set_line_width (xr->cairo, xr_to_pt (xr->line_width)); - map = pango_cairo_font_map_get_default (); - context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (map)); - if (xr_is_72dpi (cairo)) - { - /* Pango seems to always scale fonts according to the DPI specified - in the font map, even if the surface has a real DPI. The default - DPI is 96, so on a 72 DPI device fonts end up being 96/72 = 133% - of their desired size. We deal with this by fixing the resolution - here. Presumably there is a better solution, but what? */ - pango_cairo_context_set_resolution (context, 72.0); - } - xr->char_width = 0; xr->char_height = 0; for (i = 0; i < XR_N_FONTS; i++) @@ -331,17 +355,15 @@ xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) struct xr_font *font = &xr->fonts[i]; int char_width, char_height; - font->layout = pango_layout_new (context); + font->layout = pango_cairo_create_layout (cairo); pango_layout_set_font_description (font->layout, font->desc); pango_layout_set_text (font->layout, "0", 1); pango_layout_get_size (font->layout, &char_width, &char_height); - xr->char_width = MAX (xr->char_width, char_width); - xr->char_height = MAX (xr->char_height, char_height); + xr->char_width = MAX (xr->char_width, pango_to_xr (char_width)); + xr->char_height = MAX (xr->char_height, pango_to_xr (char_height)); } - g_object_unref (G_OBJECT (context)); - if (xr->params == NULL) { int single_width, double_width; @@ -350,6 +372,7 @@ xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) 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->adjust_break = xr_adjust_break; xr->params->draw_cell = xr_draw_cell; xr->params->aux = xr; xr->params->size[H] = xr->width; @@ -365,9 +388,12 @@ xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) xr->params->line_widths[i][RENDER_LINE_SINGLE] = single_width; xr->params->line_widths[i][RENDER_LINE_DOUBLE] = double_width; } + + for (i = 0; i < TABLE_N_AXES; i++) + xr->params->min_break[i] = xr->min_break[i]; } - cairo_set_source_rgb (xr->cairo, xr->fg_red, xr->fg_green, xr->fg_blue); + cairo_set_source_rgb (xr->cairo, xr->fg.red, xr->fg.green, xr->fg.blue); return true; } @@ -377,17 +403,15 @@ 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; xr = xr_allocate (file_name, device_type, o); - d = &xr->driver; - width_pt = (xr->width + xr->left_margin + xr->right_margin) / 1000.0; - length_pt = (xr->length + xr->top_margin + xr->bottom_margin) / 1000.0; + width_pt = xr_to_pt (xr->width + xr->left_margin + xr->right_margin); + length_pt = xr_to_pt (xr->length + xr->top_margin + xr->bottom_margin); if (file_type == XR_PDF) surface = cairo_pdf_surface_create (file_name, width_pt, length_pt); else if (file_type == XR_PS) @@ -400,7 +424,7 @@ xr_create (const char *file_name, enum settings_output_devices device_type, status = cairo_surface_status (surface); if (status != CAIRO_STATUS_SUCCESS) { - error (0, 0, _("error opening output file `%s': %s"), + msg (ME, _("error opening output file `%s': %s"), file_name, cairo_status_to_string (status)); cairo_surface_destroy (surface); goto error; @@ -417,7 +441,7 @@ xr_create (const char *file_name, enum settings_output_devices device_type, if (xr->width / xr->char_width < MIN_WIDTH) { - error (0, 0, _("The defined page is not wide enough to hold at least %d " + 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, @@ -427,7 +451,7 @@ xr_create (const char *file_name, enum settings_output_devices device_type, if (xr->length / xr->char_height < MIN_LENGTH) { - error (0, 0, _("The defined page is not long enough to hold at least %d " + 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, @@ -478,7 +502,7 @@ xr_destroy (struct output_driver *driver) cairo_surface_finish (cairo_get_target (xr->cairo)); status = cairo_status (xr->cairo); if (status != CAIRO_STATUS_SUCCESS) - error (0, 0, _("error drawing output for %s driver: %s"), + msg (ME, _("error drawing output for %s driver: %s"), output_driver_get_name (driver), cairo_status_to_string (status)); cairo_destroy (xr->cairo); @@ -508,14 +532,18 @@ xr_flush (struct output_driver *driver) } static void -xr_init_caption_cell (const char *caption, struct table_cell *cell) +xr_init_caption_cell (const char *caption, struct table_cell *cell, + struct cell_contents *contents) { - cell->contents = caption; - cell->options = TAB_LEFT; + contents->options = TAB_LEFT; + contents->text = CONST_CAST (char *, caption); + contents->table = NULL; + cell->contents = contents; + cell->n_contents = 1; cell->destructor = NULL; } -static struct render_page * +static struct render_pager * xr_render_table_item (struct xr_driver *xr, const struct table_item *item, int *caption_widthp, int *caption_heightp) { @@ -524,10 +552,11 @@ xr_render_table_item (struct xr_driver *xr, const struct table_item *item, if (caption != NULL) { /* XXX doesn't do well with very large captions */ + struct cell_contents contents; int min_width, max_width; struct table_cell cell; - xr_init_caption_cell (caption, &cell); + xr_init_caption_cell (caption, &cell, &contents); xr_measure_cell_width (xr, &cell, &min_width, &max_width); *caption_widthp = MIN (max_width, xr->width); @@ -536,7 +565,7 @@ xr_render_table_item (struct xr_driver *xr, const struct table_item *item, else *caption_heightp = 0; - return render_page_create (xr->params, table_item_get_table (item)); + return render_pager_create (xr->params, item); } static void @@ -544,6 +573,8 @@ xr_submit (struct output_driver *driver, const struct output_item *output_item) { struct xr_driver *xr = xr_driver_cast (driver); + output_driver_track_current_command (output_item, &xr->command_name); + xr_driver_output_item (xr, output_item); while (xr_driver_need_new_page (xr)) { @@ -571,7 +602,7 @@ xr_driver_next_page (struct xr_driver *xr, cairo_t *cairo) if (cairo != NULL) { cairo_save (cairo); - cairo_set_source_rgb (cairo, xr->bg_red, xr->bg_green, xr->bg_blue); + cairo_set_source_rgb (cairo, xr->bg.red, xr->bg.green, xr->bg.blue); cairo_rectangle (cairo, 0, 0, xr->width, xr->length); cairo_fill (cairo); cairo_restore (cairo); @@ -583,7 +614,7 @@ xr_driver_next_page (struct xr_driver *xr, cairo_t *cairo) xr->page_number++; xr->cairo = cairo; - xr->y = 0; + xr->x = xr->y = 0; xr_driver_run_fsm (xr); } @@ -635,14 +666,26 @@ xr_driver_run_fsm (struct xr_driver *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); + int *width, int *height, int *brk); 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_move_to (xr->cairo, xr_to_pt (x0 + xr->x), xr_to_pt (y0 + xr->y)); + cairo_line_to (xr->cairo, xr_to_pt (x1 + xr->x), xr_to_pt (y1 + xr->y)); + cairo_stroke (xr->cairo); +} + +static void UNUSED +dump_rectangle (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->x), xr_to_pt (y0 + xr->y)); + cairo_line_to (xr->cairo, xr_to_pt (x1 + xr->x), xr_to_pt (y0 + xr->y)); + cairo_line_to (xr->cairo, xr_to_pt (x1 + xr->x), xr_to_pt (y1 + xr->y)); + cairo_line_to (xr->cairo, xr_to_pt (x0 + xr->x), xr_to_pt (y1 + xr->y)); + cairo_close_path (xr->cairo); cairo_stroke (xr->cairo); } @@ -811,10 +854,10 @@ xr_measure_cell_width (void *xr_, const struct table_cell *cell, 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); + xr_layout_cell (xr, cell, bb, clip, max_width, &h, NULL); bb[H][1] = 1; - xr_layout_cell (xr, cell, bb, clip, PANGO_WRAP_WORD, min_width, &h); + xr_layout_cell (xr, cell, bb, clip, min_width, &h, NULL); } static int @@ -830,7 +873,7 @@ xr_measure_cell_height (void *xr_, const struct table_cell *cell, int 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); + xr_layout_cell (xr, cell, bb, clip, &w, &h, NULL); return h; } @@ -839,75 +882,301 @@ 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; + int w, h, brk; + + xr_layout_cell (xr, cell, bb, clip, &w, &h, &brk); +} + +static int +xr_adjust_break (void *xr_, const struct table_cell *cell, + int width, int height) +{ + struct xr_driver *xr = xr_; + int bb[TABLE_N_AXES][2]; + int clip[TABLE_N_AXES][2]; + int w, h, brk; + + if (xr_measure_cell_height (xr_, cell, width) < height) + return -1; - xr_layout_cell (xr, cell, bb, clip, PANGO_WRAP_WORD, &w, &h); + bb[H][0] = 0; + bb[H][1] = width; + bb[V][0] = 0; + bb[V][1] = height; + clip[H][0] = clip[H][1] = clip[V][0] = clip[V][1] = 0; + xr_layout_cell (xr, cell, bb, clip, &w, &h, &brk); + return brk; } 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) +xr_clip (struct xr_driver *xr, int clip[TABLE_N_AXES][2]) { + if (clip[H][1] != INT_MAX || clip[V][1] != INT_MAX) + { + double x0 = xr_to_pt (clip[H][0] + xr->x); + double y0 = xr_to_pt (clip[V][0] + xr->y); + double x1 = xr_to_pt (clip[H][1] + xr->x); + double y1 = xr_to_pt (clip[V][1] + xr->y); + + cairo_rectangle (xr->cairo, x0, y0, x1 - x0, y1 - y0); + cairo_clip (xr->cairo); + } +} + +static int +xr_layout_cell_text (struct xr_driver *xr, + const struct cell_contents *contents, + int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], + int y, int *widthp, int *brk) +{ + unsigned int options = contents->options; struct xr_font *font; + int w, h; - font = (cell->options & TAB_FIX ? &xr->fonts[XR_FONT_FIXED] - : cell->options & TAB_EMPH ? &xr->fonts[XR_FONT_EMPHASIS] + font = (options & TAB_FIX ? &xr->fonts[XR_FONT_FIXED] + : 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_text (font->layout, contents->text, -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 + ((options & TAB_ALIGNMENT) == TAB_RIGHT ? PANGO_ALIGN_RIGHT + : (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); + pango_layout_set_width ( + font->layout, + bb[H][1] == INT_MAX ? -1 : xr_to_pango (bb[H][1] - bb[H][0])); + pango_layout_set_wrap (font->layout, PANGO_WRAP_WORD); if (clip[H][0] != clip[H][1]) { cairo_save (xr->cairo); + xr_clip (xr, clip); + cairo_translate (xr->cairo, + xr_to_pt (bb[H][0] + xr->x), + xr_to_pt (y + xr->y)); + pango_cairo_show_layout (xr->cairo, font->layout); - if (clip[H][1] != INT_MAX || clip[V][1] != INT_MAX) + /* If enabled, this draws a blue rectangle around the extents of each + line of text, which can be rather useful for debugging layout + issues. */ + if (0) { - 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); + PangoLayoutIter *iter; + iter = pango_layout_get_iter (font->layout); + do + { + PangoRectangle extents; + + pango_layout_iter_get_line_extents (iter, &extents, NULL); + cairo_save (xr->cairo); + cairo_set_source_rgb (xr->cairo, 1, 0, 0); + dump_rectangle (xr, + pango_to_xr (extents.x) - xr->x, + pango_to_xr (extents.y) - xr->y, + pango_to_xr (extents.x + extents.width) - xr->x, + pango_to_xr (extents.y + extents.height) - xr->y); + cairo_restore (xr->cairo); + } + while (pango_layout_iter_next_line (iter)); + pango_layout_iter_free (iter); + } - cairo_rectangle (xr->cairo, x0, y0, x1 - x0, y1 - y0); - cairo_clip (xr->cairo); + cairo_restore (xr->cairo); + } + + pango_layout_get_size (font->layout, &w, &h); + w = pango_to_xr (w); + h = pango_to_xr (h); + if (w > *widthp) + *widthp = w; + if (y + h >= bb[V][1]) + { + PangoLayoutIter *iter; + int best UNUSED = 0; + + /* Choose a breakpoint between lines instead of in the middle of one. */ + iter = pango_layout_get_iter (font->layout); + do + { + PangoRectangle extents; + int y0, y1; + int bottom; + + pango_layout_iter_get_line_extents (iter, NULL, &extents); + pango_layout_iter_get_line_yrange (iter, &y0, &y1); + extents.x = pango_to_xr (extents.x); + extents.y = pango_to_xr (y0); + extents.width = pango_to_xr (extents.width); + extents.height = pango_to_xr (y1 - y0); + bottom = y + extents.y + extents.height; + if (bottom < bb[V][1]) + { + if (brk && clip[H][0] != clip[H][1]) + best = bottom; + *brk = bottom; + } + else + break; } + while (pango_layout_iter_next_line (iter)); - 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); + /* If enabled, draws a green line across the chosen breakpoint, which can + be useful for debugging issues with breaking. */ + if (0) + { + if (best && !xr->nest) + { + cairo_save (xr->cairo); + cairo_set_source_rgb (xr->cairo, 0, 1, 0); + dump_line (xr, -xr->left_margin, best, xr->width + xr->right_margin, best); + cairo_restore (xr->cairo); + } + } + } + return y + h; +} + +static int +xr_layout_cell_subtable (struct xr_driver *xr, + const struct cell_contents *contents, + int bb[TABLE_N_AXES][2], + int clip[TABLE_N_AXES][2], int *widthp, int *brk) +{ + int single_width, double_width; + struct render_params params; + struct render_pager *p; + int r[TABLE_N_AXES][2]; + int width, height; + int i; + + params.draw_line = xr_draw_line; + params.measure_cell_width = xr_measure_cell_width; + params.measure_cell_height = xr_measure_cell_height; + params.adjust_break = NULL; + params.draw_cell = xr_draw_cell; + params.aux = xr; + params.size[H] = bb[H][1] - bb[H][0]; + params.size[V] = bb[V][1] - bb[V][0]; + params.font_size[H] = xr->char_width; + params.font_size[V] = xr->char_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++) + { + params.line_widths[i][RENDER_LINE_NONE] = 0; + params.line_widths[i][RENDER_LINE_SINGLE] = single_width; + params.line_widths[i][RENDER_LINE_DOUBLE] = double_width; + } + + xr->nest++; + p = render_pager_create (¶ms, contents->table); + width = render_pager_get_size (p, H); + height = render_pager_get_size (p, V); + if (bb[V][0] + height >= bb[V][1]) + *brk = bb[V][0] + render_pager_get_best_breakpoint (p, bb[V][1] - bb[V][0]); + + /* r = intersect(bb, clip) - bb. */ + for (i = 0; i < TABLE_N_AXES; i++) + { + r[i][0] = MAX (bb[i][0], clip[i][0]) - bb[i][0]; + r[i][1] = MIN (bb[i][1], clip[i][1]) - bb[i][0]; + } + + if (r[H][0] < r[H][1] && r[V][0] < r[V][1]) + { + unsigned int alignment = contents->options & TAB_ALIGNMENT; + int save_x = xr->x; + + cairo_save (xr->cairo); + xr_clip (xr, clip); + xr->x += bb[H][0]; + if (alignment == TAB_RIGHT) + xr->x += params.size[H] - width; + else if (alignment == TAB_CENTER) + xr->x += (params.size[H] - width) / 2; + xr->y += bb[V][0]; + render_pager_draw_region (p, r[H][0], r[V][0], + r[H][1] - r[H][0], r[V][1] - r[V][0]); + xr->y -= bb[V][0]; + xr->x = save_x; cairo_restore (xr->cairo); } + render_pager_destroy (p); + xr->nest--; + + if (width > *widthp) + *widthp = width; + return bb[V][0] + height; +} - if (width != NULL || height != NULL) +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], + int *width, int *height, int *brk) +{ + int bb[TABLE_N_AXES][2]; + size_t i; + + *width = 0; + *height = 0; + if (brk) + *brk = 0; + + memcpy (bb, bb_, sizeof bb); + + /* If enabled, draws a blue rectangle around the cell extents, which can be + useful for debugging layout. */ + if (0) { - int w, h; + if (clip[H][0] != clip[H][1]) + { + int offset = (xr->nest) * XR_POINT; + + cairo_save (xr->cairo); + cairo_set_source_rgb (xr->cairo, 0, 0, 1); + dump_rectangle (xr, + bb[H][0] + offset, bb[V][0] + offset, + bb[H][1] - offset, bb[V][1] - offset); + cairo_restore (xr->cairo); + } + } - pango_layout_get_size (font->layout, &w, &h); - if (width != NULL) - *width = w; - if (height != NULL) - *height = h; + for (i = 0; i < cell->n_contents && bb[V][0] < bb[V][1]; i++) + { + const struct cell_contents *contents = &cell->contents[i]; + + if (brk) + *brk = bb[V][0]; + if (i > 0) + { + bb[V][0] += xr->char_height / 2; + if (bb[V][0] >= bb[V][1]) + break; + if (brk) + *brk = bb[V][0]; + } + + if (contents->text) + bb[V][0] = xr_layout_cell_text (xr, contents, bb, clip, + bb[V][0], width, brk); + else + bb[V][0] = xr_layout_cell_subtable (xr, contents, bb, clip, width, brk); } + *height = bb[V][0] - bb_[V][0]; } static void xr_draw_title (struct xr_driver *xr, const char *title, int title_width, int title_height) { + struct cell_contents contents; struct table_cell cell; int bb[TABLE_N_AXES][2]; - xr_init_caption_cell (title, &cell); + xr_init_caption_cell (title, &cell, &contents); bb[H][0] = 0; bb[H][1] = title_width; bb[V][0] = 0; @@ -915,9 +1184,12 @@ xr_draw_title (struct xr_driver *xr, const char *title, xr_draw_cell (xr, &cell, bb, bb); } -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 = { @@ -934,7 +1206,7 @@ struct xr_rendering struct output_item *item; /* Table items. */ - struct render_page *page; + struct render_pager *p; struct xr_driver *xr; int title_width; int title_height; @@ -1012,8 +1284,8 @@ xr_rendering_create (struct xr_driver *xr, const struct output_item *item, r->item = output_item_ref (item); r->xr = xr; xr_set_cairo (xr, cr); - r->page = xr_render_table_item (xr, to_table_item (item), - &r->title_width, &r->title_height); + r->p = xr_render_table_item (xr, to_table_item (item), + &r->title_width, &r->title_height); } else if (is_chart_item (item)) { @@ -1024,15 +1296,26 @@ xr_rendering_create (struct xr_driver *xr, const struct output_item *item, return r; } +void +xr_rendering_destroy (struct xr_rendering *r) +{ + if (r) + { + output_item_unref (r->item); + render_pager_destroy (r->p); + free (r); + } +} + void xr_rendering_measure (struct xr_rendering *r, int *w, int *h) { if (is_table_item (r->item)) { - int w0 = render_page_get_size (r->page, H); + int w0 = render_pager_get_size (r->p, H); int w1 = r->title_width; - *w = MAX (w0, w1) / 1024; - *h = (render_page_get_size (r->page, V) + r->title_height) / 1024; + *w = MAX (w0, w1) / XR_POINT; + *h = (render_pager_get_size (r->p, V) + r->title_height) / XR_POINT; } else { @@ -1064,8 +1347,9 @@ xr_rendering_draw (struct xr_rendering *r, cairo_t *cr, } xr->y = r->title_height; - render_page_draw_region (r->page, x * 1024, (y * 1024) - r->title_height, - w * 1024, h * 1024); + render_pager_draw_region (r->p, + x * XR_POINT, (y * XR_POINT) - r->title_height, + w * XR_POINT, h * XR_POINT); } else xr_draw_chart (to_chart_item (r->item), cr, @@ -1105,7 +1389,10 @@ 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 xr_color *fg, + const struct xr_color *bg + ) { const int width = 640; const int length = 480; @@ -1126,13 +1413,16 @@ xr_draw_png_chart (const struct chart_item *item, surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, length); cr = cairo_create (surface); - cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); + cairo_set_source_rgb (cr, bg->red, bg->green, bg->blue); + cairo_paint (cr); + + cairo_set_source_rgb (cr, fg->red, fg->green, fg->blue); 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); @@ -1145,8 +1435,7 @@ struct xr_table_state { struct xr_render_fsm fsm; struct table_item *table_item; - struct render_break x_break; - struct render_break y_break; + struct render_pager *p; int caption_height; }; @@ -1155,46 +1444,32 @@ 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 (;;) + while (render_pager_has_next (ts->p)) { - struct render_page *y_slice; - int space; + int caption_height = ts->caption_height; + int used; - 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) + xr->y += caption_height; + used = render_pager_draw_next (ts->p, xr->length - xr->y); + xr->y -= caption_height; + if (!used) { assert (xr->y > 0); return true; } - - y_slice = render_break_next (&ts->y_break, space); - if (ts->caption_height) + else { - if (xr->cairo) - xr_draw_title (xr, table_item_get_caption (ts->table_item), - xr->width, ts->caption_height); - - xr->y += ts->caption_height; - ts->caption_height = 0; + if (ts->caption_height) + { + if (xr->cairo) + xr_draw_title (xr, table_item_get_caption (ts->table_item), + xr->width, ts->caption_height); + ts->caption_height = 0; + } + xr->y += caption_height + used; } - - if (xr->cairo) - render_page_draw (y_slice); - xr->y += render_page_get_size (y_slice, V); - render_page_unref (y_slice); } + return false; } static void @@ -1203,8 +1478,7 @@ 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); + render_pager_destroy (ts->p); free (ts); } @@ -1212,7 +1486,6 @@ 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; int caption_width; ts = xmalloc (sizeof *ts); @@ -1223,13 +1496,10 @@ xr_render_table (struct xr_driver *xr, const struct table_item *table_item) if (xr->y > 0) xr->y += xr->char_height; - page = xr_render_table_item (xr, table_item, - &caption_width, &ts->caption_height); + ts->p = xr_render_table_item (xr, table_item, + &caption_width, &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; }