X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fcairo.c;h=8156016cd415bd33fe97ed4176ed91e3d6299aab;hb=ee7b576822f2fa5025e08eccf5c8e7728838c460;hp=68c3eb81a0f96e54b9ef89da8dd86b5c41a3c290;hpb=f550aee00a62fe1d8baf62d83cd7efef6cc2ee92;p=pspp diff --git a/src/output/cairo.c b/src/output/cairo.c index 68c3eb81a0..8156016cd4 100644 --- a/src/output/cairo.c +++ b/src/output/cairo.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -95,10 +95,8 @@ enum xr_font_type /* A font for use with Cairo. */ struct xr_font { - char *string; PangoFontDescription *desc; PangoLayout *layout; - PangoFontMetrics *metrics; }; /* An output item whose rendering is in progress. */ @@ -119,10 +117,7 @@ struct xr_driver struct output_driver driver; /* User parameters. */ - bool headers; /* Draw headers at top of page? */ - struct xr_font fonts[XR_N_FONTS]; - int font_height; /* In XR units. */ int width; /* Page width minus margins. */ int length; /* Page length minus margins and header. */ @@ -136,8 +131,12 @@ struct xr_driver int line_space; /* Space between lines. */ int line_width; /* Width of lines. */ + double bg_red, bg_green, bg_blue; /* Background color */ + double fg_red, fg_green, fg_blue; /* Foreground color */ + /* Internal state. */ struct render_params *params; + int char_width, char_height; char *command_name; char *title; char *subtitle; @@ -149,13 +148,9 @@ struct xr_driver static const struct output_driver_class cairo_driver_class; -static void draw_headers (struct xr_driver *); static void xr_driver_destroy_fsm (struct xr_driver *); static void xr_driver_run_fsm (struct xr_driver *); -static bool load_font (struct xr_driver *, struct xr_font *); -static void free_font (struct xr_font *); - static void xr_draw_line (void *, int bb[TABLE_N_AXES][2], enum render_line_style styles[TABLE_N_AXES][2]); static void xr_measure_cell_width (void *, const struct table_cell *, @@ -185,29 +180,89 @@ opt (struct output_driver *d, struct string_map *options, const char *key, return driver_option_get (d, options, key, default_value); } -static struct xr_driver * -xr_allocate (const char *name, int device_type, struct string_map *o) +/* 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" +*/ +static void +parse_color (struct output_driver *d, struct string_map *options, + const char *key, const char *default_value, + double *dred, double *dgreen, double *dblue) { + int red, green, blue; + char *string = parse_string (opt (d, options, key, default_value)); + + if (3 != sscanf (string, "#%04x%04x%04x", &red, &green, &blue)) + { + /* If the parsed option string fails, then try the default value */ + if ( 3 != sscanf (default_value, "#%04x%04x%04x", &red, &green, &blue)) + { + /* ... and if that fails set everything to zero */ + red = green = blue = 0; + } + } + + /* Convert 16 bit ints to float */ + *dred = red / (double) 0xFFFF; + *dgreen = green / (double) 0xFFFF; + *dblue = blue / (double) 0xFFFF; +} + +static PangoFontDescription * +parse_font (struct output_driver *d, struct string_map *options, + const char *key, const char *default_value, + int default_points) +{ + PangoFontDescription *desc; + char *string; + + /* Parse KEY as a font description. */ + string = parse_string (opt (d, options, key, default_value)); + desc = pango_font_description_from_string (string); + if (desc == NULL) + { + error (0, 0, _("`%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); + assert (desc != NULL); + } + free (string); + + /* If the font description didn't include an explicit font size, then set it + to DEFAULT_POINTS. */ + if (!(pango_font_description_get_set_fields (desc) & PANGO_FONT_MASK_SIZE)) + pango_font_description_set_size (desc, + default_points / 1000.0 * PANGO_SCALE); + + return desc; +} + + +static void +apply_options (struct xr_driver *xr, struct string_map *o) +{ + struct output_driver *d = &xr->driver; + int paper_width, paper_length; - struct output_driver *d; - struct xr_driver *xr; - xr = xzalloc (sizeof *xr); - d = &xr->driver; - output_driver_init (d, &cairo_driver_class, name, device_type); - xr->font_height = XR_POINT * 10; - xr->fonts[XR_FONT_FIXED].string - = parse_string (opt (d, o, "fixed-font", "monospace")); - xr->fonts[XR_FONT_PROPORTIONAL].string - = parse_string (opt (d, o, "prop-font", "serif")); - xr->fonts[XR_FONT_EMPHASIS].string - = parse_string (opt (d, o, "emph-font", "serif italic")); + int font_points = parse_int (opt (d, o, "font-size", "10000"), 1000, 1000000); + xr->fonts[XR_FONT_FIXED].desc = parse_font (d, o, "fixed-font", "monospace", + font_points); + xr->fonts[XR_FONT_PROPORTIONAL].desc = parse_font (d, o, "prop-font", + "serif", font_points); + xr->fonts[XR_FONT_EMPHASIS].desc = parse_font (d, o, "emph-font", + "serif italic", font_points); + xr->line_gutter = XR_POINT; xr->line_space = XR_POINT; xr->line_width = XR_POINT / 2; xr->page_number = 0; - xr->headers = parse_boolean (opt (d, o, "headers", "true")); + parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &xr->bg_red, &xr->bg_green, &xr->bg_blue); + parse_color (d, o, "foreground-color", "#000000000000", &xr->fg_red, &xr->fg_green, &xr->fg_blue); parse_paper_size (opt (d, o, "paper-size", ""), &paper_width, &paper_length); xr->left_margin = parse_dimension (opt (d, o, "left-margin", ".5in")); @@ -215,26 +270,74 @@ xr_allocate (const char *name, int device_type, struct string_map *o) xr->top_margin = parse_dimension (opt (d, o, "top-margin", ".5in")); xr->bottom_margin = parse_dimension (opt (d, o, "bottom-margin", ".5in")); - if (xr->headers) - xr->top_margin += 3 * xr->font_height; xr->width = paper_width - xr->left_margin - xr->right_margin; xr->length = paper_length - xr->top_margin - xr->bottom_margin; +} + +static struct xr_driver * +xr_allocate (const char *name, int device_type, struct string_map *o) +{ + struct xr_driver *xr = xzalloc (sizeof *xr); + struct output_driver *d = &xr->driver; + + output_driver_init (d, &cairo_driver_class, name, device_type); + + apply_options (xr, o); return xr; } +static bool +xr_is_72dpi (cairo_t *cr) +{ + cairo_surface_type_t type; + cairo_surface_t *surface; + + surface = cairo_get_target (cr); + type = cairo_surface_get_type (surface); + return type == CAIRO_SURFACE_TYPE_PDF || type == CAIRO_SURFACE_TYPE_PS; +} + static bool xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) { + PangoContext *context; + PangoFontMap *map; int i; xr->cairo = cairo; cairo_set_line_width (xr->cairo, xr_to_pt (xr->line_width)); + map = pango_cairo_font_map_get_default (); + context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP (map)); + if (xr_is_72dpi (cairo)) + { + /* Pango seems to always scale fonts according to the DPI specified + in the font map, even if the surface has a real DPI. The default + DPI is 96, so on a 72 DPI device fonts end up being 96/72 = 133% + of their desired size. We deal with this by fixing the resolution + here. Presumably there is a better solution, but what? */ + pango_cairo_context_set_resolution (context, 72.0); + } + + xr->char_width = 0; + xr->char_height = 0; for (i = 0; i < XR_N_FONTS; i++) - if (!load_font (xr, &xr->fonts[i])) - return false; + { + struct xr_font *font = &xr->fonts[i]; + int char_width, char_height; + + font->layout = pango_layout_new (context); + pango_layout_set_font_description (font->layout, font->desc); + + pango_layout_set_text (font->layout, "0", 1); + pango_layout_get_size (font->layout, &char_width, &char_height); + xr->char_width = MAX (xr->char_width, char_width); + xr->char_height = MAX (xr->char_height, char_height); + } + + g_object_unref (G_OBJECT (context)); if (xr->params == NULL) { @@ -248,8 +351,8 @@ xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) xr->params->aux = xr; xr->params->size[H] = xr->width; xr->params->size[V] = xr->length; - xr->params->font_size[H] = xr->font_height / 2; /* XXX */ - xr->params->font_size[V] = xr->font_height; + xr->params->font_size[H] = xr->char_width; + xr->params->font_size[V] = xr->char_height; single_width = 2 * xr->line_gutter + xr->line_width; double_width = 2 * xr->line_gutter + xr->line_space + 2 * xr->line_width; @@ -261,6 +364,8 @@ xr_set_cairo (struct xr_driver *xr, cairo_t *cairo) } } + cairo_set_source_rgb (xr->cairo, xr->fg_red, xr->fg_green, xr->fg_blue); + return true; } @@ -292,7 +397,7 @@ xr_create (const char *file_name, enum settings_output_devices device_type, status = cairo_surface_status (surface); if (status != CAIRO_STATUS_SUCCESS) { - error (0, 0, _("error opening output file \"%s\": %s"), + error (0, 0, _("error opening output file `%s': %s"), file_name, cairo_status_to_string (status)); cairo_surface_destroy (surface); goto error; @@ -307,29 +412,26 @@ xr_create (const char *file_name, enum settings_output_devices device_type, cairo_save (xr->cairo); xr_driver_next_page (xr, xr->cairo); - if (xr->width / (xr->font_height / 2) < MIN_WIDTH) + if (xr->width / xr->char_width < MIN_WIDTH) { error (0, 0, _("The defined page is not wide enough to hold at least %d " "characters in the default font. In fact, there's only " "room for %d characters."), MIN_WIDTH, - xr->width / (xr->font_height / 2)); + xr->width / xr->char_width); goto error; } - if (xr->length / xr->font_height < MIN_LENGTH) + if (xr->length / xr->char_height < MIN_LENGTH) { - error (0, 0, _("The defined page is not long " - "enough to hold margins and headers, plus least %d " - "lines of the default fonts. In fact, there's only " + error (0, 0, _("The defined page is not long enough to hold at least %d " + "lines in the default font. In fact, there's only " "room for %d lines."), MIN_LENGTH, - xr->length / xr->font_height); + xr->length / xr->char_height); goto error; } - draw_headers (xr); - return &xr->driver; error: @@ -381,7 +483,15 @@ xr_destroy (struct output_driver *driver) free (xr->command_name); for (i = 0; i < XR_N_FONTS; i++) - free_font (&xr->fonts[i]); + { + struct xr_font *font = &xr->fonts[i]; + + if (font->desc != NULL) + pango_font_description_free (font->desc); + if (font->layout != NULL) + g_object_unref (font->layout); + } + free (xr->params); free (xr); } @@ -404,16 +514,21 @@ xr_init_caption_cell (const char *caption, struct table_cell *cell) static struct render_page * xr_render_table_item (struct xr_driver *xr, const struct table_item *item, - int *caption_heightp) + int *caption_widthp, int *caption_heightp) { const char *caption = table_item_get_caption (item); if (caption != NULL) { /* XXX doesn't do well with very large captions */ + int min_width, max_width; struct table_cell cell; + xr_init_caption_cell (caption, &cell); - *caption_heightp = xr_measure_cell_height (xr, &cell, xr->width); + + xr_measure_cell_width (xr, &cell, &min_width, &max_width); + *caption_widthp = MIN (max_width, xr->width); + *caption_heightp = xr_measure_cell_height (xr, &cell, *caption_widthp); } else *caption_heightp = 0; @@ -437,7 +552,7 @@ xr_submit (struct output_driver *driver, const struct output_item *output_item) } /* Functions for rendering a series of output items to a series of Cairo - contexts, with pagination, possibly including headers. + contexts, with pagination. Used by PSPPIRE for printing, and by the basic Cairo output driver above as its underlying implementation. @@ -451,14 +566,21 @@ void xr_driver_next_page (struct xr_driver *xr, cairo_t *cairo) { if (cairo != NULL) - cairo_translate (cairo, - xr_to_pt (xr->left_margin), - xr_to_pt (xr->top_margin)); + { + cairo_save (cairo); + cairo_set_source_rgb (cairo, xr->bg_red, xr->bg_green, xr->bg_blue); + 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->page_number++; xr->cairo = cairo; xr->y = 0; - draw_headers (xr); xr_driver_run_fsm (xr); } @@ -483,8 +605,7 @@ xr_driver_need_new_page (const struct xr_driver *xr) return xr->fsm != NULL; } -/* Returns true if the current page doesn't have any content yet (besides - headers, if enabled). */ +/* Returns true if the current page doesn't have any content yet. */ bool xr_driver_is_page_blank (const struct xr_driver *xr) { @@ -720,79 +841,6 @@ xr_draw_cell (void *xr_, const struct table_cell *cell, xr_layout_cell (xr, cell, bb, clip, PANGO_WRAP_WORD, &w, &h); } -/* Writes STRING at location (X,Y) trimmed to the given MAX_WIDTH - and with the given cell OPTIONS for XR. */ -static int -draw_text (struct xr_driver *xr, const char *string, int x, int y, - int max_width, unsigned int options) -{ - struct table_cell cell; - int bb[TABLE_N_AXES][2]; - int w, h; - - cell.contents = string; - cell.options = options; - bb[H][0] = x; - bb[V][0] = y - xr->y; - bb[H][1] = x + max_width; - bb[V][1] = xr->font_height - xr->y; - xr_layout_cell (xr, &cell, bb, bb, PANGO_WRAP_WORD_CHAR, &w, &h); - return w; -} - -/* Writes LEFT left-justified and RIGHT right-justified within - (X0...X1) at Y. LEFT or RIGHT or both may be null. */ -static void -draw_header_line (struct xr_driver *xr, const char *left, const char *right, - int x0, int x1, int y) -{ - int right_width = 0; - if (right != NULL) - right_width = (draw_text (xr, right, x0, y, x1 - x0, TAB_RIGHT) - + xr->font_height / 2); - if (left != NULL) - draw_text (xr, left, x0, y, x1 - x0 - right_width, TAB_LEFT); -} - -/* Draw top of page headers for XR. */ -static void -draw_headers (struct xr_driver *xr) -{ - char *r1, *r2; - int x0, x1; - int y; - - if (!xr->headers || xr->cairo == NULL) - return; - - y = -3 * xr->font_height; - x0 = xr->font_height / 2; - x1 = xr->width - xr->font_height / 2; - - /* Draw box. */ - cairo_rectangle (xr->cairo, 0, xr_to_pt (y), xr_to_pt (xr->width), - xr_to_pt (2 * (xr->font_height - + xr->line_width + xr->line_gutter))); - cairo_save (xr->cairo); - cairo_set_source_rgb (xr->cairo, 0.9, 0.9, 0.9); - cairo_fill_preserve (xr->cairo); - cairo_restore (xr->cairo); - cairo_stroke (xr->cairo); - - y += xr->line_width + xr->line_gutter; - - r1 = xasprintf (_("%s - Page %d"), get_start_date (), xr->page_number); - r2 = xasprintf ("%s - %s", version, host_system); - - draw_header_line (xr, xr->title, r1, x0, x1, y); - y += xr->font_height; - - draw_header_line (xr, xr->subtitle, r2, x0, x1, y); - - free (r1); - free (r2); -} - static void xr_layout_cell (struct xr_driver *xr, const struct table_cell *cell, int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], @@ -848,46 +896,22 @@ xr_layout_cell (struct xr_driver *xr, const struct table_cell *cell, *height = h; } } - -/* Attempts to load FONT, initializing its other members based on - its 'string' member and the information in DRIVER. Returns true - if successful, otherwise false. */ -static bool -load_font (struct xr_driver *xr, struct xr_font *font) -{ - PangoContext *context; - PangoLanguage *language; - - font->desc = pango_font_description_from_string (font->string); - if (font->desc == NULL) - { - error (0, 0, _("\"%s\": bad font specification"), font->string); - return false; - } - pango_font_description_set_absolute_size (font->desc, xr->font_height); - - font->layout = pango_cairo_create_layout (xr->cairo); - pango_layout_set_font_description (font->layout, font->desc); - - language = pango_language_get_default (); - context = pango_layout_get_context (font->layout); - font->metrics = pango_context_get_metrics (context, font->desc, language); - - return true; -} -/* Frees FONT. */ static void -free_font (struct xr_font *font) +xr_draw_title (struct xr_driver *xr, const char *title, + int title_width, int title_height) { - free (font->string); - if (font->desc != NULL) - pango_font_description_free (font->desc); - pango_font_metrics_unref (font->metrics); - if (font->layout != NULL) - g_object_unref (font->layout); -} + struct table_cell cell; + int bb[TABLE_N_AXES][2]; + xr_init_caption_cell (title, &cell); + bb[H][0] = 0; + bb[H][1] = title_width; + bb[V][0] = 0; + bb[V][1] = title_height; + xr_draw_cell (xr, &cell, bb, bb); +} + struct output_driver_factory pdf_driver_factory = { "pdf", xr_pdf_create }; struct output_driver_factory ps_driver_factory = { "ps", xr_ps_create }; struct output_driver_factory svg_driver_factory = { "svg", xr_svg_create }; @@ -904,18 +928,20 @@ static const struct output_driver_class cairo_driver_class = struct xr_rendering { + struct output_item *item; + /* Table items. */ struct render_page *page; struct xr_driver *xr; + int title_width; int title_height; - - /* Chart items. */ - struct chart_item *chart; }; #define CHART_WIDTH 500 #define CHART_HEIGHT 375 + + struct xr_driver * xr_driver_create (cairo_t *cairo, struct string_map *options) { @@ -946,13 +972,19 @@ xr_rendering_create_text (struct xr_driver *xr, const char *text, cairo_t *cr) struct table_item *table_item; struct xr_rendering *r; - table_item = table_item_create (table_from_string (0, text), NULL); + table_item = table_item_create (table_from_string (TAB_LEFT, text), NULL); r = xr_rendering_create (xr, &table_item->output_item, cr); table_item_unref (table_item); return r; } +void +xr_rendering_apply_options (struct xr_rendering *xr, struct string_map *o) +{ + apply_options (xr->xr, o); +} + struct xr_rendering * xr_rendering_create (struct xr_driver *xr, const struct output_item *item, cairo_t *cr) @@ -973,15 +1005,18 @@ xr_rendering_create (struct xr_driver *xr, const struct output_item *item, else if (is_table_item (item)) { r = xzalloc (sizeof *r); + r->item = output_item_ref (item); r->xr = xr; xr_set_cairo (xr, cr); r->page = xr_render_table_item (xr, to_table_item (item), - &r->title_height); + &r->title_width, &r->title_height); } else if (is_chart_item (item)) { r = xzalloc (sizeof *r); - r->chart = to_chart_item (output_item_ref (item)); + r->item = output_item_ref (item); + r->xr = xr; + xr_set_cairo (xr, cr); } return r; @@ -990,9 +1025,11 @@ xr_rendering_create (struct xr_driver *xr, const struct output_item *item, void xr_rendering_measure (struct xr_rendering *r, int *w, int *h) { - if (r->chart == NULL) + if (is_table_item (r->item)) { - *w = render_page_get_size (r->page, H) / 1024; + int w0 = render_page_get_size (r->page, H); + int w1 = r->title_width; + *w = MAX (w0, w1) / 1024; *h = (render_page_get_size (r->page, V) + r->title_height) / 1024; } else @@ -1002,22 +1039,38 @@ xr_rendering_measure (struct xr_rendering *r, int *w, int *h) } } +static void xr_draw_chart (const struct chart_item *, cairo_t *, + double x, double y, double width, double height); + +/* Draws onto CR at least the region of R that is enclosed in (X,Y)-(X+W,Y+H), + and possibly some additional parts. */ void -xr_rendering_draw (struct xr_rendering *r, cairo_t *cr) +xr_rendering_draw (struct xr_rendering *r, cairo_t *cr, + int x, int y, int w, int h) { - if (r->chart == NULL) + if (is_table_item (r->item)) { struct xr_driver *xr = r->xr; xr_set_cairo (xr, cr); - xr->y = 0; - render_page_draw (r->page); + + if (r->title_height > 0) + { + xr->y = 0; + xr_draw_title (xr, table_item_get_caption (to_table_item (r->item)), + r->title_width, r->title_height); + } + + xr->y = r->title_height; + render_page_draw_region (r->page, x * 1024, (y * 1024) - r->title_height, + w * 1024, h * 1024); } else - xr_draw_chart (r->chart, cr, 0, 0, CHART_WIDTH, CHART_HEIGHT); + xr_draw_chart (to_chart_item (r->item), cr, + 0, 0, CHART_WIDTH, CHART_HEIGHT); } -void +static void xr_draw_chart (const struct chart_item *chart_item, cairo_t *cr, double x, double y, double width, double height) { @@ -1069,19 +1122,13 @@ xr_draw_png_chart (const struct chart_item *item, surface = cairo_image_surface_create (CAIRO_FORMAT_RGB24, width, length); cr = cairo_create (surface); - cairo_save (cr); - cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); - cairo_rectangle (cr, 0, 0, width, length); - cairo_fill (cr); - cairo_restore (cr); - cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); xr_draw_chart (item, cr, 0.0, 0.0, width, length); status = cairo_surface_write_to_png (surface, file_name); if (status != CAIRO_STATUS_SUCCESS) - error (0, 0, _("error writing output file \"%s\": %s"), + error (0, 0, _("error writing output file `%s': %s"), file_name, cairo_status_to_string (status)); cairo_destroy (cr); @@ -1132,18 +1179,9 @@ xr_table_render (struct xr_render_fsm *fsm, struct xr_driver *xr) if (ts->caption_height) { if (xr->cairo) - { - struct table_cell cell; - int bb[TABLE_N_AXES][2]; - - xr_init_caption_cell (table_item_get_caption (ts->table_item), - &cell); - bb[H][0] = 0; - bb[H][1] = xr->width; - bb[V][0] = 0; - bb[V][1] = ts->caption_height; - xr_draw_cell (xr, &cell, bb, bb); - } + xr_draw_title (xr, table_item_get_caption (ts->table_item), + xr->width, ts->caption_height); + xr->y += ts->caption_height; ts->caption_height = 0; } @@ -1171,6 +1209,7 @@ xr_render_table (struct xr_driver *xr, const struct table_item *table_item) { struct xr_table_state *ts; struct render_page *page; + int caption_width; ts = xmalloc (sizeof *ts); ts->fsm.render = xr_table_render; @@ -1178,9 +1217,10 @@ xr_render_table (struct xr_driver *xr, const struct table_item *table_item) ts->table_item = table_item_ref (table_item); if (xr->y > 0) - xr->y += xr->font_height; + xr->y += xr->char_height; - page = xr_render_table_item (xr, table_item, &ts->caption_height); + page = xr_render_table_item (xr, table_item, + &caption_width, &ts->caption_height); xr->params->size[V] = xr->length - ts->caption_height; render_break_init (&ts->x_break, page, H); @@ -1281,13 +1321,11 @@ xr_render_text (struct xr_driver *xr, const struct text_item *text_item) case TEXT_ITEM_TITLE: free (xr->title); xr->title = xstrdup (text); - draw_headers (xr); break; case TEXT_ITEM_SUBTITLE: free (xr->subtitle); xr->subtitle = xstrdup (text); - draw_headers (xr); break; case TEXT_ITEM_COMMAND_CLOSE: @@ -1295,7 +1333,7 @@ xr_render_text (struct xr_driver *xr, const struct text_item *text_item) case TEXT_ITEM_BLANK_LINE: if (xr->y > 0) - xr->y += xr->font_height; + xr->y += xr->char_height; break; case TEXT_ITEM_EJECT_PAGE: