X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fcairo.c;h=befab0b4f8f6cac32ba883391c6efeeffea17e6f;hb=25418ddba0f237c3a76f45f28f0cd7ee4275dec3;hp=bcb995c68c587ee2116d6b86458e9ecfc3b1e8f8;hpb=a1610f63ae0c6de973de7d35d977c6119eec06f6;p=pspp diff --git a/src/output/cairo.c b/src/output/cairo.c index bcb995c68c..befab0b4f8 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,15 +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; struct xr_render_fsm *fsm; - int nest; struct string_map heading_vars; }; @@ -191,7 +189,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 *, @@ -565,6 +563,9 @@ apply_options (struct xr_driver *xr, struct string_map *o) parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &xr->bg); parse_color (d, o, "foreground-color", "#000000000000", &xr->fg); + xr->transparent = parse_boolean (opt (d, o, "transparent", "false")); + xr->systemcolors = parse_boolean (opt (d, o, "systemcolors", "false")); + /* Get dimensions. */ parse_paper_size (opt (d, o, "paper-size", ""), &paper_width, &paper_length); left_margin = parse_dimension (opt (d, o, "left-margin", ".5in")); @@ -806,22 +807,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 +829,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 +853,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 @@ -1004,13 +998,15 @@ 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])); @@ -1092,7 +1088,8 @@ 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 @@ -1349,36 +1346,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++) { @@ -1773,7 +1775,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 +1808,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 +2034,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 +2059,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; @@ -2241,3 +2280,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; +}