X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fascii.c;h=6535121d8c0418bcc17686a3985fd00643a7a605;hb=5cc8d996ceb67400912b46199ae658cdfbfea180;hp=c058f23f8a645068ce33de1ca4eda607c339242c;hpb=26bad54c73bdb354262a2434de93e632a286b0d3;p=pspp diff --git a/src/output/ascii.c b/src/output/ascii.c index c058f23f8a..6535121d8c 100644 --- a/src/output/ascii.c +++ b/src/output/ascii.c @@ -28,11 +28,8 @@ #include #ifdef HAVE_TERMIOS_H -# include -#endif - -#ifdef GWINSZ_IN_SYS_IOCTL # include +# include #endif #include "data/file-name.h" @@ -47,16 +44,14 @@ #include "libpspp/u8-line.h" #include "libpspp/version.h" #include "output/ascii.h" -#ifdef HAVE_CAIRO #include "output/cairo-chart.h" -#endif -#include "output/chart-item-provider.h" +#include "output/chart-provider.h" #include "output/driver-provider.h" -#include "output/message-item.h" #include "output/options.h" +#include "output/pivot-output.h" +#include "output/pivot-table.h" #include "output/render.h" -#include "output/table-item.h" -#include "output/text-item.h" +#include "output/output-item.h" #include "gl/minmax.h" #include "gl/xalloc.h" @@ -293,11 +288,9 @@ struct ascii_driver bool emphasis; /* Enable bold and underline in output? */ char *chart_file_name; /* Name of files used for charts. */ -#ifdef HAVE_CAIRO /* Colours for charts */ struct cell_color fg; struct cell_color bg; -#endif /* How the page width is determined: */ enum { @@ -317,8 +310,9 @@ struct ascii_driver bool error; /* Output error? */ struct u8_line *lines; /* Page content. */ int allocated_lines; /* Number of lines allocated. */ - int chart_cnt; /* Number of charts so far. */ - int object_cnt; /* Number of objects so far. */ + int n_charts; /* Number of charts so far. */ + int n_objects; /* Number of objects so far. */ + const struct pivot_table *pt; struct render_params params; }; @@ -376,9 +370,7 @@ ascii_create (struct file_handle *fh, enum settings_output_devices device_type, { enum { BOX_ASCII, BOX_UNICODE } box; struct output_driver *d; - struct ascii_driver *a; - - a = xzalloc (sizeof *a); + struct ascii_driver *a = XZALLOC (struct ascii_driver); d = &a->driver; output_driver_init (&a->driver, &ascii_driver_class, fh_get_file_name (fh), device_type); a->append = parse_boolean (opt (d, o, "append", "false")); @@ -395,10 +387,8 @@ ascii_create (struct file_handle *fh, enum settings_output_devices device_type, : VIEW_WIDTH); a->min_hbreak = parse_int (opt (d, o, "min-hbreak", "-1"), -1, INT_MAX); -#ifdef HAVE_CAIRO a->bg = parse_color (opt (d, o, "background-color", "#FFFFFFFFFFFF")); a->fg = parse_color (opt (d, o, "foreground-color", "#000000000000")); -#endif const char *default_box = (terminal && (!strcmp (locale_charset (), "UTF-8") || term_is_utf8_xterm ()) @@ -413,8 +403,8 @@ ascii_create (struct file_handle *fh, enum settings_output_devices device_type, a->error = false; a->lines = NULL; a->allocated_lines = 0; - a->chart_cnt = 0; - a->object_cnt = 0; + a->n_charts = 0; + a->n_objects = 0; static const struct render_ops ascii_render_ops = { .draw_line = ascii_draw_line, @@ -441,6 +431,7 @@ ascii_create (struct file_handle *fh, enum settings_output_devices device_type, a->params.line_widths = ascii_line_widths; a->params.supports_margins = false; a->params.rtl = render_direction_rtl (); + a->params.printing = true; if (!update_page_size (a, true)) goto error; @@ -556,84 +547,107 @@ ascii_output_lines (struct ascii_driver *a, size_t n_lines) static void ascii_output_table_item (struct ascii_driver *a, - const struct table_item *table_item) + const struct output_item *item) { - struct render_pager *p; - update_page_size (a, false); + a->pt = item->table; - if (a->object_cnt++) - putc ('\n', a->file); - - p = render_pager_create (&a->params, table_item); - for (int i = 0; render_pager_has_next (p); i++) + size_t *layer_indexes; + PIVOT_OUTPUT_FOR_EACH_LAYER (layer_indexes, item->table, true) { - if (i) - putc ('\n', a->file); - ascii_output_lines (a, render_pager_draw_next (p, INT_MAX)); + struct render_pager *p = render_pager_create (&a->params, item->table, + layer_indexes); + for (int i = 0; render_pager_has_next (p); i++) + { + if (a->n_objects++) + putc ('\n', a->file); + + ascii_output_lines (a, render_pager_draw_next (p, INT_MAX)); + } + render_pager_destroy (p); } - render_pager_destroy (p); + + a->pt = NULL; } static void ascii_output_table_item_unref (struct ascii_driver *a, - struct table_item *table_item) + struct output_item *table_item) { ascii_output_table_item (a, table_item); - table_item_unref (table_item); + output_item_unref (table_item); } static void -ascii_submit (struct output_driver *driver, - const struct output_item *output_item) +ascii_submit (struct output_driver *driver, const struct output_item *item) { struct ascii_driver *a = ascii_driver_cast (driver); - if (a->error) return; - if (is_table_item (output_item)) - ascii_output_table_item (a, to_table_item (output_item)); -#ifdef HAVE_CAIRO - else if (is_chart_item (output_item) && a->chart_file_name != NULL) + switch (item->type) { - struct chart_item *chart_item = to_chart_item (output_item); - char *file_name; - - file_name = xr_draw_png_chart (chart_item, a->chart_file_name, - ++a->chart_cnt, - &a->fg, - &a->bg); - if (file_name != NULL) - { - struct text_item *text_item; + case OUTPUT_ITEM_TABLE: + ascii_output_table_item (a, item); + break; - text_item = text_item_create_nocopy ( - TEXT_ITEM_LOG, - xasprintf (_("See %s for a chart."), file_name), - NULL); + case OUTPUT_ITEM_IMAGE: + if (a->chart_file_name != NULL) + { + char *file_name = xr_write_png_image ( + item->image, a->chart_file_name, ++a->n_charts); + if (file_name != NULL) + { + struct output_item *text_item = text_item_create_nocopy ( + TEXT_ITEM_LOG, + xasprintf (_("See %s for an image."), file_name), + NULL); + + ascii_submit (driver, text_item); + output_item_unref (text_item); + free (file_name); + } + } + break; - ascii_submit (driver, &text_item->output_item); - text_item_unref (text_item); - free (file_name); + case OUTPUT_ITEM_CHART: + if (a->chart_file_name != NULL) + { + char *file_name = xr_draw_png_chart ( + item->chart, a->chart_file_name, ++a->n_charts, &a->fg, &a->bg); + if (file_name != NULL) + { + struct output_item *text_item = text_item_create_nocopy ( + TEXT_ITEM_LOG, + xasprintf (_("See %s for a chart."), file_name), + NULL); + + ascii_submit (driver, text_item); + output_item_unref (text_item); + free (file_name); + } } - } -#endif /* HAVE_CAIRO */ - else if (is_text_item (output_item)) - { - const struct text_item *text_item = to_text_item (output_item); - enum text_item_type type = text_item_get_type (text_item); + break; - if (type != TEXT_ITEM_PAGE_TITLE) + case OUTPUT_ITEM_TEXT: + if (item->text.subtype != TEXT_ITEM_PAGE_TITLE) ascii_output_table_item_unref ( - a, text_item_to_table_item (text_item_ref (text_item))); + a, text_item_to_table_item (output_item_ref (item))); + break; + + case OUTPUT_ITEM_MESSAGE: + ascii_output_table_item_unref ( + a, text_item_to_table_item ( + message_item_to_text_item ( + output_item_ref (item)))); + break; + + case OUTPUT_ITEM_GROUP: + break; + + case OUTPUT_ITEM_PAGE_BREAK: + break; } - else if (is_message_item (output_item)) - ascii_output_table_item_unref ( - a, text_item_to_table_item ( - message_item_to_text_item ( - to_message_item ( - output_item_ref (output_item))))); } const struct output_driver_factory txt_driver_factory = @@ -643,10 +657,10 @@ const struct output_driver_factory list_driver_factory = static const struct output_driver_class ascii_driver_class = { - "text", - ascii_destroy, - ascii_submit, - ascii_flush, + .name = "text", + .destroy = ascii_destroy, + .submit = ascii_submit, + .flush = ascii_flush, }; static char *ascii_reserve (struct ascii_driver *, int y, int x0, int x1, @@ -707,14 +721,8 @@ 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_footnotes || strchr (cell->text, ' ') - || cell->n_subscripts) - { - bb[H][1] = 1; - ascii_layout_cell (a, cell, bb, clip, min_width, &h); - } - else - *min_width = *max_width; + bb[H][1] = 1; + ascii_layout_cell (a, cell, bb, clip, min_width, &h); } static int @@ -764,7 +772,7 @@ ascii_reserve (struct ascii_driver *a, int y, int x0, int x1, int n) } static void -text_draw (struct ascii_driver *a, enum table_halign halign, int options, +text_draw (struct ascii_driver *a, enum table_halign halign, bool numeric, 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) @@ -778,7 +786,7 @@ text_draw (struct ascii_driver *a, enum table_halign halign, int options, if (y < y0 || y >= y1) return; - switch (table_halign_interpret (halign, options & TAB_NUMERIC)) + switch (table_halign_interpret (halign, numeric)) { case TABLE_HALIGN_LEFT: x = bb[H][0]; @@ -902,18 +910,6 @@ text_draw (struct ascii_driver *a, enum table_halign halign, int options, } } -static char * -add_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 < cell->n_subscripts; i++) - ds_put_format (&s, "%c%s", i ? ',' : '_', cell->subscripts[i]); - 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 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], @@ -922,34 +918,21 @@ ascii_layout_cell (struct ascii_driver *a, const struct table_cell *cell, *widthp = 0; *heightp = 0; - /* Get the basic textual contents. */ - const char *plain_text = (cell->options & TAB_MARKUP - ? output_get_text_from_markup (cell->text) - : cell->text); - - /* Append footnotes, subscripts if any. */ - const char *text; - if (cell->n_footnotes || cell->n_subscripts) - { - text = add_markers (plain_text, cell); - if (plain_text != cell->text) - free (CONST_CAST (char *, plain_text)); - } - else - text = plain_text; + struct string body = DS_EMPTY_INITIALIZER; + bool numeric = pivot_value_format (cell->value, a->pt, &body); /* Calculate length; if it's zero, then there's nothing to do. */ - size_t length = strlen (text); - if (!length) + if (ds_is_empty (&body)) { - if (text != cell->text) - free (CONST_CAST (char *, text)); + ds_destroy (&body); return; } + size_t length = ds_length (&body); + const uint8_t *text = CHAR_CAST (uint8_t *, ds_cstr (&body)); + char *breaks = xmalloc (length + 1); - u8_possible_linebreaks (CHAR_CAST (const uint8_t *, text), length, - "UTF-8", breaks); + u8_possible_linebreaks (text, length, "UTF-8", breaks); breaks[length] = (breaks[length - 1] == UC_BREAK_MANDATORY ? UC_BREAK_PROHIBITED : UC_BREAK_POSSIBLE); @@ -957,7 +940,7 @@ ascii_layout_cell (struct ascii_driver *a, const struct table_cell *cell, 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 uint8_t *line = text + pos; const char *b = breaks + pos; size_t n = length - pos; @@ -1008,9 +991,9 @@ ascii_layout_cell (struct ascii_driver *a, const struct table_cell *cell, width -= ofs - graph_ofs; /* Draw text. */ - text_draw (a, cell->style->cell_style.halign, cell->options, - cell->style->font_style.bold, - cell->style->font_style.underline, + text_draw (a, cell->cell_style->halign, numeric, + cell->font_style->bold, + cell->font_style->underline, bb, clip, y, line, graph_ofs, width); /* If a new-line ended the line, just skip the new-line. Otherwise, skip @@ -1028,8 +1011,7 @@ ascii_layout_cell (struct ascii_driver *a, const struct table_cell *cell, } free (breaks); - if (text != cell->text) - free (CONST_CAST (char *, text)); + ds_destroy (&body); } void @@ -1043,14 +1025,24 @@ ascii_test_write (struct output_driver *driver, if (!a->file) return; - struct table_area_style style = { - .cell_style.halign = TABLE_HALIGN_LEFT, - .font_style.bold = bold, - .font_style.underline = underline, + struct cell_style cell_style = { .halign = TABLE_HALIGN_LEFT }; + struct font_style font_style = { + .bold = bold, + .underline = underline, + }; + const struct pivot_value value = { + .text = { + .type = PIVOT_VALUE_TEXT, + .local = CONST_CAST (char *, s), + .c = CONST_CAST (char *, s), + .id = CONST_CAST (char *, s), + .user_provided = true, + }, }; struct table_cell cell = { - .text = CONST_CAST (char *, s), - .style = &style, + .value = &value, + .font_style = &font_style, + .cell_style = &cell_style, }; bb[TABLE_HORZ][0] = x; @@ -1058,7 +1050,13 @@ ascii_test_write (struct output_driver *driver, bb[TABLE_VERT][0] = y; bb[TABLE_VERT][1] = INT_MAX; + struct pivot_table pt = { + .show_values = SETTINGS_VALUE_SHOW_DEFAULT, + .show_variables = SETTINGS_VALUE_SHOW_DEFAULT, + }; + a->pt = &pt; ascii_layout_cell (a, &cell, bb, bb, &width, &height); + a->pt = NULL; } void