X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo.c;h=b02e8974f8ac23f4c3aca63a3224b2350e4b5832;hb=3b54533821614d17afc61f1cd3b87d3a06fbf4da;hp=befab0b4f8f6cac32ba883391c6efeeffea17e6f;hpb=25418ddba0f237c3a76f45f28f0cd7ee4275dec3;p=pspp diff --git a/src/output/cairo.c b/src/output/cairo.c index befab0b4f8..b02e8974f8 100644 --- a/src/output/cairo.c +++ b/src/output/cairo.c @@ -43,6 +43,7 @@ #include "output/group-item.h" #include "output/message-item.h" #include "output/options.h" +#include "output/page-eject-item.h" #include "output/page-setup-item.h" #include "output/render.h" #include "output/table-item.h" @@ -108,7 +109,6 @@ enum xr_output_type enum xr_font_type { XR_FONT_PROPORTIONAL, - XR_FONT_EMPHASIS, XR_FONT_FIXED, XR_N_FONTS }; @@ -148,9 +148,6 @@ struct xr_driver int top_margin; /* Top margin in inch/(72 * XR_POINT). */ int bottom_margin; /* Bottom margin in inch/(72 * XR_POINT). */ - int line_space; /* Space between lines. */ - int line_width; /* Width of lines. */ - int min_break[TABLE_N_AXES]; /* Min cell size to break across pages. */ int object_spacing; /* Space between output objects. */ @@ -171,9 +168,8 @@ struct xr_driver cairo_t *cairo; cairo_surface_t *surface; int page_number; /* Current page number. */ - int x, y; + int y; struct xr_render_fsm *fsm; - struct string_map heading_vars; }; static const struct output_driver_class cairo_driver_class; @@ -214,272 +210,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) { @@ -557,11 +287,9 @@ apply_options (struct xr_driver *xr, struct string_map *o) (d, o, "fixed-font", "monospace", font_size, false, false); xr->fonts[XR_FONT_PROPORTIONAL].desc = parse_font_option ( d, o, "prop-font", "sans serif", font_size, false, false); - 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")); @@ -602,8 +330,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 @@ -777,29 +503,33 @@ xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) if (xr->params == 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->params = xmalloc (sizeof *xr->params); - xr->params->draw_line = xr_draw_line; - xr->params->measure_cell_width = xr_measure_cell_width; - xr->params->measure_cell_height = xr_measure_cell_height; - xr->params->adjust_break = xr_adjust_break; - xr->params->draw_cell = xr_draw_cell; + xr->params->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; - int lw = XR_LINE_WIDTH; - int ls = XR_LINE_SPACE; - for (int i = 0; i < TABLE_N_AXES; i++) + enum { LW = XR_LINE_WIDTH, LS = XR_LINE_SPACE }; + static const int xr_line_widths[RENDER_N_LINES] = { - xr->params->line_widths[i][RENDER_LINE_NONE] = 0; - xr->params->line_widths[i][RENDER_LINE_SINGLE] = lw; - xr->params->line_widths[i][RENDER_LINE_DASHED] = lw; - xr->params->line_widths[i][RENDER_LINE_THICK] = lw * 2; - xr->params->line_widths[i][RENDER_LINE_THIN] = lw / 2; - xr->params->line_widths[i][RENDER_LINE_DOUBLE] = 2 * lw + ls; - } + [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]; @@ -1013,7 +743,7 @@ xr_driver_next_page (struct xr_driver *xr, cairo_t *cairo) 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, @@ -1095,8 +825,8 @@ dump_line (struct xr_driver *xr, int x0, int y0, int x1, int y1, int style, 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); } @@ -1105,12 +835,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 @@ -1119,7 +849,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); } @@ -1422,9 +1152,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); @@ -1694,13 +1424,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); @@ -1719,9 +1449,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); } @@ -1884,13 +1614,6 @@ xr_rendering_create_text (struct xr_driver *xr, const char *text, cairo_t *cr) return r; } -void -xr_rendering_apply_options (struct xr_rendering *xr, struct string_map *o) -{ - if (is_table_item (xr->item)) - apply_options (xr->xr, o); -} - struct xr_rendering * xr_rendering_create (struct xr_driver *xr, const struct output_item *item, cairo_t *cr) @@ -2234,17 +1957,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: - if (xr->y > 0) - return xr_render_eject (); break; default: @@ -2275,6 +1991,8 @@ xr_render_output_item (struct xr_driver *xr, 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