X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo-pager.c;h=311a3b546afb7a82b188e24d99d96a55b8a31929;hb=b0269e285ccdf7acb8d6231f29d85b56cfdd676c;hp=36823bd9452344168722b6b7b5c4a0d81823aa1f;hpb=e6b6e7d67f173867d731ebca6b8fbad5a2f82560;p=pspp diff --git a/src/output/cairo-pager.c b/src/output/cairo-pager.c index 36823bd945..311a3b546a 100644 --- a/src/output/cairo-pager.c +++ b/src/output/cairo-pager.c @@ -19,10 +19,18 @@ #include "output/cairo-pager.h" #include +#include #include #include +#include "output/chart-item.h" #include "output/driver-provider.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/table-item.h" +#include "output/text-item.h" #include "gl/xalloc.h" @@ -87,8 +95,7 @@ xr_page_style_equals (const struct xr_page_style *a, if (!page_heading_equals (&a->headings[i], &b->headings[i])) return false; - return (a->initial_page_number == b->initial_page_number - && a->object_spacing == b->object_spacing); + return a->initial_page_number == b->initial_page_number; } struct xr_pager @@ -101,6 +108,19 @@ struct xr_pager /* Current output item. */ struct xr_fsm *fsm; struct output_item *item; + int slice_idx; + + /* Grouping, for constructing the outline for PDFs. + + The 'group_ids' were returned by cairo_pdf_surface_add_outline() and + represent the groups within which upcoming output is nested. The + 'group_opens' will be passed to cairo_pdf_surface_add_outline() when the + next item is rendered (we defer it so that the location associated with + the outline item can be the first object actually output in it). */ + int *group_ids; + size_t n_group_ids, allocated_group_ids; + struct group_open_item **group_opens; + size_t n_opens, allocated_opens; /* Current output page. */ cairo_t *cr; @@ -194,11 +214,11 @@ xr_measure_headings (const struct xr_page_style *ps, for (int i = 0; i < 2; i++) { int *h = &heading_heights[i]; - *h = xr_render_page_heading (cairo, fs->fonts[XR_FONT_PROPORTIONAL], + *h = xr_render_page_heading (cairo, fs->font, &ps->headings[i], -1, fs->size[H], 0, fs->font_resolution); if (*h) - *h += ps->object_spacing; + *h += fs->object_spacing; } cairo_destroy (cairo); cairo_surface_destroy (surface); @@ -234,6 +254,11 @@ xr_pager_destroy (struct xr_pager *p) { if (p) { + free (p->group_ids); + for (size_t i = 0; i < p->n_opens; i++) + group_open_item_unref (p->group_opens[i]); + free (p->group_opens); + xr_page_style_unref (p->page_style); xr_fsm_style_unref (p->fsm_style); @@ -260,6 +285,7 @@ xr_pager_add_item (struct xr_pager *p, const struct output_item *item) { assert (!p->item); p->item = output_item_ref (item); + p->slice_idx = 0; xr_pager_run (p); } @@ -279,52 +305,67 @@ xr_pager_add_page (struct xr_pager *p, cairo_t *cr) const struct xr_fsm_style *fs = p->fsm_style; const struct xr_page_style *ps = p->page_style; - const struct cell_color *bg = &ps->bg; - if (bg->alpha) - { - cairo_save (cr); - cairo_set_source_rgba (cr, bg->r / 255.0, bg->g / 255.0, - bg->b / 255.0, bg->alpha / 255.0); - cairo_rectangle (cr, 0, 0, fs->size[H], fs->size[V]); - cairo_fill (cr); - cairo_restore (cr); - } cairo_translate (cr, xr_to_pt (ps->margins[H][0]), xr_to_pt (ps->margins[V][0])); - const PangoFontDescription *font = fs->fonts[XR_FONT_PROPORTIONAL]; int page_number = p->page_index++ + ps->initial_page_number; if (p->heading_heights[0]) - xr_render_page_heading (cr, font, &ps->headings[0], page_number, + xr_render_page_heading (cr, fs->font, &ps->headings[0], page_number, fs->size[H], -p->heading_heights[0], fs->font_resolution); if (p->heading_heights[1]) - xr_render_page_heading (cr, font, &ps->headings[1], page_number, - fs->size[H], fs->size[V] + ps->object_spacing, + xr_render_page_heading (cr, fs->font, &ps->headings[1], page_number, + fs->size[H], fs->size[V] + fs->object_spacing, fs->font_resolution); + cairo_surface_t *surface = cairo_get_target (cr); + if (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_PDF) + { + char *page_label = xasprintf ("%d", page_number); + cairo_pdf_surface_set_page_label (surface, page_label); + free (page_label); + } + xr_pager_run (p); } +void +xr_pager_finish_page (struct xr_pager *p) +{ + if (p->cr) + { + cairo_restore (p->cr); + cairo_destroy (p->cr); + p->cr = NULL; + } +} + bool xr_pager_needs_new_page (struct xr_pager *p) { if (p->item && (!p->cr || p->y >= p->fsm_style->size[V])) { - if (p->cr) - { - cairo_restore (p->cr); - cairo_destroy (p->cr); - p->cr = NULL; - } + xr_pager_finish_page (p); return true; } else return false; } +static int +add_outline (cairo_t *cr, int parent_id, + const char *utf8, const char *link_attribs, + cairo_pdf_outline_flags_t flags) +{ + cairo_surface_t *surface = cairo_get_target (cr); + return (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_PDF + ? cairo_pdf_surface_add_outline (surface, parent_id, + utf8, link_attribs, flags) + : 0); +} + static void xr_pager_run (struct xr_pager *p) { @@ -332,7 +373,28 @@ xr_pager_run (struct xr_pager *p) { if (!p->fsm) { - p->fsm = xr_fsm_create (p->item, p->fsm_style, p->cr); + if (is_group_open_item (p->item)) + { + if (p->n_opens >= p->allocated_opens) + p->group_opens = x2nrealloc (p->group_opens, + &p->allocated_opens, + sizeof p->group_opens); + p->group_opens[p->n_opens++] = group_open_item_ref ( + to_group_open_item (p->item)); + } + else if (is_group_close_item (p->item)) + { + if (p->n_opens) + group_open_item_unref (p->group_opens[--p->n_opens]); + else if (p->n_group_ids) + p->n_group_ids--; + else + { + /* Something wrong! */ + } + } + + p->fsm = xr_fsm_create_for_printing (p->item, p->fsm_style, p->cr); if (!p->fsm) { output_item_unref (p->item); @@ -344,12 +406,56 @@ xr_pager_run (struct xr_pager *p) for (;;) { - int spacing = p->page_style->object_spacing; + char *dest_name = NULL; + if (p->page_style->include_outline) + { + static int counter = 0; + dest_name = xasprintf ("dest%d", counter++); + char *attrs = xasprintf ("name='%s'", dest_name); + cairo_tag_begin (p->cr, CAIRO_TAG_DEST, attrs); + free (attrs); + } + + int spacing = p->fsm_style->object_spacing; int chunk = xr_fsm_draw_slice (p->fsm, p->cr, p->fsm_style->size[V] - p->y); p->y += chunk + spacing; cairo_translate (p->cr, 0, xr_to_pt (chunk + spacing)); + if (p->page_style->include_outline) + { + cairo_tag_end (p->cr, CAIRO_TAG_DEST); + + if (chunk && p->slice_idx++ == 0) + { + char *attrs = xasprintf ("dest='%s'", dest_name); + + int parent_group_id = (p->n_group_ids + ? p->group_ids[p->n_group_ids - 1] + : CAIRO_PDF_OUTLINE_ROOT); + for (size_t i = 0; i < p->n_opens; i++) + { + parent_group_id = add_outline ( + p->cr, parent_group_id, + p->group_opens[i]->command_name, attrs, + CAIRO_PDF_OUTLINE_FLAG_OPEN); + group_open_item_unref (p->group_opens[i]); + + if (p->n_group_ids >= p->allocated_group_ids) + p->group_ids = x2nrealloc (p->group_ids, + &p->allocated_group_ids, + sizeof *p->group_ids); + p->group_ids[p->n_group_ids++] = parent_group_id; + } + p->n_opens = 0; + + add_outline (p->cr, parent_group_id, + output_item_get_label (p->item), attrs, 0); + free (attrs); + } + free (dest_name); + } + if (xr_fsm_is_empty (p->fsm)) { xr_fsm_destroy (p->fsm);