X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo.c;h=0176d3caa22b3ace45c83fd349e14e15cf4aaee6;hb=01d6db8119ca4553d61841f2a9248712d4c6e0dc;hp=72da1a3f21cc2602b325ba50fdbc52c8c418a767;hpb=311f2cd4115da767c61c548aa25e71e722ec937c;p=pspp diff --git a/src/output/cairo.c b/src/output/cairo.c index 72da1a3f21..0176d3caa2 100644 --- a/src/output/cairo.c +++ b/src/output/cairo.c @@ -21,6 +21,7 @@ #include "libpspp/assertion.h" #include "libpspp/cast.h" #include "libpspp/message.h" +#include "libpspp/pool.h" #include "libpspp/start-date.h" #include "libpspp/str.h" #include "libpspp/string-map.h" @@ -57,6 +58,7 @@ #include #include +#include "gl/c-strcase.h" #include "gl/intprops.h" #include "gl/minmax.h" #include "gl/xalloc.h" @@ -99,7 +101,6 @@ enum xr_font_type XR_FONT_PROPORTIONAL, XR_FONT_EMPHASIS, XR_FONT_FIXED, - XR_FONT_MARKER, XR_N_FONTS }; @@ -165,7 +166,8 @@ 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]); + 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 *, @@ -228,37 +230,52 @@ parse_color (struct output_driver *d, struct string_map *options, } static PangoFontDescription * -parse_font (struct output_driver *d, struct string_map *options, - const char *key, const char *default_value, - int default_size) +parse_font (const char *font, int default_size, bool bold, bool italic) { - PangoFontDescription *desc; - char *string; + if (!c_strcasecmp (font, "Monospaced")) + font = "Monospace"; - /* Parse KEY as a font description. */ - string = parse_string (opt (d, options, key, default_value)); - desc = pango_font_description_from_string (string); + 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 PangoFontDescription * +parse_font_option (struct output_driver *d, struct string_map *options, + const char *key, const char *default_value, + int default_size, bool bold, bool italic) +{ + char *string = parse_string (opt (d, options, key, default_value)); + PangoFontDescription *desc = parse_font (string, default_size, bold, italic); + if (!desc) { msg (MW, _("`%s': bad font specification"), string); /* Fall back to DEFAULT_VALUE, which had better be a valid font description. */ - desc = pango_font_description_from_string (default_value); + desc = parse_font (default_value, default_size, bold, italic); assert (desc != NULL); } free (string); - /* 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); - return desc; } - static void apply_options (struct xr_driver *xr, struct string_map *o) { @@ -285,14 +302,12 @@ apply_options (struct xr_driver *xr, struct string_map *o) } font_size = parse_int (opt (d, o, "font-size", "10000"), 1000, 1000000); - xr->fonts[XR_FONT_FIXED].desc = parse_font (d, o, "fixed-font", "monospace", - font_size); - xr->fonts[XR_FONT_PROPORTIONAL].desc = parse_font (d, o, "prop-font", - "sans serif", font_size); - xr->fonts[XR_FONT_EMPHASIS].desc = parse_font (d, o, "emph-font", - "sans serif italic", font_size); - xr->fonts[XR_FONT_MARKER].desc = parse_font (d, o, "marker-font", "sans serif", - font_size * PANGO_SCALE_X_SMALL); + xr->fonts[XR_FONT_FIXED].desc = parse_font_option + (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); xr->line_space = XR_POINT; xr->line_width = XR_POINT / 2; @@ -397,7 +412,7 @@ xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) 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 * 3; + 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; } @@ -644,12 +659,15 @@ xr_layout_cell (struct xr_driver *, const struct table_cell *, int *width, int *height, int *brk); static void -dump_line (struct xr_driver *xr, int x0, int y0, int x1, int y1, int style) +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); + cairo_set_source_rgb (xr->cairo, + color->r / 255.0, color->g / 255.0, color->b / 255.0); cairo_set_line_width ( xr->cairo, - xr_to_pt (style == RENDER_LINE_THICK ? xr->line_width * 3 + 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)); @@ -688,16 +706,19 @@ fill_rectangle (struct xr_driver *xr, int x0, int y0, int x1, int y1) 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) - dump_line (xr, x0, y, x3, y, left); + 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); + 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); + dump_line (xr, shorten ? x2 : x1, y, x3, y, right, right_color); } } @@ -708,22 +729,26 @@ horz_line (struct xr_driver *xr, int x0, int x1, int x2, int x3, int y, 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) - dump_line (xr, x, y0, x, y3, top); + 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); + 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); + 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]) + 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]; @@ -731,8 +756,15 @@ xr_draw_line (void *xr_, int bb[TABLE_N_AXES][2], const int y3 = bb[V][1]; const int top = styles[H][0]; const int bottom = styles[H][1]; - const int start_of_line = render_direction_rtl() ? styles[V][1]: styles[V][0]; - const int end_of_line = render_direction_rtl() ? styles[V][0]: styles[V][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. @@ -816,19 +848,25 @@ xr_draw_line (void *xr_, int bb[TABLE_N_AXES][2], int y2 = yc + vert_line_ofs; if (!double_horz) - horz_line (xr, x0, x1, x2, x3, yc, start_of_line, end_of_line, shorten_yc_line); + 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, shorten_y1_lines); - horz_line (xr, x0, x1, x2, x3, y2, start_of_line, end_of_line, shorten_y2_lines); + 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, shorten_xc_line); + 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, shorten_x1_lines); - vert_line (xr, y0, y1, y2, y3, x2, top, bottom, shorten_x2_lines); + 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); } } @@ -984,19 +1022,37 @@ xr_layout_cell_text (struct xr_driver *xr, int *widthp, int *brk) { unsigned int options = contents->options; - struct xr_font *font; - bool merge_footnotes; size_t length; int w, h; + struct xr_font *font = (options & TAB_FIX ? &xr->fonts[XR_FONT_FIXED] + : options & TAB_EMPH ? &xr->fonts[XR_FONT_EMPHASIS] + : &xr->fonts[XR_FONT_PROPORTIONAL]); + struct xr_font local_font; + if (style->font) + { + PangoFontDescription *desc = parse_font ( + style->font, + style->font_size ? style->font_size * 1000 * 72 / 128 : 10000, + style->bold, 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; + } + } + + int footnote_adjustment; if (contents->n_footnotes == 0) - merge_footnotes = false; + footnote_adjustment = 0; else if (contents->n_footnotes == 1 && (options & TAB_HALIGN) == TAB_RIGHT) { PangoAttrList *attrs; - font = &xr->fonts[XR_FONT_MARKER]; - const char *marker = contents->footnotes[0]->marker; pango_layout_set_text (font->layout, marker, strlen (marker)); @@ -1006,36 +1062,18 @@ xr_layout_cell_text (struct xr_driver *xr, pango_attr_list_unref (attrs); pango_layout_get_size (font->layout, &w, &h); - merge_footnotes = w > px_to_xr (style->margin[H][1]); - if (!merge_footnotes && clip[H][0] != clip[H][1]) - { - cairo_save (xr->cairo); - xr_clip (xr, clip); - cairo_translate (xr->cairo, - xr_to_pt (bb[H][1] + xr->x), - xr_to_pt (bb[V][0] + xr->y)); - pango_layout_set_alignment (font->layout, PANGO_ALIGN_LEFT); - pango_layout_set_width (font->layout, -1); - pango_cairo_show_layout (xr->cairo, font->layout); - cairo_restore (xr->cairo); - } - - pango_layout_set_attributes (font->layout, NULL); + footnote_adjustment = MIN (w, px_to_xr (style->margin[H][1])); } else - merge_footnotes = true; - - font = (options & TAB_FIX ? &xr->fonts[XR_FONT_FIXED] - : options & TAB_EMPH ? &xr->fonts[XR_FONT_EMPHASIS] - : &xr->fonts[XR_FONT_PROPORTIONAL]); + footnote_adjustment = px_to_xr (style->margin[H][1]); length = strlen (contents->text); - if (merge_footnotes) + if (footnote_adjustment) { PangoAttrList *attrs; struct string s; - bb[H][1] += px_to_xr (style->margin[H][1]); + bb[H][1] += footnote_adjustment; ds_init_empty (&s); ds_extend (&s, length + contents->n_footnotes * 10); @@ -1045,14 +1083,28 @@ xr_layout_cell_text (struct xr_driver *xr, ds_destroy (&s); attrs = pango_attr_list_new (); + if (style->underline) + pango_attr_list_insert (attrs, pango_attr_underline_new ( + PANGO_UNDERLINE_SINGLE)); add_attr_with_start (attrs, pango_attr_rise_new (7000), length); add_attr_with_start ( - attrs, pango_attr_font_desc_new (xr->fonts[XR_FONT_MARKER].desc), length); + attrs, pango_attr_font_desc_new (font->desc), length); pango_layout_set_attributes (font->layout, attrs); pango_attr_list_unref (attrs); } else - pango_layout_set_text (font->layout, contents->text, -1); + { + pango_layout_set_text (font->layout, contents->text, -1); + + if (style->underline) + { + PangoAttrList *attrs = pango_attr_list_new (); + pango_attr_list_insert (attrs, pango_attr_underline_new ( + PANGO_UNDERLINE_SINGLE)); + pango_layout_set_attributes (font->layout, attrs); + pango_attr_list_unref (attrs); + } + } pango_layout_set_alignment ( font->layout, @@ -1144,18 +1196,20 @@ xr_layout_cell_text (struct xr_driver *xr, if (0) { if (best && !xr->nest) - { - cairo_save (xr->cairo); - cairo_set_source_rgb (xr->cairo, 0, 1, 0); - dump_line (xr, -xr->left_margin, best, - xr->width + xr->right_margin, best, - RENDER_LINE_SINGLE); - cairo_restore (xr->cairo); - } + dump_line (xr, -xr->left_margin, best, + xr->width + xr->right_margin, best, + RENDER_LINE_SINGLE, &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 bb[V][0] + h; } @@ -1580,14 +1634,23 @@ xr_render_eject (void) } static struct xr_render_fsm * -xr_create_text_renderer (struct xr_driver *xr, const char *text) +xr_create_text_renderer (struct xr_driver *xr, const struct text_item *item) { - struct table_item *table_item; - struct xr_render_fsm *fsm; - - table_item = table_item_create (table_from_string (TAB_LEFT, text), - NULL, NULL); - fsm = xr_render_table (xr, table_item); + struct tab_table *tab = tab_create (1, 1); + + struct cell_style *style = pool_alloc (tab->container, sizeof *style); + *style = (struct cell_style) CELL_STYLE_INITIALIZER; + if (item->font) + style->font = pool_strdup (tab->container, item->font); + style->font_size = item->font_size; + style->bold = item->bold; + style->italic = item->italic; + style->underline = item->underline; + tab->styles[0] = style; + + tab_text (tab, 0, 0, TAB_LEFT, text_item_get_text (item)); + struct table_item *table_item = table_item_create (&tab->table, NULL, NULL); + struct xr_render_fsm *fsm = xr_render_table (xr, table_item); table_item_unref (table_item); return fsm; @@ -1625,7 +1688,7 @@ xr_render_text (struct xr_driver *xr, const struct text_item *text_item) break; default: - return xr_create_text_renderer (xr, text); + return xr_create_text_renderer (xr, text_item); } return NULL; @@ -1636,12 +1699,11 @@ xr_render_message (struct xr_driver *xr, const struct message_item *message_item) { const struct msg *msg = message_item_get_msg (message_item); - struct xr_render_fsm *fsm; - char *s; - - s = msg_to_string (msg, message_item->command_name); - fsm = xr_create_text_renderer (xr, s); + char *s = msg_to_string (msg, message_item->command_name); + struct text_item *item = text_item_create (TEXT_ITEM_PARAGRAPH, s); free (s); + struct xr_render_fsm *fsm = xr_create_text_renderer (xr, item); + text_item_unref (item); return fsm; }