X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo.c;h=03d090ba8ed26a5c0f1101caf0b9a5ba17581530;hb=a06dd54ab3d37656a1edfb8ee7de859cc0baac0e;hp=57c27ddc23c7c9c7536e9d4199db409da86122a4;hpb=d9153beacc1308b37dbaf4f64155553360aa0173;p=pspp diff --git a/src/output/cairo.c b/src/output/cairo.c index 57c27ddc23..03d090ba8e 100644 --- a/src/output/cairo.c +++ b/src/output/cairo.c @@ -156,6 +156,8 @@ struct xr_driver struct cell_color bg; /* Background color */ struct cell_color fg; /* Foreground color */ + bool transparent; /* true -> do not render background */ + bool systemcolors; /* true -> do not change colors */ int initial_page_number; @@ -166,16 +168,11 @@ struct xr_driver struct render_params *params; double font_scale; int char_width, char_height; - char *command_name; - char *title; - char *subtitle; cairo_t *cairo; cairo_surface_t *surface; int page_number; /* Current page number. */ - int x, y; + int y; struct xr_render_fsm *fsm; - int nest; - struct string_map heading_vars; }; static const struct output_driver_class cairo_driver_class; @@ -191,7 +188,7 @@ static void xr_measure_cell_width (void *, const struct table_cell *, 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 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 *, @@ -216,272 +213,6 @@ opt (struct output_driver *d, struct string_map *options, const char *key, return driver_option_get (d, options, key, default_value); } -static int -lookup_color_name (const char *s) -{ - struct color - { - struct hmap_node hmap_node; - const char *name; - int code; - }; - - static struct color colors[] = - { - { .name = "aliceblue", .code = 0xf0f8ff }, - { .name = "antiquewhite", .code = 0xfaebd7 }, - { .name = "aqua", .code = 0x00ffff }, - { .name = "aquamarine", .code = 0x7fffd4 }, - { .name = "azure", .code = 0xf0ffff }, - { .name = "beige", .code = 0xf5f5dc }, - { .name = "bisque", .code = 0xffe4c4 }, - { .name = "black", .code = 0x000000 }, - { .name = "blanchedalmond", .code = 0xffebcd }, - { .name = "blue", .code = 0x0000ff }, - { .name = "blueviolet", .code = 0x8a2be2 }, - { .name = "brown", .code = 0xa52a2a }, - { .name = "burlywood", .code = 0xdeb887 }, - { .name = "cadetblue", .code = 0x5f9ea0 }, - { .name = "chartreuse", .code = 0x7fff00 }, - { .name = "chocolate", .code = 0xd2691e }, - { .name = "coral", .code = 0xff7f50 }, - { .name = "cornflowerblue", .code = 0x6495ed }, - { .name = "cornsilk", .code = 0xfff8dc }, - { .name = "crimson", .code = 0xdc143c }, - { .name = "cyan", .code = 0x00ffff }, - { .name = "darkblue", .code = 0x00008b }, - { .name = "darkcyan", .code = 0x008b8b }, - { .name = "darkgoldenrod", .code = 0xb8860b }, - { .name = "darkgray", .code = 0xa9a9a9 }, - { .name = "darkgreen", .code = 0x006400 }, - { .name = "darkgrey", .code = 0xa9a9a9 }, - { .name = "darkkhaki", .code = 0xbdb76b }, - { .name = "darkmagenta", .code = 0x8b008b }, - { .name = "darkolivegreen", .code = 0x556b2f }, - { .name = "darkorange", .code = 0xff8c00 }, - { .name = "darkorchid", .code = 0x9932cc }, - { .name = "darkred", .code = 0x8b0000 }, - { .name = "darksalmon", .code = 0xe9967a }, - { .name = "darkseagreen", .code = 0x8fbc8f }, - { .name = "darkslateblue", .code = 0x483d8b }, - { .name = "darkslategray", .code = 0x2f4f4f }, - { .name = "darkslategrey", .code = 0x2f4f4f }, - { .name = "darkturquoise", .code = 0x00ced1 }, - { .name = "darkviolet", .code = 0x9400d3 }, - { .name = "deeppink", .code = 0xff1493 }, - { .name = "deepskyblue", .code = 0x00bfff }, - { .name = "dimgray", .code = 0x696969 }, - { .name = "dimgrey", .code = 0x696969 }, - { .name = "dodgerblue", .code = 0x1e90ff }, - { .name = "firebrick", .code = 0xb22222 }, - { .name = "floralwhite", .code = 0xfffaf0 }, - { .name = "forestgreen", .code = 0x228b22 }, - { .name = "fuchsia", .code = 0xff00ff }, - { .name = "gainsboro", .code = 0xdcdcdc }, - { .name = "ghostwhite", .code = 0xf8f8ff }, - { .name = "gold", .code = 0xffd700 }, - { .name = "goldenrod", .code = 0xdaa520 }, - { .name = "gray", .code = 0x808080 }, - { .name = "green", .code = 0x008000 }, - { .name = "greenyellow", .code = 0xadff2f }, - { .name = "grey", .code = 0x808080 }, - { .name = "honeydew", .code = 0xf0fff0 }, - { .name = "hotpink", .code = 0xff69b4 }, - { .name = "indianred", .code = 0xcd5c5c }, - { .name = "indigo", .code = 0x4b0082 }, - { .name = "ivory", .code = 0xfffff0 }, - { .name = "khaki", .code = 0xf0e68c }, - { .name = "lavender", .code = 0xe6e6fa }, - { .name = "lavenderblush", .code = 0xfff0f5 }, - { .name = "lawngreen", .code = 0x7cfc00 }, - { .name = "lemonchiffon", .code = 0xfffacd }, - { .name = "lightblue", .code = 0xadd8e6 }, - { .name = "lightcoral", .code = 0xf08080 }, - { .name = "lightcyan", .code = 0xe0ffff }, - { .name = "lightgoldenrodyellow", .code = 0xfafad2 }, - { .name = "lightgray", .code = 0xd3d3d3 }, - { .name = "lightgreen", .code = 0x90ee90 }, - { .name = "lightgrey", .code = 0xd3d3d3 }, - { .name = "lightpink", .code = 0xffb6c1 }, - { .name = "lightsalmon", .code = 0xffa07a }, - { .name = "lightseagreen", .code = 0x20b2aa }, - { .name = "lightskyblue", .code = 0x87cefa }, - { .name = "lightslategray", .code = 0x778899 }, - { .name = "lightslategrey", .code = 0x778899 }, - { .name = "lightsteelblue", .code = 0xb0c4de }, - { .name = "lightyellow", .code = 0xffffe0 }, - { .name = "lime", .code = 0x00ff00 }, - { .name = "limegreen", .code = 0x32cd32 }, - { .name = "linen", .code = 0xfaf0e6 }, - { .name = "magenta", .code = 0xff00ff }, - { .name = "maroon", .code = 0x800000 }, - { .name = "mediumaquamarine", .code = 0x66cdaa }, - { .name = "mediumblue", .code = 0x0000cd }, - { .name = "mediumorchid", .code = 0xba55d3 }, - { .name = "mediumpurple", .code = 0x9370db }, - { .name = "mediumseagreen", .code = 0x3cb371 }, - { .name = "mediumslateblue", .code = 0x7b68ee }, - { .name = "mediumspringgreen", .code = 0x00fa9a }, - { .name = "mediumturquoise", .code = 0x48d1cc }, - { .name = "mediumvioletred", .code = 0xc71585 }, - { .name = "midnightblue", .code = 0x191970 }, - { .name = "mintcream", .code = 0xf5fffa }, - { .name = "mistyrose", .code = 0xffe4e1 }, - { .name = "moccasin", .code = 0xffe4b5 }, - { .name = "navajowhite", .code = 0xffdead }, - { .name = "navy", .code = 0x000080 }, - { .name = "oldlace", .code = 0xfdf5e6 }, - { .name = "olive", .code = 0x808000 }, - { .name = "olivedrab", .code = 0x6b8e23 }, - { .name = "orange", .code = 0xffa500 }, - { .name = "orangered", .code = 0xff4500 }, - { .name = "orchid", .code = 0xda70d6 }, - { .name = "palegoldenrod", .code = 0xeee8aa }, - { .name = "palegreen", .code = 0x98fb98 }, - { .name = "paleturquoise", .code = 0xafeeee }, - { .name = "palevioletred", .code = 0xdb7093 }, - { .name = "papayawhip", .code = 0xffefd5 }, - { .name = "peachpuff", .code = 0xffdab9 }, - { .name = "peru", .code = 0xcd853f }, - { .name = "pink", .code = 0xffc0cb }, - { .name = "plum", .code = 0xdda0dd }, - { .name = "powderblue", .code = 0xb0e0e6 }, - { .name = "purple", .code = 0x800080 }, - { .name = "red", .code = 0xff0000 }, - { .name = "rosybrown", .code = 0xbc8f8f }, - { .name = "royalblue", .code = 0x4169e1 }, - { .name = "saddlebrown", .code = 0x8b4513 }, - { .name = "salmon", .code = 0xfa8072 }, - { .name = "sandybrown", .code = 0xf4a460 }, - { .name = "seagreen", .code = 0x2e8b57 }, - { .name = "seashell", .code = 0xfff5ee }, - { .name = "sienna", .code = 0xa0522d }, - { .name = "silver", .code = 0xc0c0c0 }, - { .name = "skyblue", .code = 0x87ceeb }, - { .name = "slateblue", .code = 0x6a5acd }, - { .name = "slategray", .code = 0x708090 }, - { .name = "slategrey", .code = 0x708090 }, - { .name = "snow", .code = 0xfffafa }, - { .name = "springgreen", .code = 0x00ff7f }, - { .name = "steelblue", .code = 0x4682b4 }, - { .name = "tan", .code = 0xd2b48c }, - { .name = "teal", .code = 0x008080 }, - { .name = "thistle", .code = 0xd8bfd8 }, - { .name = "tomato", .code = 0xff6347 }, - { .name = "turquoise", .code = 0x40e0d0 }, - { .name = "violet", .code = 0xee82ee }, - { .name = "wheat", .code = 0xf5deb3 }, - { .name = "white", .code = 0xffffff }, - { .name = "whitesmoke", .code = 0xf5f5f5 }, - { .name = "yellow", .code = 0xffff00 }, - { .name = "yellowgreen", .code = 0x9acd32 }, - }; - - static struct hmap color_table = HMAP_INITIALIZER (color_table); - - if (hmap_is_empty (&color_table)) - for (size_t i = 0; i < sizeof colors / sizeof *colors; i++) - hmap_insert (&color_table, &colors[i].hmap_node, - hash_string (colors[i].name, 0)); - - const struct color *color; - HMAP_FOR_EACH_WITH_HASH (color, struct color, hmap_node, - hash_string (s, 0), &color_table) - if (!strcmp (color->name, s)) - return color->code; - return -1; -} - -static bool -parse_color__ (const char *s, struct cell_color *color) -{ - /* #rrrrggggbbbb */ - uint16_t r16, g16, b16; - int len; - if (sscanf (s, "#%4"SCNx16"%4"SCNx16"%4"SCNx16"%n", - &r16, &g16, &b16, &len) == 3 - && len == 13 - && !s[len]) - { - color->r = r16 >> 8; - color->g = g16 >> 8; - color->b = b16 >> 8; - return true; - } - - /* #rrggbb */ - uint8_t r, g, b; - if (sscanf (s, "#%2"SCNx8"%2"SCNx8"%2"SCNx8"%n", &r, &g, &b, &len) == 3 - && len == 7 - && !s[len]) - { - color->r = r; - color->g = g; - color->b = b; - return true; - } - - /* rrggbb */ - if (sscanf (s, "%2"SCNx8"%2"SCNx8"%2"SCNx8"%n", &r, &g, &b, &len) == 3 - && len == 6 - && !s[len]) - { - color->r = r; - color->g = g; - color->b = b; - return true; - } - - /* rgb(r,g,b) */ - if (sscanf (s, "rgb (%"SCNi8" , %"SCNi8" , %"SCNi8" ) %n", - &r, &g, &b, &len) == 3 - && !s[len]) - { - color->r = r; - color->g = g; - color->b = b; - return true; - } - - /* rgba(r,g,b,a), ignoring a. */ - if (sscanf (s, "rgba (%"SCNi8" , %"SCNi8" , %"SCNi8", %*f ) %n", - &r, &g, &b, &len) == 3 - && !s[len]) - { - color->r = r; - color->g = g; - color->b = b; - return true; - } - - int code = lookup_color_name (s); - if (code >= 0) - { - color->r = code >> 16; - color->g = code >> 8; - color->b = code; - return true; - } - - return false; -} - -/* Parse color information specified by KEY into {RED,GREEN,BLUE}. - Currently, the input string must be of the form "#RRRRGGGGBBBB" - Future implementations might allow things like "yellow" and - "sky-blue-ultra-brown" -*/ -void -parse_color (struct output_driver *d, struct string_map *options, - const char *key, const char *default_value, - struct cell_color *color) -{ - char *string = parse_string (opt (d, options, key, default_value)); - if (!parse_color__ (string, color) && !parse_color__ (default_value, color)) - *color = (struct cell_color) CELL_COLOR_BLACK; - free (string); -} - static PangoFontDescription * parse_font (const char *font, int default_size, bool bold, bool italic) { @@ -562,8 +293,11 @@ apply_options (struct xr_driver *xr, struct string_map *o) xr->fonts[XR_FONT_EMPHASIS].desc = parse_font_option ( d, o, "emph-font", "sans serif", font_size, false, true); - parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &xr->bg); - parse_color (d, o, "foreground-color", "#000000000000", &xr->fg); + xr->fg = parse_color (opt (d, o, "foreground-color", "#000000000000")); + xr->bg = parse_color (opt (d, o, "background-color", "#FFFFFFFFFFFF")); + + xr->transparent = parse_boolean (opt (d, o, "transparent", "false")); + xr->systemcolors = parse_boolean (opt (d, o, "systemcolors", "false")); /* Get dimensions. */ parse_paper_size (opt (d, o, "paper-size", ""), &paper_width, &paper_length); @@ -601,8 +335,6 @@ xr_allocate (const char *name, int device_type, struct string_map *o, output_driver_init (d, &cairo_driver_class, name, device_type); - string_map_init (&xr->heading_vars); - /* This is a nasty kluge for an issue that does not make sense. On any surface other than a screen (e.g. for output to PDF or PS or SVG), the fonts are way too big by default. A "9-point" font seems to appear about @@ -806,22 +538,19 @@ xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) xr->params->rtl = render_direction_rtl (); } - cairo_set_source_rgb (xr->cairo, - xr->fg.r / 255.0, xr->fg.g / 255.0, xr->fg.b / 255.0); + if (!xr->systemcolors) + cairo_set_source_rgb (xr->cairo, + xr->fg.r / 255.0, xr->fg.g / 255.0, xr->fg.b / 255.0); } static struct output_driver * -xr_create (const char *file_name, enum settings_output_devices device_type, +xr_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o, enum xr_output_type file_type) { - struct xr_driver *xr; - cairo_status_t status; - double width_pt, length_pt; - - xr = xr_allocate (file_name, device_type, o, 72.0 / 128.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); + const char *file_name = fh_get_file_name (fh); + struct xr_driver *xr = xr_allocate (file_name, device_type, o, 72.0 / 128.0); + double width_pt = xr_to_pt (xr->width + xr->left_margin + xr->right_margin); + double length_pt = xr_to_pt (xr->length + xr->top_margin + xr->bottom_margin); if (file_type == XR_PDF) xr->surface = cairo_pdf_surface_create (file_name, width_pt, length_pt); else if (file_type == XR_PS) @@ -831,20 +560,22 @@ xr_create (const char *file_name, enum settings_output_devices device_type, else NOT_REACHED (); - status = cairo_surface_status (xr->surface); + cairo_status_t status = cairo_surface_status (xr->surface); if (status != CAIRO_STATUS_SUCCESS) { msg (ME, _("error opening output file `%s': %s"), - file_name, cairo_status_to_string (status)); + file_name, cairo_status_to_string (status)); goto error; } if (!xr_check_fonts (xr->surface, xr->fonts, xr->width, xr->length)) goto error; + fh_unref (fh); return &xr->driver; error: + fh_unref (fh); output_driver_destroy (&xr->driver); return NULL; } @@ -853,27 +584,21 @@ static struct output_driver * xr_pdf_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o) { - struct output_driver *od = xr_create (fh_get_file_name (fh), device_type, o, XR_PDF); - fh_unref (fh); - return od ; + return xr_create (fh, device_type, o, XR_PDF); } static struct output_driver * xr_ps_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o) { - struct output_driver *od = xr_create (fh_get_file_name (fh), device_type, o, XR_PS); - fh_unref (fh); - return od ; + return xr_create (fh, device_type, o, XR_PS); } static struct output_driver * xr_svg_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o) { - struct output_driver *od = xr_create (fh_get_file_name (fh), device_type, o, XR_SVG); - fh_unref (fh); - return od ; + return xr_create (fh, device_type, o, XR_SVG); } static void @@ -889,9 +614,9 @@ xr_destroy (struct output_driver *driver) cairo_surface_finish (xr->surface); cairo_status_t status = cairo_status (xr->cairo); if (status != CAIRO_STATUS_SUCCESS) - msg (ME, _("error drawing output for %s driver: %s"), - output_driver_get_name (driver), - cairo_status_to_string (status)); + fprintf (stderr, _("error drawing output for %s driver: %s"), + output_driver_get_name (driver), + cairo_status_to_string (status)); cairo_surface_destroy (xr->surface); cairo_destroy (xr->cairo); @@ -1004,20 +729,22 @@ xr_submit (struct output_driver *driver, const struct output_item *output_item) void xr_driver_next_page (struct xr_driver *xr, cairo_t *cairo) { - cairo_save (cairo); - cairo_set_source_rgb (cairo, - xr->bg.r / 255.0, xr->bg.g / 255.0, xr->bg.b / 255.0); - cairo_rectangle (cairo, 0, 0, xr->width, xr->length); - cairo_fill (cairo); - cairo_restore (cairo); - + if (!xr->transparent) + { + cairo_save (cairo); + cairo_set_source_rgb (cairo, + xr->bg.r / 255.0, xr->bg.g / 255.0, xr->bg.b / 255.0); + cairo_rectangle (cairo, 0, 0, xr->width, xr->length); + cairo_fill (cairo); + cairo_restore (cairo); + } cairo_translate (cairo, xr_to_pt (xr->left_margin), xr_to_pt (xr->top_margin + xr->headings_height[0])); xr->page_number++; xr->cairo = cairo; - xr->x = xr->y = 0; + xr->y = 0; xr_render_page_heading (xr->cairo, xr->fonts[XR_FONT_PROPORTIONAL].desc, &xr->headings[0], xr->page_number, xr->width, true, @@ -1092,14 +819,15 @@ 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); - set_source_rgba (xr->cairo, color); + 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->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_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); } @@ -1108,12 +836,12 @@ 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_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); + 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 @@ -1122,7 +850,7 @@ 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->x), xr_to_pt (y0 + xr->y), + xr_to_pt (x0), xr_to_pt (y0 + xr->y), xr_to_pt (x1 - x0), xr_to_pt (y1 - y0)); cairo_fill (xr->cairo); } @@ -1349,36 +1077,41 @@ 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 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; - cairo_save (xr->cairo); - int bg_clip[TABLE_N_AXES][2]; - for (int axis = 0; axis < TABLE_N_AXES; axis++) + if (!xr->transparent) { - 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]; + 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); } - 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); - set_source_rgba (xr->cairo, &cell->style->font_style.fg[color_idx]); + 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++) { @@ -1420,9 +1153,9 @@ 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 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] + xr->x); + 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); @@ -1692,13 +1425,13 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, if (options & TAB_ROTATE) { cairo_translate (xr->cairo, - xr_to_pt (bb[H][0] + xr->x), + 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->x), + xr_to_pt (bb[H][0]), xr_to_pt (bb[V][0] + xr->y)); pango_cairo_show_layout (xr->cairo, font->layout); @@ -1717,9 +1450,9 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, 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.x), pango_to_xr (extents.y) - xr->y, - pango_to_xr (extents.x + extents.width) - xr->x, + pango_to_xr (extents.x + extents.width), pango_to_xr (extents.y + extents.height) - xr->y); cairo_restore (xr->cairo); } @@ -1773,7 +1506,7 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell, be useful for debugging issues with breaking. */ if (0) { - if (best && !xr->nest) + if (best) dump_line (xr, -xr->left_margin, best, xr->width + xr->right_margin, best, RENDER_LINE_SINGLE, @@ -1806,13 +1539,9 @@ xr_layout_cell (struct xr_driver *xr, const struct table_cell *cell, { 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); + dump_rectangle (xr, bb[H][0], bb[V][0], bb[H][1], bb[V][1]); cairo_restore (xr->cairo); } } @@ -2036,10 +1765,10 @@ xr_draw_png_chart (const struct chart_item *item, number_pos = strchr (file_name_template, '#'); if (number_pos != NULL) - file_name = xasprintf ("%.*s%d%s", (int) (number_pos - file_name_template), + file_name = xasprintf ("%.*s%d%s.png", (int) (number_pos - file_name_template), file_name_template, number, number_pos + 1); else - file_name = xstrdup (file_name_template); + file_name = xasprintf ("%s.png", file_name_template); surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, length); cr = cairo_create (surface); @@ -2061,7 +1790,48 @@ xr_draw_png_chart (const struct chart_item *item, return file_name; } + + +char * +xr_draw_eps_chart (const struct chart_item *item, + const char *file_name_template, int number, + const struct cell_color *fg, + const struct cell_color *bg) +{ + const int width = 640; + const int length = 480; + + cairo_surface_t *surface; + const char *number_pos; + char *file_name; + cairo_t *cr; + + number_pos = strchr (file_name_template, '#'); + if (number_pos != NULL) + file_name = xasprintf ("%.*s%d%s.eps", (int) (number_pos - file_name_template), + file_name_template, number, number_pos + 1); + else + file_name = xasprintf ("%s.eps", file_name_template); + + surface = cairo_ps_surface_create (file_name, width, length); + cairo_ps_surface_set_eps (surface, true); + cr = cairo_create (surface); + + cairo_set_source_rgb (cr, bg->r / 255.0, bg->g / 255.0, bg->b / 255.0); + cairo_paint (cr); + + cairo_set_source_rgb (cr, fg->r / 255.0, fg->g / 255.0, fg->b / 255.0); + + xr_draw_chart (item, cr, 0.0, 0.0, width, length); + + cairo_destroy (cr); + cairo_surface_destroy (surface); + + return file_name; +} + + struct xr_table_state { struct xr_render_fsm fsm; @@ -2195,12 +1965,10 @@ static struct xr_render_fsm * xr_render_text (struct xr_driver *xr, const struct text_item *text_item) { enum text_item_type type = text_item_get_type (text_item); - const char *text = text_item_get_text (text_item); switch (type) { case TEXT_ITEM_PAGE_TITLE: - string_map_replace (&xr->heading_vars, "PageTitle", text); break; case TEXT_ITEM_EJECT_PAGE: @@ -2241,3 +2009,23 @@ xr_render_output_item (struct xr_driver *xr, 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; +}