X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fascii.c;h=1a470d0f53ee319e424634190e2a33bdb00967bb;hb=078b003b3171c6158a3419a01189b9658896f470;hp=8ac2b189abf60bb5dd766e322754ce82dd38c22b;hpb=dbe1d88697fe0b37bc1cc5b0bcbacc2d3f26c1f1;p=pspp diff --git a/src/output/ascii.c b/src/output/ascii.c index 8ac2b189ab..1a470d0f53 100644 --- a/src/output/ascii.c +++ b/src/output/ascii.c @@ -45,7 +45,6 @@ #include "output/message-item.h" #include "output/options.h" #include "output/render.h" -#include "output/tab.h" #include "output/table-item.h" #include "output/text-item.h" @@ -184,8 +183,8 @@ struct ascii_driver #ifdef HAVE_CAIRO /* Colours for charts */ - struct xr_color fg; - struct xr_color bg; + struct cell_color fg; + struct cell_color bg; #endif int width; /* Page width. */ @@ -240,6 +239,19 @@ opt (struct output_driver *d, struct string_map *options, const char *key, return driver_option_get (d, options, key, default_value); } +/* Return true iff the terminal appears to be an xterm with + UTF-8 capabilities */ +static bool +term_is_utf8_xterm (void) +{ + const char *term = getenv ("TERM"); + const char *xterm_locale = getenv ("XTERM_LOCAL"); + return (term && xterm_locale + && !strcmp (term, "xterm") + && (strcasestr (xterm_locale, "utf8") + || strcasestr (xterm_locale, "utf-8"))); +} + static struct output_driver * ascii_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o) @@ -267,7 +279,13 @@ ascii_create (struct file_handle *fh, enum settings_output_devices device_type, parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &a->bg); parse_color (d, o, "foreground-color", "#000000000000", &a->fg); #endif - box = parse_enum (opt (d, o, "box", "ascii"), + + const char *default_box = (!strcmp (fh_get_file_name (fh), "-") + && isatty (STDOUT_FILENO) + && (!strcmp (locale_charset (), "UTF-8") + || term_is_utf8_xterm ()) + ? "unicode" : "ascii"); + box = parse_enum (opt (d, o, "box", default_box), "ascii", BOX_ASCII, "unicode", BOX_UNICODE, NULL_SENTINEL); @@ -397,14 +415,16 @@ ascii_output_lines (struct ascii_driver *a, size_t n_lines) { for (size_t y = 0; y < n_lines; y++) { - struct u8_line *line = &a->lines[y]; + if (y < a->allocated_lines) + { + struct u8_line *line = &a->lines[y]; - while (ds_chomp_byte (&line->s, ' ')) - continue; - fwrite (ds_data (&line->s), 1, ds_length (&line->s), a->file); + while (ds_chomp_byte (&line->s, ' ')) + continue; + fwrite (ds_data (&line->s), 1, ds_length (&line->s), a->file); + u8_line_clear (&a->lines[y]); + } putc ('\n', a->file); - - u8_line_clear (&a->lines[y]); } } @@ -432,16 +452,20 @@ ascii_output_table_item (struct ascii_driver *a, } static void -ascii_output_text (struct ascii_driver *a, const char *text) +ascii_output_table_item_unref (struct ascii_driver *a, + struct table_item *table_item) { - struct table_item *table_item; - - table_item = table_item_create (table_from_string (TAB_LEFT, text), - NULL, NULL); ascii_output_table_item (a, table_item); table_item_unref (table_item); } +static void +ascii_output_text (struct ascii_driver *a, const char *text) +{ + ascii_output_table_item_unref ( + a, table_item_create (table_from_string (text), NULL, NULL)); +} + static void ascii_submit (struct output_driver *driver, const struct output_item *output_item) @@ -468,7 +492,7 @@ ascii_submit (struct output_driver *driver, struct text_item *text_item; text_item = text_item_create_format ( - TEXT_ITEM_PARAGRAPH, _("See %s for a chart."), file_name); + TEXT_ITEM_LOG, _("See %s for a chart."), file_name); ascii_submit (driver, &text_item->output_item); text_item_unref (text_item); @@ -481,19 +505,9 @@ ascii_submit (struct output_driver *driver, const struct text_item *text_item = to_text_item (output_item); enum text_item_type type = text_item_get_type (text_item); - switch (type) - { - case TEXT_ITEM_PAGE_TITLE: - case TEXT_ITEM_BLANK_LINE: - break; - - case TEXT_ITEM_EJECT_PAGE: - break; - - default: - ascii_output_table_item (a, text_item_to_table_item (text_item_ref (text_item))); - break; - } + if (type != TEXT_ITEM_PAGE_TITLE && type != TEXT_ITEM_EJECT_PAGE) + ascii_output_table_item_unref ( + a, text_item_to_table_item (text_item_ref (text_item))); } else if (is_message_item (output_item)) { @@ -576,9 +590,7 @@ ascii_measure_cell_width (void *a_, const struct table_cell *cell, clip[H][0] = clip[H][1] = clip[V][0] = clip[V][1] = 0; ascii_layout_cell (a, cell, bb, clip, max_width, &h); - if (cell->n_contents != 1 - || cell->contents[0].n_footnotes - || strchr (cell->contents[0].text, ' ')) + if (cell->n_footnotes || strchr (cell->text, ' ')) { bb[H][1] = 1; ascii_layout_cell (a, cell, bb, clip, min_width, &h); @@ -633,7 +645,7 @@ ascii_reserve (struct ascii_driver *a, int y, int x0, int x1, int n) } static void -text_draw (struct ascii_driver *a, unsigned int options, +text_draw (struct ascii_driver *a, enum table_halign halign, int options, bool bold, bool underline, int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], int y, const uint8_t *string, int n, size_t width) @@ -647,15 +659,16 @@ text_draw (struct ascii_driver *a, unsigned int options, if (y < y0 || y >= y1) return; - switch (options & TAB_HALIGN) + switch (table_halign_interpret (halign, options & TAB_NUMERIC)) { - case TAB_LEFT: + case TABLE_HALIGN_LEFT: x = bb[H][0]; break; - case TAB_CENTER: + case TABLE_HALIGN_CENTER: x = (bb[H][0] + bb[H][1] - width + 1) / 2; break; - case TAB_RIGHT: + case TABLE_HALIGN_RIGHT: + case TABLE_HALIGN_DECIMAL: x = bb[H][1] - width; break; default: @@ -771,39 +784,34 @@ text_draw (struct ascii_driver *a, unsigned int options, } static char * -add_footnote_markers (const char *text, const struct cell_contents *contents) +add_footnote_markers (const char *text, const struct table_cell *cell) { struct string s = DS_EMPTY_INITIALIZER; ds_put_cstr (&s, text); - for (size_t i = 0; i < contents->n_footnotes; i++) - ds_put_format (&s, "[%s]", contents->footnotes[i]->marker); + for (size_t i = 0; i < cell->n_footnotes; i++) + ds_put_format (&s, "[%s]", cell->footnotes[i]->marker); return ds_steal_cstr (&s); } -static int -ascii_layout_cell_text (struct ascii_driver *a, - const struct cell_contents *contents, - bool bold, bool underline, - int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], - int *widthp) +static void +ascii_layout_cell (struct ascii_driver *a, const struct table_cell *cell, + int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], + int *widthp, int *heightp) { - char *breaks; - int bb_width; - size_t pos; - - int y = bb[V][0]; + *widthp = 0; + *heightp = 0; /* Get the basic textual contents. */ - const char *plain_text = (contents->options & TAB_MARKUP - ? output_get_text_from_markup (contents->text) - : contents->text); + const char *plain_text = (cell->options & TAB_MARKUP + ? output_get_text_from_markup (cell->text) + : cell->text); /* Append footnote markers if any. */ const char *text; - if (contents->n_footnotes) + if (cell->n_footnotes) { - text = add_footnote_markers (plain_text, contents); - if (plain_text != contents->text) + text = add_footnote_markers (plain_text, cell); + if (plain_text != cell->text) free (CONST_CAST (char *, plain_text)); } else @@ -813,20 +821,20 @@ ascii_layout_cell_text (struct ascii_driver *a, size_t length = strlen (text); if (!length) { - if (text != contents->text) + if (text != cell->text) free (CONST_CAST (char *, text)); - return y; + return; } - breaks = xmalloc (length + 1); + char *breaks = xmalloc (length + 1); u8_possible_linebreaks (CHAR_CAST (const uint8_t *, text), length, "UTF-8", breaks); breaks[length] = (breaks[length - 1] == UC_BREAK_MANDATORY ? UC_BREAK_PROHIBITED : UC_BREAK_POSSIBLE); - pos = 0; - bb_width = bb[H][1] - bb[H][0]; - for (y = bb[V][0]; y < bb[V][1] && pos < length; y++) + size_t pos = 0; + int bb_width = bb[H][1] - bb[H][0]; + for (int y = bb[V][0]; y < bb[V][1] && pos < length; y++) { const uint8_t *line = CHAR_CAST (const uint8_t *, text + pos); const char *b = breaks + pos; @@ -879,7 +887,9 @@ ascii_layout_cell_text (struct ascii_driver *a, width -= ofs - graph_ofs; /* Draw text. */ - text_draw (a, contents->options, bold, underline, + text_draw (a, cell->style->cell_style.halign, cell->options, + cell->style->font_style.bold, + cell->style->font_style.underline, bb, clip, y, line, graph_ofs, width); /* If a new-line ended the line, just skip the new-line. Otherwise, skip @@ -892,45 +902,13 @@ ascii_layout_cell_text (struct ascii_driver *a, if (width > *widthp) *widthp = width; + ++*heightp; pos += ofs; } free (breaks); - if (text != contents->text) + if (text != cell->text) free (CONST_CAST (char *, text)); - - return y; -} - -static void -ascii_layout_cell (struct ascii_driver *a, const struct table_cell *cell, - int bb_[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], - int *widthp, int *heightp) -{ - int bb[TABLE_N_AXES][2]; - size_t i; - - *widthp = 0; - *heightp = 0; - - memcpy (bb, bb_, sizeof bb); - for (i = 0; i < cell->n_contents && bb[V][0] < bb[V][1]; i++) - { - const struct cell_contents *contents = &cell->contents[i]; - - /* Put a blank line between contents. */ - if (i > 0) - { - bb[V][0]++; - if (bb[V][0] >= bb[V][1]) - break; - } - - bb[V][0] = ascii_layout_cell_text (a, contents, cell->style->bold, - cell->style->underline, - bb, clip, widthp); - } - *heightp = bb[V][0] - bb_[V][0]; } void @@ -944,18 +922,14 @@ ascii_test_write (struct output_driver *driver, if (a->file == NULL && !ascii_open_page (a)) return; - struct cell_contents contents = { - .options = TAB_LEFT, - .text = CONST_CAST (char *, s), - }; - struct cell_style cell_style = { - .bold = bold, - .underline = underline, + struct area_style style = { + .cell_style.halign = TABLE_HALIGN_LEFT, + .font_style.bold = bold, + .font_style.underline = underline, }; struct table_cell cell = { - .contents = &contents, - .n_contents = 1, - .style = &cell_style, + .text = CONST_CAST (char *, s), + .style = &style, }; bb[TABLE_HORZ][0] = x;