From: Ben Pfaff Date: Sun, 6 Dec 2020 22:18:26 +0000 (-0800) Subject: cairo: Factor out code for basic rendering. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50df556805bb5505ce153cb364ff2d3728694a4b;p=pspp cairo: Factor out code for basic rendering. --- diff --git a/src/output/automake.mk b/src/output/automake.mk index 5b4390f9b2..d524bc8f60 100644 --- a/src/output/automake.mk +++ b/src/output/automake.mk @@ -93,6 +93,8 @@ if HAVE_CAIRO src_output_liboutput_la_SOURCES += \ src/output/cairo-chart.c \ src/output/cairo-chart.h \ + src/output/cairo-fsm.c \ + src/output/cairo-fsm.h \ src/output/cairo.c \ src/output/cairo.h \ src/output/charts/boxplot-cairo.c \ diff --git a/src/output/cairo-fsm.c b/src/output/cairo-fsm.c new file mode 100644 index 0000000000..1aec006c9b --- /dev/null +++ b/src/output/cairo-fsm.c @@ -0,0 +1,1304 @@ +/* PSPP - a program for statistical analysis. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +#include "output/cairo-fsm.h" + +#include +#include +#include +#include + +#include "libpspp/assertion.h" +#include "libpspp/str.h" +#include "output/cairo-chart.h" +#include "output/chart-item-provider.h" +#include "output/chart-item.h" +#include "output/charts/barchart.h" +#include "output/charts/boxplot.h" +#include "output/charts/np-plot.h" +#include "output/charts/piechart.h" +#include "output/charts/plot-hist.h" +#include "output/charts/roc-chart.h" +#include "output/charts/scatterplot.h" +#include "output/charts/scree.h" +#include "output/charts/spreadlevel-plot.h" +#include "output/group-item.h" +#include "output/message-item.h" +#include "output/page-eject-item.h" +#include "output/page-setup-item.h" +#include "output/render.h" +#include "output/table-item.h" +#include "output/text-item.h" + +#include "gl/c-ctype.h" +#include "gl/c-strcase.h" +#include "gl/xalloc.h" + +/* This file uses TABLE_HORZ and TABLE_VERT enough to warrant abbreviating. */ +#define H TABLE_HORZ +#define V TABLE_VERT + +struct xr_fsm_style * +xr_fsm_style_ref (const struct xr_fsm_style *style_) +{ + assert (style_->ref_cnt > 0); + + struct xr_fsm_style *style = CONST_CAST (struct xr_fsm_style *, style_); + style->ref_cnt++; + return style; +} + +void +xr_fsm_style_unref (struct xr_fsm_style *style) +{ + if (style) + { + assert (style->ref_cnt > 0); + if (!--style->ref_cnt) + { + for (size_t i = 0; i < XR_N_FONTS; i++) + pango_font_description_free (style->fonts[i]); + free (style); + } + } +} + +bool +xr_fsm_style_equals (const struct xr_fsm_style *a, + const struct xr_fsm_style *b) +{ + if (a->size[H] != b->size[H] + || a->size[V] != b->size[V] + || a->min_break[H] != b->min_break[H] + || a->min_break[V] != b->min_break[V] + || a->use_system_colors != b->use_system_colors + || a->transparent != b->transparent + || a->font_scale != b->font_scale) + return false; + + for (size_t i = 0; i < XR_N_FONTS; i++) + if (!pango_font_description_equal (a->fonts[i], b->fonts[i])) + return false; + + return true; +} + +struct xr_fsm + { + struct xr_fsm_style *style; + struct output_item *item; + + /* Table items only. */ + struct render_params rp; + struct render_pager *p; + cairo_t *cairo; /* XXX should this be here?! */ + + /* Chart and page-eject items only. */ + bool done; + }; + +/* The unit used for internal measurements is inch/(72 * XR_POINT). + (Thus, XR_POINT units represent one point.) */ +#define XR_POINT PANGO_SCALE + +/* Conversions to and from points. */ +static double +xr_to_pt (int x) +{ + return x / (double) XR_POINT; +} + +/* Conversion from 1/96" units ("pixels") to Cairo/Pango units. */ +static int +px_to_xr (int x) +{ + return x * (PANGO_SCALE * 72 / 96); +} + +static int +pango_to_xr (int pango) +{ + return (XR_POINT != PANGO_SCALE + ? ceil (pango * (1. * XR_POINT / PANGO_SCALE)) + : pango); +} + +static int +xr_to_pango (int xr) +{ + return (XR_POINT != PANGO_SCALE + ? ceil (xr * (1. / XR_POINT * PANGO_SCALE)) + : xr); +} + +/* 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. */ + +static void +xr_layout_cell (struct xr_fsm *, const struct table_cell *, + int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], + int *width, int *height, int *brk); + +static void +xr_set_source_rgba (cairo_t *cairo, const struct cell_color *color) +{ + cairo_set_source_rgba (cairo, + color->r / 255., color->g / 255., color->b / 255., + color->alpha / 255.); +} + +static void +xr_draw_line (struct xr_fsm *xr, int x0, int y0, int x1, int y1, int style, + const struct cell_color *color) +{ + cairo_new_path (xr->cairo); + if (!xr->style->use_system_colors) + xr_set_source_rgba (xr->cairo, color); + cairo_set_line_width ( + xr->cairo, + xr_to_pt (style == RENDER_LINE_THICK ? XR_LINE_WIDTH * 2 + : style == RENDER_LINE_THIN ? XR_LINE_WIDTH / 2 + : XR_LINE_WIDTH)); + cairo_move_to (xr->cairo, xr_to_pt (x0), xr_to_pt (y0)); + cairo_line_to (xr->cairo, xr_to_pt (x1), xr_to_pt (y1)); + cairo_stroke (xr->cairo); +} + +static void UNUSED +xr_draw_rectangle (struct xr_fsm *xr, int x0, int y0, int x1, int y1) +{ + cairo_new_path (xr->cairo); + cairo_set_line_width (xr->cairo, xr_to_pt (XR_LINE_WIDTH)); + cairo_close_path (xr->cairo); + cairo_stroke (xr->cairo); + cairo_move_to (xr->cairo, xr_to_pt (x0), xr_to_pt (y0)); + cairo_line_to (xr->cairo, xr_to_pt (x1), xr_to_pt (y0)); + cairo_line_to (xr->cairo, xr_to_pt (x1), xr_to_pt (y1)); + cairo_line_to (xr->cairo, xr_to_pt (x0), xr_to_pt (y1)); +} + +static void +fill_rectangle (struct xr_fsm *xr, int x0, int y0, int x1, int y1) +{ + cairo_new_path (xr->cairo); + cairo_set_line_width (xr->cairo, xr_to_pt (XR_LINE_WIDTH)); + cairo_rectangle (xr->cairo, + xr_to_pt (x0), xr_to_pt (y0), + xr_to_pt (x1 - x0), xr_to_pt (y1 - y0)); + cairo_fill (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 +xr_draw_horz_line (struct xr_fsm *xr, int x0, int x1, int x2, int x3, int y, + enum render_line_style left, enum render_line_style right, + const struct cell_color *left_color, + const struct cell_color *right_color, + bool shorten) +{ + if (left != RENDER_LINE_NONE && right != RENDER_LINE_NONE && !shorten + && cell_color_equal (left_color, right_color)) + xr_draw_line (xr, x0, y, x3, y, left, left_color); + else + { + if (left != RENDER_LINE_NONE) + xr_draw_line (xr, x0, y, shorten ? x1 : x2, y, left, left_color); + if (right != RENDER_LINE_NONE) + xr_draw_line (xr, shorten ? x2 : x1, y, x3, y, right, right_color); + } +} + +/* 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 +xr_draw_vert_line (struct xr_fsm *xr, int y0, int y1, int y2, int y3, int x, + enum render_line_style top, enum render_line_style bottom, + const struct cell_color *top_color, + const struct cell_color *bottom_color, + bool shorten) +{ + if (top != RENDER_LINE_NONE && bottom != RENDER_LINE_NONE && !shorten + && cell_color_equal (top_color, bottom_color)) + xr_draw_line (xr, x, y0, x, y3, top, top_color); + else + { + if (top != RENDER_LINE_NONE) + xr_draw_line (xr, x, y0, x, shorten ? y1 : y2, top, top_color); + if (bottom != RENDER_LINE_NONE) + xr_draw_line (xr, x, shorten ? y2 : y1, x, y3, bottom, bottom_color); + } +} + +static void +xrr_draw_line (void *xr_, int bb[TABLE_N_AXES][2], + enum render_line_style styles[TABLE_N_AXES][2], + struct cell_color colors[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 bottom = styles[H][1]; + + int start_side = render_direction_rtl(); + int end_side = !start_side; + const int start_of_line = styles[V][start_side]; + const int end_of_line = styles[V][end_side]; + const struct cell_color *top_color = &colors[H][0]; + const struct cell_color *bottom_color = &colors[H][1]; + const struct cell_color *start_color = &colors[V][start_side]; + const struct cell_color *end_color = &colors[V][end_side]; + + /* 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_fsm *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 = start_of_line == RENDER_LINE_DOUBLE || end_of_line == 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 = start_of_line == RENDER_LINE_DOUBLE; + bool shorten_x2_lines = end_of_line == 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) + xr_draw_horz_line (xr, x0, x1, x2, x3, yc, start_of_line, end_of_line, + start_color, end_color, shorten_yc_line); + else + { + xr_draw_horz_line (xr, x0, x1, x2, x3, y1, start_of_line, end_of_line, + start_color, end_color, shorten_y1_lines); + xr_draw_horz_line (xr, x0, x1, x2, x3, y2, start_of_line, end_of_line, + start_color, end_color, shorten_y2_lines); + } + + if (!double_vert) + xr_draw_vert_line (xr, y0, y1, y2, y3, xc, top, bottom, + top_color, bottom_color, shorten_xc_line); + else + { + xr_draw_vert_line (xr, y0, y1, y2, y3, x1, top, bottom, + top_color, bottom_color, shorten_x1_lines); + xr_draw_vert_line (xr, y0, y1, y2, y3, x2, top, bottom, + top_color, bottom_color, shorten_x2_lines); + } +} + +static void +xrr_measure_cell_width (void *xr_, const struct table_cell *cell, + int *min_width, int *max_width) +{ + struct xr_fsm *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, max_width, &h, NULL); + + bb[H][1] = 1; + xr_layout_cell (xr, cell, bb, clip, min_width, &h, NULL); + + if (*min_width > 0) + *min_width += px_to_xr (cell->style->cell_style.margin[H][0] + + cell->style->cell_style.margin[H][1]); + if (*max_width > 0) + *max_width += px_to_xr (cell->style->cell_style.margin[H][0] + + cell->style->cell_style.margin[H][1]); +} + +static int +xrr_measure_cell_height (void *xr_, const struct table_cell *cell, int width) +{ + struct xr_fsm *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 - px_to_xr (cell->style->cell_style.margin[H][0] + + cell->style->cell_style.margin[H][1]); + 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, &w, &h, NULL); + h += px_to_xr (cell->style->cell_style.margin[V][0] + + cell->style->cell_style.margin[V][1]); + return h; +} + +static void xr_clip (struct xr_fsm *, int clip[TABLE_N_AXES][2]); + +static void +xrr_draw_cell (void *xr_, const struct table_cell *cell, int color_idx, + int bb[TABLE_N_AXES][2], int valign_offset, + int spill[TABLE_N_AXES][2], + int clip[TABLE_N_AXES][2]) +{ + struct xr_fsm *xr = xr_; + int w, h, brk; + + if (!xr->style->transparent) + { + cairo_save (xr->cairo); + int bg_clip[TABLE_N_AXES][2]; + for (int axis = 0; axis < TABLE_N_AXES; axis++) + { + bg_clip[axis][0] = clip[axis][0]; + if (bb[axis][0] == clip[axis][0]) + bg_clip[axis][0] -= spill[axis][0]; + + bg_clip[axis][1] = clip[axis][1]; + if (bb[axis][1] == clip[axis][1]) + bg_clip[axis][1] += spill[axis][1]; + } + xr_clip (xr, bg_clip); + xr_set_source_rgba (xr->cairo, &cell->style->font_style.bg[color_idx]); + fill_rectangle (xr, + bb[H][0] - spill[H][0], + bb[V][0] - spill[V][0], + bb[H][1] + spill[H][1], + bb[V][1] + spill[V][1]); + cairo_restore (xr->cairo); + } + cairo_save (xr->cairo); + if (!xr->style->use_system_colors) + xr_set_source_rgba (xr->cairo, &cell->style->font_style.fg[color_idx]); + + bb[V][0] += valign_offset; + + for (int axis = 0; axis < TABLE_N_AXES; axis++) + { + bb[axis][0] += px_to_xr (cell->style->cell_style.margin[axis][0]); + bb[axis][1] -= px_to_xr (cell->style->cell_style.margin[axis][1]); + } + if (bb[H][0] < bb[H][1] && bb[V][0] < bb[V][1]) + xr_layout_cell (xr, cell, bb, clip, &w, &h, &brk); + cairo_restore (xr->cairo); +} + +static int +xrr_adjust_break (void *xr_, const struct table_cell *cell, + int width, int height) +{ + struct xr_fsm *xr = xr_; + int bb[TABLE_N_AXES][2]; + int clip[TABLE_N_AXES][2]; + int w, h, brk; + + if (xrr_measure_cell_height (xr_, cell, width) < height) + return -1; + + bb[H][0] = 0; + bb[H][1] = width - px_to_xr (cell->style->cell_style.margin[H][0] + + cell->style->cell_style.margin[H][1]); + if (bb[H][1] <= 0) + return 0; + bb[V][0] = 0; + bb[V][1] = height - px_to_xr (cell->style->cell_style.margin[V][0] + + cell->style->cell_style.margin[V][1]); + 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_clip (struct xr_fsm *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]); + double y0 = xr_to_pt (clip[V][0]); + double x1 = xr_to_pt (clip[H][1]); + double y1 = xr_to_pt (clip[V][1]); + + cairo_rectangle (xr->cairo, x0, y0, x1 - x0, y1 - y0); + cairo_clip (xr->cairo); + } +} + +static void +add_attr (PangoAttrList *list, PangoAttribute *attr, + guint start_index, guint end_index) +{ + attr->start_index = start_index; + attr->end_index = end_index; + pango_attr_list_insert (list, attr); +} + +static void +markup_escape (struct string *out, unsigned int options, + const char *in, size_t len) +{ + if (!(options & TAB_MARKUP)) + { + ds_put_substring (out, ss_buffer (in, len == -1 ? strlen (in) : len)); + return; + } + + while (len-- > 0) + { + int c = *in++; + switch (c) + { + case 0: + return; + case '&': + ds_put_cstr (out, "&"); + break; + case '<': + ds_put_cstr (out, "<"); + break; + case '>': + ds_put_cstr (out, ">"); + break; + default: + ds_put_byte (out, c); + break; + } + } +} + +static int +get_layout_dimension (PangoLayout *layout, enum table_axis axis) +{ + int size[TABLE_N_AXES]; + pango_layout_get_size (layout, &size[H], &size[V]); + return size[axis]; +} + +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 int +xr_layout_cell_text (struct xr_fsm *xr, const struct table_cell *cell, + int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], + int *widthp, int *brk) +{ + const struct font_style *font_style = &cell->style->font_style; + const struct cell_style *cell_style = &cell->style->cell_style; + unsigned int options = cell->options; + + enum table_axis X = options & TAB_ROTATE ? V : H; + enum table_axis Y = !X; + int R = options & TAB_ROTATE ? 0 : 1; + + enum xr_font_type font_type = (options & TAB_FIX + ? XR_FONT_FIXED + : XR_FONT_PROPORTIONAL); + PangoFontDescription *desc = NULL; + if (font_style->typeface) + desc = parse_font ( + font_style->typeface, + font_style->size ? font_style->size * 1000 * xr->style->font_scale : 10000, + font_style->bold, font_style->italic); + if (!desc) + desc = xr->style->fonts[font_type]; + + assert (xr->cairo); + PangoLayout *layout = pango_cairo_create_layout (xr->cairo); + pango_layout_set_font_description (layout, desc); + + const char *text = cell->text; + enum table_halign halign = table_halign_interpret ( + cell_style->halign, cell->options & TAB_NUMERIC); + if (cell_style->halign == TABLE_HALIGN_DECIMAL && !(options & TAB_ROTATE)) + { + int margin_adjustment = -px_to_xr (cell_style->decimal_offset); + + const char *decimal = strrchr (text, cell_style->decimal_char); + if (decimal) + { + pango_layout_set_text (layout, decimal, strlen (decimal)); + pango_layout_set_width (layout, -1); + margin_adjustment += get_layout_dimension (layout, H); + } + + if (margin_adjustment < 0) + bb[H][1] += margin_adjustment; + } + + struct string tmp = DS_EMPTY_INITIALIZER; + PangoAttrList *attrs = NULL; + + /* Deal with an oddity of the Unicode line-breaking algorithm (or perhaps in + Pango's implementation of it): it will break after a period or a comma + that precedes a digit, e.g. in ".000" it will break after the period. + This code looks for such a situation and inserts a U+2060 WORD JOINER + to prevent the break. + + This isn't necessary when the decimal point is between two digits + (e.g. "0.000" won't be broken) or when the display width is not limited so + that word wrapping won't happen. + + It isn't necessary to look for more than one period or comma, as would + happen with grouping like 1,234,567.89 or 1.234.567,89 because if groups + are present then there will always be a digit on both sides of every + period and comma. */ + if (options & TAB_MARKUP) + { + PangoAttrList *new_attrs; + char *new_text; + if (pango_parse_markup (text, -1, 0, &new_attrs, &new_text, NULL, NULL)) + { + attrs = new_attrs; + tmp.ss = ss_cstr (new_text); + tmp.capacity = tmp.ss.length; + } + else + { + /* XXX should we report the error? */ + ds_put_cstr (&tmp, text); + } + } + else if (options & TAB_ROTATE || bb[H][1] != INT_MAX) + { + const char *decimal = text + strcspn (text, ".,"); + if (decimal[0] + && c_isdigit (decimal[1]) + && (decimal == text || !c_isdigit (decimal[-1]))) + { + ds_extend (&tmp, strlen (text) + 16); + markup_escape (&tmp, options, text, decimal - text + 1); + ds_put_unichar (&tmp, 0x2060 /* U+2060 WORD JOINER */); + markup_escape (&tmp, options, decimal + 1, -1); + } + } + + if (font_style->underline) + { + if (!attrs) + attrs = pango_attr_list_new (); + pango_attr_list_insert (attrs, pango_attr_underline_new ( + PANGO_UNDERLINE_SINGLE)); + } + + if (cell->n_footnotes || cell->n_subscripts || cell->superscript) + { + /* If we haven't already put TEXT into tmp, do it now. */ + if (ds_is_empty (&tmp)) + { + ds_extend (&tmp, strlen (text) + 16); + markup_escape (&tmp, options, text, -1); + } + + size_t subscript_ofs = ds_length (&tmp); + for (size_t i = 0; i < cell->n_subscripts; i++) + { + if (i) + ds_put_byte (&tmp, ','); + ds_put_cstr (&tmp, cell->subscripts[i]); + } + + size_t superscript_ofs = ds_length (&tmp); + if (cell->superscript) + ds_put_cstr (&tmp, cell->superscript); + + size_t footnote_ofs = ds_length (&tmp); + for (size_t i = 0; i < cell->n_footnotes; i++) + { + if (i) + ds_put_byte (&tmp, ','); + ds_put_cstr (&tmp, cell->footnotes[i]->marker); + } + + /* Allow footnote markers to occupy the right margin. That way, numbers + in the column are still aligned. */ + if (cell->n_footnotes && halign == TABLE_HALIGN_RIGHT) + { + /* Measure the width of the footnote marker, so we know how much we + need to make room for. */ + pango_layout_set_text (layout, ds_cstr (&tmp) + footnote_ofs, + ds_length (&tmp) - footnote_ofs); + + PangoAttrList *fn_attrs = pango_attr_list_new (); + pango_attr_list_insert ( + fn_attrs, pango_attr_scale_new (PANGO_SCALE_SMALL)); + pango_attr_list_insert (fn_attrs, pango_attr_rise_new (3000)); + pango_layout_set_attributes (layout, fn_attrs); + pango_attr_list_unref (fn_attrs); + int footnote_width = get_layout_dimension (layout, X); + + /* Bound the adjustment by the width of the right margin. */ + int right_margin = px_to_xr (cell_style->margin[X][R]); + int footnote_adjustment = MIN (footnote_width, right_margin); + + /* Adjust the bounding box. */ + if (options & TAB_ROTATE) + footnote_adjustment = -footnote_adjustment; + bb[X][R] += footnote_adjustment; + + /* Clean up. */ + pango_layout_set_attributes (layout, NULL); + } + + /* Set attributes. */ + if (!attrs) + attrs = pango_attr_list_new (); + add_attr (attrs, pango_attr_font_desc_new (desc), subscript_ofs, + PANGO_ATTR_INDEX_TO_TEXT_END); + add_attr (attrs, pango_attr_scale_new (PANGO_SCALE_SMALL), + subscript_ofs, PANGO_ATTR_INDEX_TO_TEXT_END); + if (cell->n_subscripts) + add_attr (attrs, pango_attr_rise_new (-3000), subscript_ofs, + superscript_ofs - subscript_ofs); + if (cell->superscript || cell->n_footnotes) + add_attr (attrs, pango_attr_rise_new (3000), superscript_ofs, + PANGO_ATTR_INDEX_TO_TEXT_END); + } + + /* Set the attributes, if any. */ + if (attrs) + { + pango_layout_set_attributes (layout, attrs); + pango_attr_list_unref (attrs); + } + + /* Set the text. */ + if (ds_is_empty (&tmp)) + pango_layout_set_text (layout, text, -1); + else + pango_layout_set_text (layout, ds_cstr (&tmp), ds_length (&tmp)); + ds_destroy (&tmp); + + pango_layout_set_alignment (layout, + (halign == TABLE_HALIGN_RIGHT ? PANGO_ALIGN_RIGHT + : halign == TABLE_HALIGN_LEFT ? PANGO_ALIGN_LEFT + : PANGO_ALIGN_CENTER)); + pango_layout_set_width ( + layout, + bb[X][1] == INT_MAX ? -1 : xr_to_pango (bb[X][1] - bb[X][0])); + pango_layout_set_wrap (layout, PANGO_WRAP_WORD); + + if (clip[H][0] != clip[H][1]) + { + cairo_save (xr->cairo); + if (!(options & TAB_ROTATE)) + xr_clip (xr, clip); + if (options & TAB_ROTATE) + { + cairo_translate (xr->cairo, + xr_to_pt (bb[H][0]), + xr_to_pt (bb[V][1])); + cairo_rotate (xr->cairo, -M_PI_2); + } + else + cairo_translate (xr->cairo, + xr_to_pt (bb[H][0]), + xr_to_pt (bb[V][0])); + pango_cairo_show_layout (xr->cairo, layout); + + /* 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) + { + PangoLayoutIter *iter; + iter = pango_layout_get_iter (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); + xr_draw_rectangle ( + xr, + pango_to_xr (extents.x), + pango_to_xr (extents.y), + pango_to_xr (extents.x + extents.width), + pango_to_xr (extents.y + extents.height)); + cairo_restore (xr->cairo); + } + while (pango_layout_iter_next_line (iter)); + pango_layout_iter_free (iter); + } + + cairo_restore (xr->cairo); + } + + int size[TABLE_N_AXES]; + pango_layout_get_size (layout, &size[H], &size[V]); + int w = pango_to_xr (size[X]); + int h = pango_to_xr (size[Y]); + if (w > *widthp) + *widthp = w; + if (bb[V][0] + h >= bb[V][1] && !(options & TAB_ROTATE)) + { + PangoLayoutIter *iter; + int best = 0; + + /* Choose a breakpoint between lines instead of in the middle of one. */ + iter = pango_layout_get_iter (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 = bb[V][0] + extents.y + extents.height; + if (bottom < bb[V][1]) + { + if (brk && clip[H][0] != clip[H][1]) + best = bottom; + if (brk) + *brk = bottom; + } + else + break; + } + while (pango_layout_iter_next_line (iter)); + pango_layout_iter_free (iter); + + /* If enabled, draws a green line across the chosen breakpoint, which can + be useful for debugging issues with breaking. */ + if (0) + { + if (best) + xr_draw_line (xr, 0, best, + xr->style->size[H], best, + RENDER_LINE_SINGLE, + &(struct cell_color) CELL_COLOR (0, 255, 0)); + } + } + + pango_layout_set_attributes (layout, NULL); + + if (desc != xr->style->fonts[font_type]) + pango_font_description_free (desc); + g_object_unref (G_OBJECT (layout)); + + return h; +} + +static void +xr_layout_cell (struct xr_fsm *xr, const struct table_cell *cell, + int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], + int *width, int *height, int *brk) +{ + *width = 0; + *height = 0; + + /* If enabled, draws a blue rectangle around the cell extents, which can be + useful for debugging layout. */ + if (0) + { + if (clip[H][0] != clip[H][1]) + { + cairo_save (xr->cairo); + cairo_set_source_rgb (xr->cairo, 0, 0, 1); + xr_draw_rectangle (xr, bb[H][0], bb[V][0], bb[H][1], bb[V][1]); + cairo_restore (xr->cairo); + } + } + + if (brk) + *brk = bb[V][0]; + *height = xr_layout_cell_text (xr, cell, bb, clip, width, brk); +} + +#if 0 +static bool +xr_table_render (struct xr_render_fsm *fsm, struct xr_fsm *xr) +{ + struct xr_table_state *ts = UP_CAST (fsm, struct xr_table_state, fsm); + + while (render_pager_has_next (ts->p)) + { + int used; + + used = render_pager_draw_next (ts->p, xr->length); + if (!used) + { + assert (xr->y > 0); + return true; + } + else + xr->y += used; + } + return false; +} + +static void +xr_table_destroy (struct xr_render_fsm *fsm) +{ + struct xr_table_state *ts = UP_CAST (fsm, struct xr_table_state, fsm); + + render_pager_destroy (ts->p); + free (ts); +} + +static struct xr_render_fsm * +xr_render_table (struct xr_fsm *xr, struct table_item *table_item) +{ + struct xr_table_state *ts; + + ts = xmalloc (sizeof *ts); + ts->fsm.render = xr_table_render; + ts->fsm.destroy = xr_table_destroy; + + if (xr->y > 0) + xr->y += xr->char_height; + + ts->p = render_pager_create (xr->params, table_item); + table_item_unref (table_item); + + return &ts->fsm; +} + +static bool +xr_eject_render (struct xr_render_fsm *fsm UNUSED, struct xr_fsm *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; +} + +#define CHART_WIDTH 500 +#define CHART_HEIGHT 375 + +static struct xr_render_fsm * +xr_render_text (struct xr_fsm *xr, const struct text_item *text_item) +{ + enum text_item_type type = text_item_get_type (text_item); + + switch (type) + { + case TEXT_ITEM_PAGE_TITLE: + break; + + case TEXT_ITEM_EJECT_PAGE: + if (xr->y > 0) + return xr_render_eject (); + break; + + default: + return xr_render_table ( + xr, text_item_to_table_item (text_item_ref (text_item))); + } + + return NULL; +} +#endif + +#define CHART_WIDTH 500 +#define CHART_HEIGHT 375 + +struct xr_fsm * +xr_fsm_create (const struct output_item *item_, + const struct xr_fsm_style *style, cairo_t *cr) +{ + if (is_page_setup_item (item_) + || is_group_open_item (item_) + || is_group_close_item (item_)) + return NULL; + + struct output_item *item; + if (is_table_item (item_) + || is_chart_item (item_) + || is_page_eject_item (item_)) + item = output_item_ref (item_); + else if (is_message_item (item_)) + item = table_item_super ( + text_item_to_table_item ( + message_item_to_text_item ( + to_message_item ( + output_item_ref (item_))))); + else if (is_text_item (item_)) + { + if (to_text_item (item_)->type == TEXT_ITEM_PAGE_TITLE) + return NULL; + + item = table_item_super ( + text_item_to_table_item ( + to_text_item ( + output_item_ref (item_)))); + } + else if (is_group_open_item (item_)) + { + item = table_item_super ( + text_item_to_table_item ( + text_item_create (TEXT_ITEM_TITLE, + to_group_open_item (item_)->command_name))); + } + else + NOT_REACHED (); + assert (is_table_item (item) + || is_chart_item (item) + || is_page_eject_item (item)); + + static const struct render_ops xrr_render_ops = { + .measure_cell_width = xrr_measure_cell_width, + .measure_cell_height = xrr_measure_cell_height, + .adjust_break = xrr_adjust_break, + .draw_line = xrr_draw_line, + .draw_cell = xrr_draw_cell, + }; + + enum { LW = XR_LINE_WIDTH, LS = XR_LINE_SPACE }; + static const int xr_line_widths[RENDER_N_LINES] = + { + [RENDER_LINE_NONE] = 0, + [RENDER_LINE_SINGLE] = LW, + [RENDER_LINE_DASHED] = LW, + [RENDER_LINE_THICK] = LW * 2, + [RENDER_LINE_THIN] = LW / 2, + [RENDER_LINE_DOUBLE] = 2 * LW + LS, + }; + + struct xr_fsm *fsm = xmalloc (sizeof *fsm); + *fsm = (struct xr_fsm) { + .style = xr_fsm_style_ref (style), + .item = item, + .rp = { + .ops = &xrr_render_ops, + .aux = fsm, + .size = { [H] = style->size[H], [V] = style->size[V] }, + /* XXX font_size */ + .line_widths = xr_line_widths, + .min_break = { [H] = style->min_break[H], [V] = style->min_break[V] }, + .supports_margins = true, + .rtl = render_direction_rtl (), + } + }; + + if (is_table_item (item)) + { + fsm->cairo = cr; + fsm->p = render_pager_create (&fsm->rp, to_table_item (item)); + fsm->cairo = NULL; + } + + for (int i = 0; i < XR_N_FONTS; i++) + { + PangoLayout *layout = pango_cairo_create_layout (cr); + pango_layout_set_font_description (layout, style->fonts[i]); + + pango_layout_set_text (layout, "0", 1); + + int char_size[TABLE_N_AXES]; + pango_layout_get_size (layout, &char_size[H], &char_size[V]); + for (int j = 0; j < TABLE_N_AXES; j++) + { + int csj = pango_to_xr (char_size[j]); + fsm->rp.font_size[j] = MAX (fsm->rp.font_size[j], csj); + } + + g_object_unref (G_OBJECT (layout)); + } + + return fsm; +} + +void +xr_fsm_destroy (struct xr_fsm *fsm) +{ + if (fsm) + { + xr_fsm_style_unref (fsm->style); + output_item_unref (fsm->item); + render_pager_destroy (fsm->p); + assert (!fsm->cairo); + free (fsm); + } +} + + +/* This is primarily meant for use with screen rendering since the result is a + fixed value for charts. */ +void +xr_fsm_measure (struct xr_fsm *fsm, cairo_t *cr, int *wp, int *hp) +{ + int w, h; + + if (is_table_item (fsm->item)) + { + fsm->cairo = cr; + w = render_pager_get_size (fsm->p, H) / XR_POINT; + h = render_pager_get_size (fsm->p, V) / XR_POINT; + fsm->cairo = NULL; + } + else if (is_chart_item (fsm->item)) + { + w = CHART_WIDTH; + h = CHART_HEIGHT; + } + else + NOT_REACHED (); + + if (wp) + *wp = w; + if (hp) + *hp = h; +} + +static int +xr_fsm_draw_table (struct xr_fsm *fsm, int space) +{ + int used = 0; + while (render_pager_has_next (fsm->p)) + { + int chunk = render_pager_draw_next (fsm->p, space - used); + if (!chunk) + return used; + + used += chunk; + cairo_translate (fsm->cairo, 0, chunk); + } + return used; +} + +static void +xr_draw_chart (const struct chart_item *chart_item, cairo_t *cr, + double width, double height) +{ + struct xrchart_geometry geom; + + cairo_translate (cr, 0, height); + cairo_scale (cr, 1.0, -1.0); + xrchart_geometry_init (cr, &geom, width, height); + if (is_boxplot (chart_item)) + xrchart_draw_boxplot (chart_item, cr, &geom); + else if (is_histogram_chart (chart_item)) + xrchart_draw_histogram (chart_item, cr, &geom); + else if (is_np_plot_chart (chart_item)) + 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); +} + +static int +xr_fsm_draw_chart (struct xr_fsm *fsm, int space) +{ + const int chart_height = 0.8 * MIN (fsm->rp.size[H], fsm->rp.size[V]); + if (space < chart_height) + return 0; + + fsm->done = true; + xr_draw_chart (to_chart_item (fsm->item), fsm->cairo, + xr_to_pt (fsm->rp.size[H]), xr_to_pt (chart_height)); + return chart_height; +} + +static int +xr_fsm_draw_eject (struct xr_fsm *fsm, int space) +{ + if (space >= fsm->rp.size[V]) + fsm->done = true; + return 0; +} + +void +xr_fsm_draw_all (struct xr_fsm *fsm, cairo_t *cr) +{ + xr_fsm_draw_region (fsm, cr, 0, 0, INT_MAX, INT_MAX); +} + +static int +mul_XR_POINT (int x) +{ + return (x >= INT_MAX / XR_POINT ? INT_MAX + : x <= INT_MIN / XR_POINT ? INT_MIN + : x * XR_POINT); +} + +void +xr_fsm_draw_region (struct xr_fsm *fsm, cairo_t *cr, + int x, int y, int w, int h) +{ + if (is_table_item (fsm->item)) + { + fsm->cairo = cr; + render_pager_draw_region (fsm->p, mul_XR_POINT (x), mul_XR_POINT (y), + mul_XR_POINT (w), mul_XR_POINT (h)); + fsm->cairo = NULL; + } + else if (is_chart_item (fsm->item)) + xr_draw_chart (to_chart_item (fsm->item), cr, CHART_WIDTH, CHART_HEIGHT); + else if (is_page_eject_item (fsm->item)) + { + /* Nothing to do. */ + } + else + NOT_REACHED (); +} + +int +xr_fsm_draw_slice (struct xr_fsm *fsm, cairo_t *cr, int space) +{ + if (xr_fsm_is_empty (fsm)) + return 0; + + cairo_save (cr); + fsm->cairo = cr; + int used = (is_table_item (fsm->item) ? xr_fsm_draw_table (fsm, space) + : is_chart_item (fsm->item) ? xr_fsm_draw_chart (fsm, space) + : is_page_eject_item (fsm->item) ? xr_fsm_draw_eject (fsm, space) + : (abort (), 0)); + fsm->cairo = NULL; + cairo_restore (cr); + + return used; +} + + +bool +xr_fsm_is_empty (const struct xr_fsm *fsm) +{ + return (is_table_item (fsm->item) + ? !render_pager_has_next (fsm->p) + : fsm->done); +} diff --git a/src/output/cairo-fsm.h b/src/output/cairo-fsm.h new file mode 100644 index 0000000000..60a6efb489 --- /dev/null +++ b/src/output/cairo-fsm.h @@ -0,0 +1,69 @@ +/* PSPP - a program for statistical analysis. + Copyright (C) 2009, 2010, 2014, 2020 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef OUTPUT_CAIRO_FSM_H +#define OUTPUT_CAIRO_FSM_H 1 + +#include + +#ifdef HAVE_CAIRO + +#include +#include +#include "output/table.h" + +struct xr_fsm; +struct output_item; + +enum xr_font_type + { + XR_FONT_PROPORTIONAL, + XR_FONT_FIXED, + XR_N_FONTS + }; + +struct xr_fsm_style + { + int ref_cnt; + + int size[TABLE_N_AXES]; /* Page size. */ + int min_break[TABLE_N_AXES]; /* Minimum cell size to allow breaking. */ + PangoFontDescription *fonts[XR_N_FONTS]; + bool use_system_colors; + bool transparent; + double font_scale; + }; +struct xr_fsm_style *xr_fsm_style_ref (const struct xr_fsm_style *); +void xr_fsm_style_unref (struct xr_fsm_style *); +bool xr_fsm_style_equals (const struct xr_fsm_style *, + const struct xr_fsm_style *); + +struct xr_fsm *xr_fsm_create (const struct output_item *, + const struct xr_fsm_style *, + cairo_t *); +void xr_fsm_destroy (struct xr_fsm *); + +void xr_fsm_measure (struct xr_fsm *, cairo_t *, int *w, int *h); +void xr_fsm_draw_all (struct xr_fsm *, cairo_t *); +void xr_fsm_draw_region (struct xr_fsm *, cairo_t *, + int x, int y, int w, int h); + +int xr_fsm_draw_slice (struct xr_fsm *, cairo_t *, int space); +bool xr_fsm_is_empty (const struct xr_fsm *); + +#endif /* HAVE_CAIRO */ + +#endif /* output/cairo-fsm.h */ diff --git a/src/output/cairo.c b/src/output/cairo.c index b02e8974f8..101040fec7 100644 --- a/src/output/cairo.c +++ b/src/output/cairo.c @@ -29,6 +29,7 @@ #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" @@ -53,6 +54,7 @@ #include #include #include + #include #include #include @@ -86,13 +88,6 @@ xr_to_pt (int x) return x / (double) XR_POINT; } -/* Conversion from 1/96" units ("pixels") to Cairo/Pango units. */ -static int -px_to_xr (int x) -{ - return x * (PANGO_SCALE * 72 / 96); -} - /* 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. */ @@ -105,14 +100,6 @@ enum xr_output_type XR_SVG }; -/* Cairo fonts. */ -enum xr_font_type - { - XR_FONT_PROPORTIONAL, - XR_FONT_FIXED, - XR_N_FONTS - }; - /* A font for use with Cairo. */ struct xr_font { @@ -120,18 +107,6 @@ struct xr_font PangoLayout *layout; }; -/* 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 { @@ -162,37 +137,20 @@ struct xr_driver int headings_height[2]; /* Internal state. */ - struct render_params *params; + 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 xr_driver_destroy_fsm (struct xr_driver *); static void xr_driver_run_fsm (struct xr_driver *); - -static void xr_draw_line (void *, int bb[TABLE_N_AXES][2], - enum render_line_style styles[TABLE_N_AXES][2], - struct cell_color colors[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 color_idx, - int bb[TABLE_N_AXES][2], int valign_offset, - int spill[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 *); /* Output driver basics. */ @@ -501,40 +459,20 @@ xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) pango_layout_set_font_description (font->layout, font->desc); } - if (xr->params == NULL) + if (xr->style == NULL) { - static const struct render_ops xr_render_ops = { - .draw_line = xr_draw_line, - .measure_cell_width = xr_measure_cell_width, - .measure_cell_height = xr_measure_cell_height, - .adjust_break = xr_adjust_break, - .draw_cell = xr_draw_cell, + 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, }; - xr->params = xmalloc (sizeof *xr->params); - xr->params->ops = &xr_render_ops; - xr->params->aux = xr; - xr->params->size[H] = xr->width; - xr->params->size[V] = xr->length; - xr->params->font_size[H] = xr->char_width; - xr->params->font_size[V] = xr->char_height; - - enum { LW = XR_LINE_WIDTH, LS = XR_LINE_SPACE }; - static const int xr_line_widths[RENDER_N_LINES] = - { - [RENDER_LINE_NONE] = 0, - [RENDER_LINE_SINGLE] = LW, - [RENDER_LINE_DASHED] = LW, - [RENDER_LINE_THICK] = LW * 2, - [RENDER_LINE_THIN] = LW / 2, - [RENDER_LINE_DOUBLE] = 2 * LW + LS, - }; - xr->params->line_widths = xr_line_widths; - - for (int i = 0; i < TABLE_N_AXES; i++) - xr->params->min_break[i] = xr->min_break[i]; - xr->params->supports_margins = true; - xr->params->rtl = render_direction_rtl (); + for (size_t i = 0; i < XR_N_FONTS; i++) + xr->style->fonts[i] = pango_font_description_copy (xr->fonts[i].desc); } if (!xr->systemcolors) @@ -631,7 +569,7 @@ xr_destroy (struct output_driver *driver) g_object_unref (font->layout); } - free (xr->params); + xr_fsm_style_unref (xr->style); free (xr); } @@ -763,7 +701,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); } @@ -786,768 +724,24 @@ 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], - int *width, int *height, int *brk); - -static void -set_source_rgba (cairo_t *cairo, const struct cell_color *color) -{ - cairo_set_source_rgba (cairo, - color->r / 255., color->g / 255., color->b / 255., - color->alpha / 255.); -} - -static void -dump_line (struct xr_driver *xr, int x0, int y0, int x1, int y1, int style, - const struct cell_color *color) -{ - cairo_new_path (xr->cairo); - if (!xr->systemcolors) - set_source_rgba (xr->cairo, color); - cairo_set_line_width ( - xr->cairo, - xr_to_pt (style == RENDER_LINE_THICK ? XR_LINE_WIDTH * 2 - : style == RENDER_LINE_THIN ? XR_LINE_WIDTH / 2 - : XR_LINE_WIDTH)); - 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); -} - -static void UNUSED -dump_rectangle (struct xr_driver *xr, int x0, int y0, int x1, int y1) -{ - cairo_new_path (xr->cairo); - cairo_set_line_width (xr->cairo, xr_to_pt (XR_LINE_WIDTH)); - cairo_close_path (xr->cairo); - cairo_stroke (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 (y0 + xr->y)); - cairo_line_to (xr->cairo, xr_to_pt (x1), xr_to_pt (y1 + xr->y)); - cairo_line_to (xr->cairo, xr_to_pt (x0), xr_to_pt (y1 + xr->y)); -} - -static void -fill_rectangle (struct xr_driver *xr, int x0, int y0, int x1, int y1) -{ - cairo_new_path (xr->cairo); - cairo_set_line_width (xr->cairo, xr_to_pt (XR_LINE_WIDTH)); - cairo_rectangle (xr->cairo, - xr_to_pt (x0), xr_to_pt (y0 + xr->y), - xr_to_pt (x1 - x0), xr_to_pt (y1 - y0)); - cairo_fill (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, - const struct cell_color *left_color, - const struct cell_color *right_color, - bool shorten) -{ - if (left != RENDER_LINE_NONE && right != RENDER_LINE_NONE && !shorten - && cell_color_equal (left_color, right_color)) - dump_line (xr, x0, y, x3, y, left, left_color); - else - { - if (left != RENDER_LINE_NONE) - dump_line (xr, x0, y, shorten ? x1 : x2, y, left, left_color); - if (right != RENDER_LINE_NONE) - dump_line (xr, shorten ? x2 : x1, y, x3, y, right, right_color); - } -} - -/* 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, - const struct cell_color *top_color, - const struct cell_color *bottom_color, - bool shorten) -{ - if (top != RENDER_LINE_NONE && bottom != RENDER_LINE_NONE && !shorten - && cell_color_equal (top_color, bottom_color)) - dump_line (xr, x, y0, x, y3, top, top_color); - else - { - if (top != RENDER_LINE_NONE) - dump_line (xr, x, y0, x, shorten ? y1 : y2, top, top_color); - if (bottom != RENDER_LINE_NONE) - dump_line (xr, x, shorten ? y2 : y1, x, y3, bottom, bottom_color); - } -} - -static void -xr_draw_line (void *xr_, int bb[TABLE_N_AXES][2], - enum render_line_style styles[TABLE_N_AXES][2], - struct cell_color colors[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 bottom = styles[H][1]; - - int start_side = render_direction_rtl(); - int end_side = !start_side; - const int start_of_line = styles[V][start_side]; - const int end_of_line = styles[V][end_side]; - const struct cell_color *top_color = &colors[H][0]; - const struct cell_color *bottom_color = &colors[H][1]; - const struct cell_color *start_color = &colors[V][start_side]; - const struct cell_color *end_color = &colors[V][end_side]; - - /* 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 = start_of_line == RENDER_LINE_DOUBLE || end_of_line == 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 = start_of_line == RENDER_LINE_DOUBLE; - bool shorten_x2_lines = end_of_line == 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, start_of_line, end_of_line, - start_color, end_color, shorten_yc_line); - else - { - horz_line (xr, x0, x1, x2, x3, y1, start_of_line, end_of_line, - start_color, end_color, shorten_y1_lines); - horz_line (xr, x0, x1, x2, x3, y2, start_of_line, end_of_line, - start_color, end_color, shorten_y2_lines); - } - - if (!double_vert) - vert_line (xr, y0, y1, y2, y3, xc, top, bottom, top_color, bottom_color, - shorten_xc_line); - else - { - vert_line (xr, y0, y1, y2, y3, x1, top, bottom, top_color, bottom_color, - shorten_x1_lines); - vert_line (xr, y0, y1, y2, y3, x2, top, bottom, top_color, bottom_color, - 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, max_width, &h, NULL); - - bb[H][1] = 1; - xr_layout_cell (xr, cell, bb, clip, min_width, &h, NULL); - - if (*min_width > 0) - *min_width += px_to_xr (cell->style->cell_style.margin[H][0] - + cell->style->cell_style.margin[H][1]); - if (*max_width > 0) - *max_width += px_to_xr (cell->style->cell_style.margin[H][0] - + cell->style->cell_style.margin[H][1]); -} - -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 - px_to_xr (cell->style->cell_style.margin[H][0] - + cell->style->cell_style.margin[H][1]); - 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, &w, &h, NULL); - h += px_to_xr (cell->style->cell_style.margin[V][0] - + cell->style->cell_style.margin[V][1]); - return h; -} - -static void xr_clip (struct xr_driver *, int clip[TABLE_N_AXES][2]); - -static void -xr_draw_cell (void *xr_, const struct table_cell *cell, int color_idx, - int bb[TABLE_N_AXES][2], int valign_offset, - int spill[TABLE_N_AXES][2], - int clip[TABLE_N_AXES][2]) -{ - struct xr_driver *xr = xr_; - int w, h, brk; - - if (!xr->transparent) - { - cairo_save (xr->cairo); - int bg_clip[TABLE_N_AXES][2]; - for (int axis = 0; axis < TABLE_N_AXES; axis++) - { - bg_clip[axis][0] = clip[axis][0]; - if (bb[axis][0] == clip[axis][0]) - bg_clip[axis][0] -= spill[axis][0]; - - bg_clip[axis][1] = clip[axis][1]; - if (bb[axis][1] == clip[axis][1]) - bg_clip[axis][1] += spill[axis][1]; - } - xr_clip (xr, bg_clip); - set_source_rgba (xr->cairo, &cell->style->font_style.bg[color_idx]); - fill_rectangle (xr, - bb[H][0] - spill[H][0], - bb[V][0] - spill[V][0], - bb[H][1] + spill[H][1], - bb[V][1] + spill[V][1]); - cairo_restore (xr->cairo); - } - cairo_save (xr->cairo); - if (!xr->systemcolors) - set_source_rgba (xr->cairo, &cell->style->font_style.fg[color_idx]); - - bb[V][0] += valign_offset; - - for (int axis = 0; axis < TABLE_N_AXES; axis++) - { - bb[axis][0] += px_to_xr (cell->style->cell_style.margin[axis][0]); - bb[axis][1] -= px_to_xr (cell->style->cell_style.margin[axis][1]); - } - if (bb[H][0] < bb[H][1] && bb[V][0] < bb[V][1]) - xr_layout_cell (xr, cell, bb, clip, &w, &h, &brk); - cairo_restore (xr->cairo); -} - -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; - - bb[H][0] = 0; - bb[H][1] = width - px_to_xr (cell->style->cell_style.margin[H][0] - + cell->style->cell_style.margin[H][1]); - if (bb[H][1] <= 0) - return 0; - bb[V][0] = 0; - bb[V][1] = height - px_to_xr (cell->style->cell_style.margin[V][0] - + cell->style->cell_style.margin[V][1]); - 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_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]); - 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); - } -} - -static void -add_attr (PangoAttrList *list, PangoAttribute *attr, - guint start_index, guint end_index) -{ - attr->start_index = start_index; - attr->end_index = end_index; - pango_attr_list_insert (list, attr); -} - -static void -markup_escape (struct string *out, unsigned int options, - const char *in, size_t len) -{ - if (!(options & TAB_MARKUP)) - { - ds_put_substring (out, ss_buffer (in, len == -1 ? strlen (in) : len)); - return; - } - - while (len-- > 0) - { - int c = *in++; - switch (c) - { - case 0: - return; - case '&': - ds_put_cstr (out, "&"); - break; - case '<': - ds_put_cstr (out, "<"); - break; - case '>': - ds_put_cstr (out, ">"); - break; - default: - ds_put_byte (out, c); - break; - } - } -} - -static int -get_layout_dimension (PangoLayout *layout, enum table_axis axis) -{ - int size[TABLE_N_AXES]; - pango_layout_get_size (layout, &size[H], &size[V]); - return size[axis]; -} - -static int -xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, - int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], - int *widthp, int *brk) -{ - const struct font_style *font_style = &cell->style->font_style; - const struct cell_style *cell_style = &cell->style->cell_style; - unsigned int options = cell->options; - - enum table_axis X = options & TAB_ROTATE ? V : H; - enum table_axis Y = !X; - int R = options & TAB_ROTATE ? 0 : 1; - - struct xr_font *font = (options & TAB_FIX ? &xr->fonts[XR_FONT_FIXED] - : &xr->fonts[XR_FONT_PROPORTIONAL]); - struct xr_font local_font; - if (font_style->typeface) - { - PangoFontDescription *desc = parse_font ( - font_style->typeface, - font_style->size ? font_style->size * 1000 * xr->font_scale : 10000, - font_style->bold, font_style->italic); - if (desc) - { - PangoLayout *layout = pango_cairo_create_layout (xr->cairo); - pango_layout_set_font_description (layout, desc); - - local_font.desc = desc; - local_font.layout = layout; - font = &local_font; - } - } - - const char *text = cell->text; - enum table_halign halign = table_halign_interpret ( - cell_style->halign, cell->options & TAB_NUMERIC); - if (cell_style->halign == TABLE_HALIGN_DECIMAL && !(options & TAB_ROTATE)) - { - int margin_adjustment = -px_to_xr (cell_style->decimal_offset); - - const char *decimal = strrchr (text, cell_style->decimal_char); - if (decimal) - { - pango_layout_set_text (font->layout, decimal, strlen (decimal)); - pango_layout_set_width (font->layout, -1); - margin_adjustment += get_layout_dimension (font->layout, H); - } - - if (margin_adjustment < 0) - bb[H][1] += margin_adjustment; - } - - struct string tmp = DS_EMPTY_INITIALIZER; - PangoAttrList *attrs = NULL; - - /* Deal with an oddity of the Unicode line-breaking algorithm (or perhaps in - Pango's implementation of it): it will break after a period or a comma - that precedes a digit, e.g. in ".000" it will break after the period. - This code looks for such a situation and inserts a U+2060 WORD JOINER - to prevent the break. - - This isn't necessary when the decimal point is between two digits - (e.g. "0.000" won't be broken) or when the display width is not limited so - that word wrapping won't happen. - - It isn't necessary to look for more than one period or comma, as would - happen with grouping like 1,234,567.89 or 1.234.567,89 because if groups - are present then there will always be a digit on both sides of every - period and comma. */ - if (options & TAB_MARKUP) - { - PangoAttrList *new_attrs; - char *new_text; - if (pango_parse_markup (text, -1, 0, &new_attrs, &new_text, NULL, NULL)) - { - attrs = new_attrs; - tmp.ss = ss_cstr (new_text); - tmp.capacity = tmp.ss.length; - } - else - { - /* XXX should we report the error? */ - ds_put_cstr (&tmp, text); - } - } - else if (options & TAB_ROTATE || bb[H][1] != INT_MAX) - { - const char *decimal = text + strcspn (text, ".,"); - if (decimal[0] - && c_isdigit (decimal[1]) - && (decimal == text || !c_isdigit (decimal[-1]))) - { - ds_extend (&tmp, strlen (text) + 16); - markup_escape (&tmp, options, text, decimal - text + 1); - ds_put_unichar (&tmp, 0x2060 /* U+2060 WORD JOINER */); - markup_escape (&tmp, options, decimal + 1, -1); - } - } - - if (font_style->underline) - { - if (!attrs) - attrs = pango_attr_list_new (); - pango_attr_list_insert (attrs, pango_attr_underline_new ( - PANGO_UNDERLINE_SINGLE)); - } - - if (cell->n_footnotes || cell->n_subscripts || cell->superscript) - { - /* If we haven't already put TEXT into tmp, do it now. */ - if (ds_is_empty (&tmp)) - { - ds_extend (&tmp, strlen (text) + 16); - markup_escape (&tmp, options, text, -1); - } - - size_t subscript_ofs = ds_length (&tmp); - for (size_t i = 0; i < cell->n_subscripts; i++) - { - if (i) - ds_put_byte (&tmp, ','); - ds_put_cstr (&tmp, cell->subscripts[i]); - } - - size_t superscript_ofs = ds_length (&tmp); - if (cell->superscript) - ds_put_cstr (&tmp, cell->superscript); - - size_t footnote_ofs = ds_length (&tmp); - for (size_t i = 0; i < cell->n_footnotes; i++) - { - if (i) - ds_put_byte (&tmp, ','); - ds_put_cstr (&tmp, cell->footnotes[i]->marker); - } - - /* Allow footnote markers to occupy the right margin. That way, numbers - in the column are still aligned. */ - if (cell->n_footnotes && halign == TABLE_HALIGN_RIGHT) - { - /* Measure the width of the footnote marker, so we know how much we - need to make room for. */ - pango_layout_set_text (font->layout, ds_cstr (&tmp) + footnote_ofs, - ds_length (&tmp) - footnote_ofs); - - PangoAttrList *fn_attrs = pango_attr_list_new (); - pango_attr_list_insert ( - fn_attrs, pango_attr_scale_new (PANGO_SCALE_SMALL)); - pango_attr_list_insert (fn_attrs, pango_attr_rise_new (3000)); - pango_layout_set_attributes (font->layout, fn_attrs); - pango_attr_list_unref (fn_attrs); - int footnote_width = get_layout_dimension (font->layout, X); - - /* Bound the adjustment by the width of the right margin. */ - int right_margin = px_to_xr (cell_style->margin[X][R]); - int footnote_adjustment = MIN (footnote_width, right_margin); - - /* Adjust the bounding box. */ - if (options & TAB_ROTATE) - footnote_adjustment = -footnote_adjustment; - bb[X][R] += footnote_adjustment; - - /* Clean up. */ - pango_layout_set_attributes (font->layout, NULL); - } - - /* Set attributes. */ - if (!attrs) - attrs = pango_attr_list_new (); - add_attr (attrs, pango_attr_font_desc_new (font->desc), subscript_ofs, - PANGO_ATTR_INDEX_TO_TEXT_END); - add_attr (attrs, pango_attr_scale_new (PANGO_SCALE_SMALL), - subscript_ofs, PANGO_ATTR_INDEX_TO_TEXT_END); - if (cell->n_subscripts) - add_attr (attrs, pango_attr_rise_new (-3000), subscript_ofs, - superscript_ofs - subscript_ofs); - if (cell->superscript || cell->n_footnotes) - add_attr (attrs, pango_attr_rise_new (3000), superscript_ofs, - PANGO_ATTR_INDEX_TO_TEXT_END); - } - - /* Set the attributes, if any. */ - if (attrs) - { - pango_layout_set_attributes (font->layout, attrs); - pango_attr_list_unref (attrs); - } - - /* Set the text. */ - if (ds_is_empty (&tmp)) - pango_layout_set_text (font->layout, text, -1); - else - pango_layout_set_text (font->layout, ds_cstr (&tmp), ds_length (&tmp)); - ds_destroy (&tmp); - - pango_layout_set_alignment (font->layout, - (halign == TABLE_HALIGN_RIGHT ? PANGO_ALIGN_RIGHT - : halign == TABLE_HALIGN_LEFT ? PANGO_ALIGN_LEFT - : PANGO_ALIGN_CENTER)); - pango_layout_set_width ( - font->layout, - bb[X][1] == INT_MAX ? -1 : xr_to_pango (bb[X][1] - bb[X][0])); - pango_layout_set_wrap (font->layout, PANGO_WRAP_WORD); - - if (clip[H][0] != clip[H][1]) + if (xr->fsm != NULL) { cairo_save (xr->cairo); - if (!(options & TAB_ROTATE)) - xr_clip (xr, clip); - if (options & TAB_ROTATE) - { - cairo_translate (xr->cairo, - xr_to_pt (bb[H][0]), - xr_to_pt (bb[V][1] + xr->y)); - cairo_rotate (xr->cairo, -M_PI_2); - } - else - 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, this draws a blue rectangle around the extents of each - line of text, which can be rather useful for debugging layout - issues. */ - if (0) - { - 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), - pango_to_xr (extents.y) - xr->y, - pango_to_xr (extents.x + extents.width), - 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_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); - } - - int size[TABLE_N_AXES]; - pango_layout_get_size (font->layout, &size[H], &size[V]); - int w = pango_to_xr (size[X]); - int h = pango_to_xr (size[Y]); - if (w > *widthp) - *widthp = w; - if (bb[V][0] + h >= bb[V][1] && !(options & TAB_ROTATE)) - { - PangoLayoutIter *iter; - int best = 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 = bb[V][0] + extents.y + extents.height; - if (bottom < bb[V][1]) - { - if (brk && clip[H][0] != clip[H][1]) - best = bottom; - if (brk) - *brk = bottom; - } - else - break; - } - while (pango_layout_iter_next_line (iter)); - pango_layout_iter_free (iter); - - /* If enabled, draws a green line across the chosen breakpoint, which can - be useful for debugging issues with breaking. */ - if (0) - { - if (best) - dump_line (xr, -xr->left_margin, best, - xr->width + xr->right_margin, best, - RENDER_LINE_SINGLE, - &(struct cell_color) CELL_COLOR (0, 255, 0)); - } - } - - pango_layout_set_attributes (font->layout, NULL); - - if (font == &local_font) - { - g_object_unref (G_OBJECT (font->layout)); - pango_font_description_free (font->desc); - } - - return h; -} - -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) -{ - *width = 0; - *height = 0; - /* If enabled, draws a blue rectangle around the cell extents, which can be - useful for debugging layout. */ - if (0) - { - if (clip[H][0] != clip[H][1]) - { - cairo_save (xr->cairo); - cairo_set_source_rgb (xr->cairo, 0, 0, 1); - dump_rectangle (xr, bb[H][0], bb[V][0], bb[H][1], bb[V][1]); - cairo_restore (xr->cairo); - } + if (xr_fsm_is_empty (xr->fsm)) + xr_driver_destroy_fsm (xr); } - - if (brk) - *brk = bb[V][0]; - *height = xr_layout_cell_text (xr, cell, bb, clip, width, brk); } struct output_driver_factory pdf_driver_factory = @@ -1565,22 +759,6 @@ static const struct output_driver_class cairo_driver_class = xr_flush, }; -/* GUI rendering helpers. */ - -struct xr_rendering - { - struct output_item *item; - - /* Table items. */ - struct render_pager *p; - struct xr_driver *xr; - }; - -#define CHART_WIDTH 500 -#define CHART_HEIGHT 375 - - - struct xr_driver * xr_driver_create (cairo_t *cairo, struct string_map *options) { @@ -1600,111 +778,6 @@ xr_driver_destroy (struct xr_driver *xr) output_driver_destroy (&xr->driver); } } - -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 (text), NULL, 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); - char *s = msg_to_string (message_item_get_msg (message_item)); - r = xr_rendering_create_text (xr, s, cr); - free (s); - } - else if (is_table_item (item)) - { - r = xzalloc (sizeof *r); - r->item = output_item_ref (item); - r->xr = xr; - xr_set_cairo (xr, cr); - r->p = render_pager_create (xr->params, to_table_item (item)); - } - else if (is_chart_item (item)) - { - r = xzalloc (sizeof *r); - r->item = output_item_ref (item); - } - else if (is_group_open_item (item)) - r = xr_rendering_create_text (xr, to_group_open_item (item)->command_name, - cr); - - 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 (const struct xr_rendering *r, int *wp, int *hp) -{ - int w, h; - - if (is_table_item (r->item)) - { - w = render_pager_get_size (r->p, H) / XR_POINT; - h = render_pager_get_size (r->p, V) / XR_POINT; - } - else - { - w = CHART_WIDTH; - h = CHART_HEIGHT; - } - - if (wp) - *wp = w; - if (hp) - *hp = h; -} - -static void xr_draw_chart (const struct chart_item *, cairo_t *, - double x, double y, double width, double height); - -/* Draws onto CR */ -void -xr_rendering_draw (struct xr_rendering *r, cairo_t *cr, - int x0, int y0, int x1, int y1) -{ - if (is_table_item (r->item)) - { - struct xr_driver *xr = r->xr; - - xr_set_cairo (xr, cr); - - render_pager_draw_region (r->p, x0 * XR_POINT, y0 * XR_POINT, - (x1 - x0) * XR_POINT, (y1 - y0) * XR_POINT); - } - else - xr_draw_chart (to_chart_item (r->item), cr, - 0, 0, CHART_WIDTH, CHART_HEIGHT); -} - static void xr_draw_chart (const struct chart_item *chart_item, cairo_t *cr, double x, double y, double width, double height) @@ -1822,199 +895,3 @@ xr_draw_eps_chart (const struct chart_item *item, return file_name; } - - -struct xr_table_state - { - struct xr_render_fsm fsm; - struct render_pager *p; - }; - -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); - - while (render_pager_has_next (ts->p)) - { - int used; - - used = render_pager_draw_next (ts->p, xr->length - xr->y); - if (!used) - { - assert (xr->y > 0); - return true; - } - else - xr->y += used; - } - return false; -} - -static void -xr_table_destroy (struct xr_render_fsm *fsm) -{ - struct xr_table_state *ts = UP_CAST (fsm, struct xr_table_state, fsm); - - render_pager_destroy (ts->p); - free (ts); -} - -static struct xr_render_fsm * -xr_render_table (struct xr_driver *xr, struct table_item *table_item) -{ - struct xr_table_state *ts; - - ts = xmalloc (sizeof *ts); - ts->fsm.render = xr_table_render; - ts->fsm.destroy = xr_table_destroy; - - if (xr->y > 0) - xr->y += xr->char_height; - - ts->p = render_pager_create (xr->params, table_item); - table_item_unref (table_item); - - 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); - - const int chart_height = 0.8 * (xr->length < xr->width ? xr->length : xr->width); - - if (xr->y > xr->length - chart_height) - return true; - - if (xr->cairo != NULL) - { - xr_draw_chart (cs->chart_item, xr->cairo, - 0.0, - xr_to_pt (xr->y), - xr_to_pt (xr->width), - xr_to_pt (chart_height)); - } - xr->y += chart_height; - - 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_render_text (struct xr_driver *xr, const struct text_item *text_item) -{ - enum text_item_type type = text_item_get_type (text_item); - - switch (type) - { - case TEXT_ITEM_PAGE_TITLE: - break; - - default: - return xr_render_table ( - xr, text_item_to_table_item (text_item_ref (text_item))); - } - - return NULL; -} - -static struct xr_render_fsm * -xr_render_message (struct xr_driver *xr, - const struct message_item *message_item) -{ - char *s = msg_to_string (message_item_get_msg (message_item)); - struct text_item *item = text_item_create (TEXT_ITEM_LOG, s); - free (s); - return xr_render_table (xr, text_item_to_table_item (item)); -} - -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, table_item_ref (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_page_eject_item (output_item)) - return xr->y > 0 ? xr_render_eject () : NULL; - else if (is_message_item (output_item)) - return xr_render_message (xr, to_message_item (output_item)); - else - return NULL; -} - -bool -xr_draw_svg_file (struct xr_rendering *r, - const char *filename) -{ - int width, height; - g_assert (r); - xr_rendering_measure (r, &width, &height); - cairo_surface_t *surface = cairo_svg_surface_create (filename, width, height); - if (!surface) - { - g_error ("Could not create cairo svg surface with file %s", filename); - return FALSE; - } - cairo_t *cr = cairo_create (surface); - xr_rendering_draw (r, cr, 0, 0, width, height); - cairo_destroy (cr); - cairo_surface_destroy (surface); - return TRUE; -} diff --git a/src/output/cairo.h b/src/output/cairo.h index 7afd1fe660..6a0170038c 100644 --- a/src/output/cairo.h +++ b/src/output/cairo.h @@ -33,19 +33,6 @@ 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_destroy (struct xr_rendering *); - -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. @@ -95,11 +82,6 @@ char *xr_draw_eps_chart (const struct chart_item *item, const struct cell_color *fg, const struct cell_color *bg); - -/* Render to a svg file */ -bool xr_draw_svg_file (struct xr_rendering *r, - const char *filename); - #endif /* HAVE_CAIRO */ #endif /* output/cairo.h */ diff --git a/src/output/message-item.c b/src/output/message-item.c index 2acfa13bdf..c60d166779 100644 --- a/src/output/message-item.c +++ b/src/output/message-item.c @@ -23,6 +23,7 @@ #include "libpspp/message.h" #include "output/driver.h" #include "output/output-item-provider.h" +#include "output/text-item.h" #include "gl/xalloc.h" @@ -44,6 +45,13 @@ message_item_get_msg (const struct message_item *item) return item->msg; } +struct text_item * +message_item_to_text_item (struct message_item *message_item) +{ + return text_item_create_nocopy ( + TEXT_ITEM_LOG, msg_to_string (message_item_get_msg (message_item))); +} + static void message_item_destroy (struct output_item *output_item) { diff --git a/src/output/message-item.h b/src/output/message-item.h index b39afacf49..dca7e7d21a 100644 --- a/src/output/message-item.h +++ b/src/output/message-item.h @@ -41,6 +41,8 @@ struct message_item struct message_item *message_item_create (const struct msg *); const struct msg *message_item_get_msg (const struct message_item *); + +struct text_item *message_item_to_text_item (struct message_item *); /* This boilerplate for message_item, a subclass of output_item, was autogenerated by mk-class-boilerplate. */ diff --git a/src/ui/gui/psppire-output-view.c b/src/ui/gui/psppire-output-view.c index 433cf79b43..8ad1904184 100644 --- a/src/ui/gui/psppire-output-view.c +++ b/src/ui/gui/psppire-output-view.c @@ -18,6 +18,7 @@ #include "ui/gui/psppire-output-view.h" +#include #include #include @@ -26,6 +27,7 @@ #endif #include "libpspp/assertion.h" #include "libpspp/string-map.h" +#include "output/cairo-fsm.h" #include "output/cairo.h" #include "output/driver-provider.h" #include "output/driver.h" @@ -53,15 +55,14 @@ struct output_view_item struct psppire_output_view { - struct xr_driver *xr; - int font_height; + struct xr_fsm_style *style; + int object_spacing; GtkLayout *output; int render_width; int max_width; glong y; - struct string_map render_opts; GtkTreeView *overview; GtkTreePath *cur_group; @@ -114,7 +115,7 @@ draw_callback (GtkWidget *widget, cairo_t *cr, gpointer data) if (!gdk_cairo_get_clip_rectangle (cr, &clip)) return TRUE; - struct xr_rendering *r = g_object_get_data (G_OBJECT (widget), "rendering"); + struct xr_fsm *fsm = g_object_get_data (G_OBJECT (widget), "fsm"); /* Draw the background based on the state of the widget which can be selected or not selected */ @@ -127,83 +128,47 @@ draw_callback (GtkWidget *widget, cairo_t *cr, gpointer data) GdkRGBA color; gtk_style_context_get_color (context, state, &color); cairo_set_source_rgba (cr, color.red, color.green, color.blue, color.alpha); - xr_rendering_draw (r, cr, clip.x, clip.y, - clip.x + clip.width, clip.y + clip.height); + xr_fsm_draw_region (fsm, cr, clip.x, clip.y, clip.width, clip.height); return TRUE; } static void -free_rendering (gpointer rendering_) +free_fsm (gpointer fsm_) { - struct xr_rendering *rendering = rendering_; - xr_rendering_destroy (rendering); + struct xr_fsm *fsm = fsm_; + xr_fsm_destroy (fsm); } -static void -get_xr_options (struct psppire_output_view *view, struct string_map *options) +static struct xr_fsm_style * +get_xr_fsm_style (struct psppire_output_view *view) { - string_map_clear (options); - GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (view->output)); GtkStateFlags state = gtk_widget_get_state_flags (GTK_WIDGET (view->output)); - /* Use GTK+ default font as proportional font. */ - PangoFontDescription *font_desc; - gtk_style_context_get (context, state, "font", &font_desc, NULL); - char *font_name = pango_font_description_to_string (font_desc); - string_map_insert (options, "prop-font", font_name); - g_free (font_name); - - /* Derived emphasized font from proportional font. */ - pango_font_description_set_style (font_desc, PANGO_STYLE_ITALIC); - font_name = pango_font_description_to_string (font_desc); - string_map_insert (options, "emph-font", font_name); - g_free (font_name); - pango_font_description_free (font_desc); - - /* Pretend that the "page" has a reasonable width and a very big length, - so that most tables can be conveniently viewed on-screen with vertical - scrolling only. (The length should not be increased very much because - it is already close enough to INT_MAX when expressed as thousands of a - point.) */ - string_map_insert_nocopy (options, xstrdup ("paper-size"), - xasprintf ("%dx1000000pt", view->render_width)); - string_map_insert (options, "left-margin", "0"); - string_map_insert (options, "right-margin", "0"); - string_map_insert (options, "top-margin", "0"); - string_map_insert (options, "bottom-margin", "0"); - - string_map_insert (options, "transparent", "true"); - string_map_insert (options, "systemcolors", "true"); -} - -static void -create_xr (struct psppire_output_view *view) -{ - get_xr_options (view, &view->render_opts); - - struct string_map options; - string_map_clone (&options, &view->render_opts); - - GdkWindow *win = gtk_layout_get_bin_window (view->output); - cairo_region_t *region = gdk_window_get_visible_region (win); - GdkDrawingContext *ctx = gdk_window_begin_draw_frame (win, region); - cairo_t *cr = gdk_drawing_context_get_cairo_context (ctx); - - view->xr = xr_driver_create (cr, &options); - string_map_destroy (&options); - - struct text_item *text_item = text_item_create (TEXT_ITEM_LOG, "X"); - struct xr_rendering *r - = xr_rendering_create (view->xr, text_item_super (text_item), cr); - xr_rendering_measure (r, NULL, &view->font_height); - xr_rendering_destroy (r); - text_item_unref (text_item); + int xr_width = view->render_width * 1000; + + PangoFontDescription *pf; + gtk_style_context_get (context, state, "font", &pf, NULL); + PangoFontDescription *ff = pango_font_description_from_string ("Monospace"); + pango_font_description_set_size (ff, pango_font_description_get_size (pf)); + + struct xr_fsm_style *style = xmalloc (sizeof *style); + *style = (struct xr_fsm_style) { + .ref_cnt = 1, + .size = { [TABLE_HORZ] = xr_width, [TABLE_VERT] = INT_MAX }, + .min_break = { [TABLE_HORZ] = xr_width / 2, [TABLE_VERT] = 0 }, + .fonts = { + [XR_FONT_PROPORTIONAL] = pf, + [XR_FONT_FIXED] = ff, + }, + .use_system_colors = true, + .transparent = true, + .font_scale = 1.0, + }; - gdk_window_end_draw_frame (win, ctx); - cairo_region_destroy (region); + return style; } /* Return the horizontal position to place a widget whose @@ -310,11 +275,11 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, static void create_drawing_area (struct psppire_output_view *view, - GtkWidget *drawing_area, struct xr_rendering *r, + GtkWidget *drawing_area, struct xr_fsm *r, int tw, int th, const struct output_item *item) { g_object_set_data_full (G_OBJECT (drawing_area), - "rendering", r, free_rendering); + "fsm", r, free_fsm); g_signal_connect (drawing_area, "button-press-event", G_CALLBACK (button_press_event_cb), view); gtk_widget_add_events (drawing_area, GDK_BUTTON_PRESS_MASK); @@ -351,8 +316,8 @@ rerender (struct psppire_output_view *view) if (!view->n_items || ! gdkw) return; - if (view->xr == NULL) - create_xr (view); + if (!view->style) + view->style = get_xr_fsm_style (view); GdkWindow *win = gtk_layout_get_bin_window (view->output); cairo_region_t *region = gdk_window_get_visible_region (win); @@ -363,24 +328,24 @@ rerender (struct psppire_output_view *view) view->max_width = 0; for (item = view->items; item < &view->items[view->n_items]; item++) { - struct xr_rendering *r; + struct xr_fsm *r; GtkAllocation alloc; int tw, th; if (view->y > 0) - view->y += view->font_height / 2; + view->y += view->object_spacing; if (is_group_open_item (item->item)) continue; - r = xr_rendering_create (view->xr, item->item, cr); + r = xr_fsm_create (item->item, view->style, cr); if (r == NULL) { g_warn_if_reached (); continue; } - xr_rendering_measure (r, &tw, &th); + xr_fsm_measure (r, cr, &tw, &th); gint xpos = get_xpos (view, tw); @@ -392,7 +357,7 @@ rerender (struct psppire_output_view *view) else { g_object_set_data_full (G_OBJECT (item->drawing_area), - "rendering", r, free_rendering); + "fsm", r, free_fsm); gtk_widget_set_size_request (item->drawing_area, tw, th); gtk_layout_move (view->output, item->drawing_area, xpos, view->y); } @@ -421,8 +386,8 @@ rerender (struct psppire_output_view *view) } gtk_layout_set_size (view->output, - view->max_width + view->font_height, - view->y + view->font_height); + view->max_width + view->object_spacing, + view->y + view->object_spacing); gdk_window_end_draw_frame (win, ctx); cairo_region_destroy (region); @@ -472,17 +437,17 @@ psppire_output_view_put (struct psppire_output_view *view, { view_item->drawing_area = drawing_area = gtk_drawing_area_new (); - if (view->xr == NULL) - create_xr (view); + if (!view->style) + view->style = get_xr_fsm_style (view); cairo_region_t *region = gdk_window_get_visible_region (win); GdkDrawingContext *ctx = gdk_window_begin_draw_frame (win, region); cairo_t *cr = gdk_drawing_context_get_cairo_context (ctx); if (view->y > 0) - view->y += view->font_height / 2; + view->y += view->object_spacing; - struct xr_rendering *r = xr_rendering_create (view->xr, item, cr); + struct xr_fsm *r = xr_fsm_create (item, view->style, cr); if (r == NULL) { gdk_window_end_draw_frame (win, ctx); @@ -490,7 +455,7 @@ psppire_output_view_put (struct psppire_output_view *view, return; } - xr_rendering_measure (r, &tw, &th); + xr_fsm_measure (r, cr, &tw, &th); create_drawing_area (view, drawing_area, r, tw, th, item); gdk_window_end_draw_frame (win, ctx); cairo_region_destroy (region); @@ -613,18 +578,16 @@ on_style_updated (GtkWidget *toplevel, struct psppire_output_view *view) return; /* GTK+ fires this signal for trivial changes like the mouse moving in or out - of the window. Check whether the actual rendering options changed and + of the window. Check whether the actual fsm options changed and re-render only if they did. */ - struct string_map options = STRING_MAP_INITIALIZER (options); - get_xr_options (view, &options); - if (!string_map_equals (&options, &view->render_opts)) + struct xr_fsm_style *style = get_xr_fsm_style (view); + if (!view->style || !xr_fsm_style_equals (style, view->style)) { - xr_driver_destroy (view->xr); - view->xr = NULL; - + xr_fsm_style_unref (view->style); + view->style = xr_fsm_style_ref (style); rerender (view); } - string_map_destroy (&options); + xr_fsm_style_unref (style); } enum { @@ -729,8 +692,29 @@ clipboard_get_cb (GtkClipboard *clipboard, (info == SELECT_FMT_SVG) ) { GtkWidget *widget = view->selected_item->drawing_area; - struct xr_rendering *r = g_object_get_data (G_OBJECT (widget), "rendering"); - xr_draw_svg_file (r, filename); + struct xr_fsm *fsm = g_object_get_data (G_OBJECT (widget), "fsm"); + + GdkWindow *win = gtk_layout_get_bin_window (view->output); + cairo_region_t *region = gdk_window_get_visible_region (win); + GdkDrawingContext *ctx = gdk_window_begin_draw_frame (win, region); + cairo_t *cr = gdk_drawing_context_get_cairo_context (ctx); + + int w, h; + xr_fsm_measure (fsm, cr, &w, &h); + + gdk_window_end_draw_frame (win, ctx); + cairo_region_destroy (region); + + cairo_surface_t *surface = cairo_svg_surface_create (filename, w, h); + if (surface) + { + cairo_t *cr = cairo_create (surface); + xr_fsm_draw_all (fsm, cr); + cairo_destroy (cr); + cairo_surface_destroy (surface); + } + else + g_error ("Could not create cairo svg surface with file %s", filename); } else { @@ -876,13 +860,12 @@ psppire_output_view_new (GtkLayout *output, GtkTreeView *overview) GtkTreeModel *model; view = xmalloc (sizeof *view); - view->xr = NULL; - view->font_height = 0; + view->style = NULL; + view->object_spacing = 10; view->output = output; view->render_width = 0; view->max_width = 0; view->y = 0; - string_map_init (&view->render_opts); view->overview = overview; view->cur_group = NULL; view->toplevel = gtk_widget_get_toplevel (GTK_WIDGET (output)); @@ -945,7 +928,7 @@ psppire_output_view_destroy (struct psppire_output_view *view) g_signal_handlers_disconnect_by_func (view->output, G_CALLBACK (on_style_updated), view); - string_map_destroy (&view->render_opts); + xr_fsm_style_unref (view->style); for (i = 0; i < view->n_items; i++) output_item_unref (view->items[i].item); @@ -956,8 +939,6 @@ psppire_output_view_destroy (struct psppire_output_view *view) if (view->print_settings != NULL) g_object_unref (view->print_settings); - xr_driver_destroy (view->xr); - if (view->cur_group) gtk_tree_path_free (view->cur_group);