X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fascii.c;h=3548844693d09380dbfbe73a5ac696b3595b88d9;hb=d2ee46757c7602fb0d6827136fdb00af1140e2e1;hp=b427df5318007df1cb42a04d75ecebfcafa33d65;hpb=f51ecb48027e6b1eb46840ae25888a25b429f012;p=pspp diff --git a/src/output/ascii.c b/src/output/ascii.c index b427df5318..3548844693 100644 --- a/src/output/ascii.c +++ b/src/output/ascii.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2007, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ -21,26 +21,35 @@ #include #include #include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + +#include "data/file-name.h" +#include "data/settings.h" +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "libpspp/compiler.h" +#include "libpspp/message.h" +#include "libpspp/start-date.h" +#include "libpspp/string-map.h" +#include "libpspp/u8-line.h" +#include "libpspp/version.h" +#include "output/ascii.h" +#include "output/cairo.h" +#include "output/chart-item-provider.h" +#include "output/driver-provider.h" +#include "output/message-item.h" #include "output/options.h" -#include -#include -#include -#include -#include +#include "output/render.h" +#include "output/tab.h" +#include "output/table-item.h" +#include "output/text-item.h" -#include "error.h" -#include "minmax.h" -#include "xalloc.h" +#include "gl/minmax.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -49,36 +58,77 @@ #define H TABLE_HORZ #define V TABLE_VERT -/* Line styles bit shifts. */ -enum +#define N_BOX (RENDER_N_LINES * RENDER_N_LINES \ + * RENDER_N_LINES * RENDER_N_LINES) + +static const ucs4_t ascii_box_chars[N_BOX] = { - LNS_TOP = 0, - LNS_LEFT = 2, - LNS_BOTTOM = 4, - LNS_RIGHT = 6, + ' ', '|', '#', + '-', '+', '#', + '=', '#', '#', + '|', '|', '#', + '+', '+', '#', + '#', '#', '#', + '#', '#', '#', + '#', '#', '#', + '#', '#', '#', + '-', '+', '#', + '-', '+', '#', + '#', '#', '#', + '+', '+', '#', + '+', '+', '#', + '#', '#', '#', + '#', '#', '#', + '#', '#', '#', + '#', '#', '#', + '=', '#', '#', + '#', '#', '#', + '=', '#', '#', + '#', '#', '#', + '#', '#', '#', + '#', '#', '#', + '#', '#', '#', + '#', '#', '#', + '#', '#', '#', + }; - LNS_COUNT = 256 +static const ucs4_t unicode_box_chars[N_BOX] = + { + 0x0020, 0x2575, 0x2551, + 0x2574, 0x256f, 0x255c, + 0x2550, 0x255b, 0x255d, + 0x2577, 0x2502, 0x2551, + 0x256e, 0x2524, 0x2562, + 0x2555, 0x2561, 0x2563, + 0x2551, 0x2551, 0x2551, + 0x2556, 0x2562, 0x2562, + 0x2557, 0x2563, 0x2563, + 0x2576, 0x2570, 0x2559, + 0x2500, 0x2534, 0x2568, + 0x2550, 0x2567, 0x2569, + 0x256d, 0x251c, 0x255f, + 0x252c, 0x253c, 0x256a, + 0x2564, 0x256a, 0x256c, + 0x2553, 0x255f, 0x255f, + 0x2565, 0x256b, 0x256b, + 0x2566, 0x256c, 0x256c, + 0x2550, 0x2558, 0x255a, + 0x2550, 0x2567, 0x2569, + 0x2550, 0x2567, 0x2569, + 0x2552, 0x255e, 0x2560, + 0x2564, 0x256a, 0x256c, + 0x2564, 0x256a, 0x256c, + 0x2554, 0x2560, 0x2560, + 0x2560, 0x256c, 0x256c, + 0x2566, 0x256c, 0x256c, }; static inline int make_box_index (int left, int right, int top, int bottom) { - return ((left << LNS_LEFT) | (right << LNS_RIGHT) - | (top << LNS_TOP) | (bottom << LNS_BOTTOM)); + return ((right * RENDER_N_LINES + bottom) * RENDER_N_LINES + left) * RENDER_N_LINES + top; } -/* Character attributes. */ -#define ATTR_EMPHASIS 0x100 /* Bold-face. */ -#define ATTR_BOX 0x200 /* Line drawing character. */ - -/* A line of text. */ -struct ascii_line - { - unsigned short *chars; /* Characters and attributes. */ - int n_chars; /* Length. */ - int allocated_chars; /* Allocated "chars" elements. */ - }; - /* How to emphasize text. */ enum emphasis_style { @@ -100,6 +150,12 @@ struct ascii_driver enum emphasis_style emphasis; /* How to emphasize text. */ char *chart_file_name; /* Name of files used for charts. */ +#ifdef HAVE_CAIRO + /* Colours for charts */ + struct xr_color fg; + struct xr_color bg; +#endif + int width; /* Page width. */ int length; /* Page length minus margins and header. */ bool auto_width; /* Use viewwidth as page width? */ @@ -108,20 +164,22 @@ struct ascii_driver int top_margin; /* Top margin in lines. */ int bottom_margin; /* Bottom margin in lines. */ - char *box[LNS_COUNT]; /* Line & box drawing characters. */ - char *init; /* Device initialization string. */ + int min_break[TABLE_N_AXES]; /* Min cell size to break across pages. */ + + const ucs4_t *box; /* Line & box drawing characters. */ /* Internal state. */ + char *command_name; char *title; char *subtitle; char *file_name; /* Output file name. */ FILE *file; /* Output file. */ bool error; /* Output error? */ int page_number; /* Current page number. */ - struct ascii_line *lines; /* Page content. */ + struct u8_line *lines; /* Page content. */ int allocated_lines; /* Number of lines allocated. */ int chart_cnt; /* Number of charts so far. */ - int y; + int x, y; }; static const struct output_driver_class ascii_driver_class; @@ -130,7 +188,6 @@ static void ascii_submit (struct output_driver *, const struct output_item *); static int vertical_margins (const struct ascii_driver *); -static const char *get_default_box (int right, int bottom, int left, int top); static bool update_page_size (struct ascii_driver *, bool issue_error); static int parse_page_size (struct driver_option *); @@ -147,6 +204,20 @@ static void ascii_draw_cell (void *, const struct table_cell *, int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2]); +static void +reallocate_lines (struct ascii_driver *a) +{ + if (a->length > a->allocated_lines) + { + int i; + a->lines = xnrealloc (a->lines, a->length, sizeof *a->lines); + for (i = a->allocated_lines; i < a->length; i++) + u8_line_init (&a->lines[i]); + a->allocated_lines = a->length; + } +} + + static struct ascii_driver * ascii_driver_cast (struct output_driver *driver) { @@ -165,10 +236,11 @@ static struct output_driver * ascii_create (const char *file_name, enum settings_output_devices device_type, struct string_map *o) { + enum { BOX_ASCII, BOX_UNICODE } box; + int min_break[TABLE_N_AXES]; struct output_driver *d; struct ascii_driver *a; int paper_length; - int right, bottom, left, top; a = xzalloc (sizeof *a); d = &a->driver; @@ -181,34 +253,34 @@ ascii_create (const char *file_name, enum settings_output_devices device_type, "bold", EMPH_BOLD, "underline", EMPH_UNDERLINE, "none", EMPH_NONE, - (char *) NULL); + NULL_SENTINEL); a->chart_file_name = parse_chart_file_name (opt (d, o, "charts", file_name)); a->top_margin = parse_int (opt (d, o, "top-margin", "0"), 0, INT_MAX); a->bottom_margin = parse_int (opt (d, o, "bottom-margin", "0"), 0, INT_MAX); + min_break[H] = parse_int (opt (d, o, "min-hbreak", "-1"), -1, INT_MAX); + min_break[V] = parse_int (opt (d, o, "min-vbreak", "-1"), -1, INT_MAX); + a->width = parse_page_size (opt (d, o, "width", "79")); paper_length = parse_page_size (opt (d, o, "length", "66")); a->auto_width = a->width < 0; a->auto_length = paper_length < 0; a->length = paper_length - vertical_margins (a); - - for (right = 0; right < 4; right++) - for (bottom = 0; bottom < 4; bottom++) - for (left = 0; left < 4; left++) - for (top = 0; top < 4; top++) - { - int indx = make_box_index (left, right, top, bottom); - const char *default_value; - char name[16]; - - sprintf (name, "box[%d%d%d%d]", right, bottom, left, top); - default_value = get_default_box (right, bottom, left, top); - a->box[indx] = parse_string (opt (d, o, name, default_value)); - } - a->init = parse_string (opt (d, o, "init", "")); - + a->min_break[H] = min_break[H] >= 0 ? min_break[H] : a->width / 2; + a->min_break[V] = min_break[V] >= 0 ? min_break[V] : a->length / 2; +#ifdef HAVE_CAIRO + 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"), + "ascii", BOX_ASCII, + "unicode", BOX_UNICODE, + NULL_SENTINEL); + a->box = box == BOX_ASCII ? ascii_box_chars : unicode_box_chars; + + a->command_name = NULL; a->title = xstrdup (""); a->subtitle = xstrdup (""); a->file_name = xstrdup (file_name); @@ -229,29 +301,6 @@ error: return NULL; } -static const char * -get_default_box (int right, int bottom, int left, int top) -{ - switch ((top << 12) | (left << 8) | (bottom << 4) | (right << 0)) - { - case 0x0000: - return " "; - - case 0x0100: case 0x0101: case 0x0001: - return "-"; - - case 0x1000: case 0x1010: case 0x0010: - return "|"; - - case 0x0300: case 0x0303: case 0x0003: - case 0x0200: case 0x0202: case 0x0002: - return "="; - - default: - return left > 1 || top > 1 || right > 1 || bottom > 1 ? "#" : "+"; - } -} - static int parse_page_size (struct driver_option *option) { @@ -271,7 +320,7 @@ parse_page_size (struct driver_option *option) if (dim >= 1 && errno != ERANGE && *tail == '\0') dim = value; else - error (0, 0, _("%s: %s must be positive integer or `auto'"), + msg (MW, _("%s: %s must be positive integer or `auto'"), option->driver_name, option->name); } } @@ -303,7 +352,7 @@ update_page_size (struct ascii_driver *a, bool issue_error) if (a->width < MIN_WIDTH || a->length < MIN_LENGTH) { if (issue_error) - error (0, 0, + msg (ME, _("ascii: page excluding margins and headers " "must be at least %d characters wide by %d lines long, but " "as configured is only %d characters by %d lines"), @@ -316,6 +365,8 @@ update_page_size (struct ascii_driver *a, bool issue_error) return false; } + reallocate_lines (a); + return true; } @@ -330,15 +381,13 @@ ascii_destroy (struct output_driver *driver) if (a->file != NULL) fn_close (a->file_name, a->file); + free (a->command_name); free (a->title); free (a->subtitle); free (a->file_name); free (a->chart_file_name); - for (i = 0; i < LNS_COUNT; i++) - free (a->box[i]); - free (a->init); for (i = 0; i < a->allocated_lines; i++) - free (a->lines[i].chars); + u8_line_destroy (&a->lines[i]); free (a->lines); free (a); } @@ -352,8 +401,7 @@ ascii_flush (struct output_driver *driver) ascii_close_page (a); if (fn_close (a->file_name, a->file) != 0) - error (0, errno, _("ascii: closing output file \"%s\""), - a->file_name); + msg_error (errno, _("ascii: closing output file `%s'"), a->file_name); a->file = NULL; } } @@ -361,116 +409,131 @@ ascii_flush (struct output_driver *driver) static void ascii_init_caption_cell (const char *caption, struct table_cell *cell) { - cell->contents = caption; - cell->options = TAB_LEFT; + cell->inline_contents.options = TAB_LEFT; + cell->inline_contents.text = CONST_CAST (char *, caption); + cell->inline_contents.table = NULL; + cell->contents = &cell->inline_contents; + cell->n_contents = 1; cell->destructor = NULL; } static void -ascii_submit (struct output_driver *driver, - const struct output_item *output_item) +ascii_output_table_item (struct ascii_driver *a, + const struct table_item *table_item) { - struct ascii_driver *a = ascii_driver_cast (driver); - if (a->error) - return; - if (is_table_item (output_item)) + const char *caption = table_item_get_caption (table_item); + struct render_params params; + struct render_pager *p; + int caption_height; + int i; + + update_page_size (a, false); + + if (caption != NULL) { - struct table_item *table_item = to_table_item (output_item); - const char *caption = table_item_get_caption (table_item); - struct render_params params; - struct render_page *page; - struct render_break x_break; - int caption_height; - int i; + /* XXX doesn't do well with very large captions */ + struct table_cell cell; + ascii_init_caption_cell (caption, &cell); + caption_height = ascii_measure_cell_height (a, &cell, a->width); + } + else + caption_height = 0; + + params.draw_line = ascii_draw_line; + params.measure_cell_width = ascii_measure_cell_width; + params.measure_cell_height = ascii_measure_cell_height; + params.adjust_break = NULL; + params.draw_cell = ascii_draw_cell; + params.aux = a; + params.size[H] = a->width; + params.size[V] = a->length - caption_height; + params.font_size[H] = 1; + params.font_size[V] = 1; + for (i = 0; i < RENDER_N_LINES; i++) + { + int width = i == RENDER_LINE_NONE ? 0 : 1; + params.line_widths[H][i] = width; + params.line_widths[V][i] = width; + } + for (i = 0; i < TABLE_N_AXES; i++) + params.min_break[i] = a->min_break[i]; + + if (a->file == NULL && !ascii_open_page (a)) + return; - update_page_size (a, false); + p = render_pager_create (render_page_create (¶ms, table_item_get_table ( + table_item))); + while (render_pager_has_next (p)) + { + int used; - if (caption != NULL) + if (a->y > 0) + a->y++; + a->y += caption_height; + used = render_pager_draw_next (p, a->length - a->y); + if (used == 0) { - /* XXX doesn't do well with very large captions */ - struct table_cell cell; - ascii_init_caption_cell (caption, &cell); - caption_height = ascii_measure_cell_height (a, &cell, a->width); + assert (a->y > 0); + ascii_close_page (a); + if (!ascii_open_page (a)) + break; } else - caption_height = 0; - - params.draw_line = ascii_draw_line; - params.measure_cell_width = ascii_measure_cell_width; - params.measure_cell_height = ascii_measure_cell_height; - params.draw_cell = ascii_draw_cell, - params.aux = a; - params.size[H] = a->width; - params.size[V] = a->length - caption_height; - params.font_size[H] = 1; - params.font_size[V] = 1; - for (i = 0; i < RENDER_N_LINES; i++) { - int width = i == RENDER_LINE_NONE ? 0 : 1; - params.line_widths[H][i] = width; - params.line_widths[V][i] = width; + if (caption_height) + { + struct table_cell cell; + int bb[TABLE_N_AXES][2]; + + ascii_init_caption_cell (caption, &cell); + bb[H][0] = 0; + bb[H][1] = a->width; + bb[V][0] = 0; + bb[V][1] = caption_height; + a->y -= caption_height; + ascii_draw_cell (a, &cell, bb, bb); + a->y += caption_height; + caption_height = 0; + } + a->y += used; } + } + render_pager_destroy (p); +} - if (a->file == NULL && !ascii_open_page (a)) - return; +static void +ascii_output_text (struct ascii_driver *a, const char *text) +{ + struct table_item *table_item; - page = render_page_create (¶ms, table_item_get_table (table_item)); - for (render_break_init (&x_break, page, H); - render_break_has_next (&x_break); ) - { - struct render_page *x_slice; - struct render_break y_break; + table_item = table_item_create (table_from_string (TAB_LEFT, text), NULL); + ascii_output_table_item (a, table_item); + table_item_unref (table_item); +} - x_slice = render_break_next (&x_break, a->width); - for (render_break_init (&y_break, x_slice, V); - render_break_has_next (&y_break); ) - { - struct render_page *y_slice; - int space; +static void +ascii_submit (struct output_driver *driver, + const struct output_item *output_item) +{ + struct ascii_driver *a = ascii_driver_cast (driver); - if (a->y > 0) - a->y++; + output_driver_track_current_command (output_item, &a->command_name); - space = a->length - a->y - caption_height; - if (render_break_next_size (&y_break) > space) - { - assert (a->y > 0); - ascii_close_page (a); - if (!ascii_open_page (a)) - return; - continue; - } + if (a->error) + return; - y_slice = render_break_next (&y_break, space); - if (caption_height) - { - struct table_cell cell; - int bb[TABLE_N_AXES][2]; - - ascii_init_caption_cell (caption, &cell); - bb[H][0] = 0; - bb[H][1] = a->width; - bb[V][0] = 0; - bb[V][1] = caption_height; - ascii_draw_cell (a, &cell, bb, bb); - a->y += caption_height; - caption_height = 0; - } - render_page_draw (y_slice); - a->y += render_page_get_size (y_slice, V); - render_page_unref (y_slice); - } - render_break_destroy (&y_break); - } - render_break_destroy (&x_break); - } + 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) { 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->chart_cnt++, + &a->fg, + &a->bg); if (file_name != NULL) { struct text_item *text_item; @@ -483,6 +546,7 @@ ascii_submit (struct output_driver *driver, free (file_name); } } +#endif /* HAVE_CAIRO */ else if (is_text_item (output_item)) { const struct text_item *text_item = to_text_item (output_item); @@ -501,6 +565,7 @@ ascii_submit (struct output_driver *driver, a->subtitle = xstrdup (text); break; + case TEXT_ITEM_COMMAND_OPEN: case TEXT_ITEM_COMMAND_CLOSE: break; @@ -515,23 +580,24 @@ ascii_submit (struct output_driver *driver, break; default: - { - struct table_item *item; - - item = table_item_create (table_from_string (TAB_LEFT, text), - NULL); - ascii_submit (&a->driver, &item->output_item); - table_item_unref (item); - } + ascii_output_text (a, text); break; } } + else if (is_message_item (output_item)) + { + const struct message_item *message_item = to_message_item (output_item); + const struct msg *msg = message_item_get_msg (message_item); + char *s = msg_to_string (msg, a->command_name); + ascii_output_text (a, s); + free (s); + } } const struct output_driver_factory txt_driver_factory = - { "txt", ascii_create }; + { "txt", "-", ascii_create }; const struct output_driver_factory list_driver_factory = - { "list", ascii_create }; + { "list", "-", ascii_create }; static const struct output_driver_class ascii_driver_class = { @@ -541,18 +607,12 @@ static const struct output_driver_class ascii_driver_class = ascii_flush, }; -enum wrap_mode - { - WRAP_WORD, - WRAP_CHAR, - WRAP_WORD_CHAR - }; - -static void ascii_expand_line (struct ascii_driver *, int y, int length); +static char *ascii_reserve (struct ascii_driver *, int y, int x0, int x1, + int n); static void ascii_layout_cell (struct ascii_driver *, const struct table_cell *, int bb[TABLE_N_AXES][2], - int clip[TABLE_N_AXES][2], enum wrap_mode wrap, + int clip[TABLE_N_AXES][2], int *width, int *height); static void @@ -560,24 +620,32 @@ ascii_draw_line (void *a_, int bb[TABLE_N_AXES][2], enum render_line_style styles[TABLE_N_AXES][2]) { struct ascii_driver *a = a_; - unsigned short int value; - int x1, y1; + char mbchar[6]; + int x0, y0, x1, y1; + ucs4_t uc; + int mblen; int x, y; /* Clip to the page. */ - if (bb[H][0] >= a->width || bb[V][0] + a->y >= a->length) - return; - x1 = MIN (bb[H][1], a->width); + x0 = MAX (bb[H][0] + a->x, 0); + y0 = MAX (bb[V][0] + a->y, 0); + x1 = MIN (bb[H][1] + a->x, a->width); y1 = MIN (bb[V][1] + a->y, a->length); + if (x1 <= 0 || y1 <= 0 || x0 >= a->width || y0 >= a->length) + return; /* Draw. */ - value = ATTR_BOX | make_box_index (styles[V][0], styles[V][1], - styles[H][0], styles[H][1]); - for (y = bb[V][0] + a->y; y < y1; y++) + uc = a->box[make_box_index (styles[V][0], styles[V][1], + styles[H][0], styles[H][1])]; + mblen = u8_uctomb (CHAR_CAST (uint8_t *, mbchar), uc, 6); + for (y = y0; y < y1; y++) { - ascii_expand_line (a, y, x1); - for (x = bb[H][0]; x < x1; x++) - a->lines[y].chars[x] = value; + char *p = ascii_reserve (a, y, x0, x1, mblen * (x1 - x0)); + for (x = x0; x < x1; x++) + { + memcpy (p, mbchar, mblen); + p += mblen; + } } } @@ -595,12 +663,14 @@ ascii_measure_cell_width (void *a_, const struct table_cell *cell, bb[V][0] = 0; bb[V][1] = INT_MAX; clip[H][0] = clip[H][1] = clip[V][0] = clip[V][1] = 0; - ascii_layout_cell (a, cell, bb, clip, WRAP_WORD, max_width, &h); + ascii_layout_cell (a, cell, bb, clip, max_width, &h); - if (strchr (cell->contents, ' ')) + if (cell->n_contents != 1 + || cell->contents[0].table + || strchr (cell->contents[0].text, ' ')) { bb[H][1] = 1; - ascii_layout_cell (a, cell, bb, clip, WRAP_WORD, min_width, &h); + ascii_layout_cell (a, cell, bb, clip, min_width, &h); } else *min_width = *max_width; @@ -619,7 +689,7 @@ ascii_measure_cell_height (void *a_, const struct table_cell *cell, int width) bb[V][0] = 0; bb[V][1] = INT_MAX; clip[H][0] = clip[H][1] = clip[V][0] = clip[V][1] = 0; - ascii_layout_cell (a, cell, bb, clip, WRAP_WORD, &w, &h); + ascii_layout_cell (a, cell, bb, clip, &w, &h); return h; } @@ -630,38 +700,24 @@ ascii_draw_cell (void *a_, const struct table_cell *cell, struct ascii_driver *a = a_; int w, h; - ascii_layout_cell (a, cell, bb, clip, WRAP_WORD, &w, &h); + ascii_layout_cell (a, cell, bb, clip, &w, &h); } -/* Ensures that at least the first LENGTH characters of line Y in - ascii driver A have been cleared out. */ -static void -ascii_expand_line (struct ascii_driver *a, int y, int length) +static char * +ascii_reserve (struct ascii_driver *a, int y, int x0, int x1, int n) { - struct ascii_line *line = &a->lines[y]; - if (line->n_chars < length) - { - int x; - if (line->allocated_chars < length) - { - line->allocated_chars = MAX (length, MIN (length * 2, a->width)); - line->chars = xnrealloc (line->chars, line->allocated_chars, - sizeof *line->chars); - } - for (x = line->n_chars; x < length; x++) - line->chars[x] = ' '; - line->n_chars = length; - } + assert (y < a->allocated_lines); + return u8_line_reserve (&a->lines[y], x0, x1, n); } static void -text_draw (struct ascii_driver *a, const struct table_cell *cell, +text_draw (struct ascii_driver *a, unsigned int options, int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], - int y, const char *string, int n) + int y, const uint8_t *string, int n, size_t width) { - int x0 = MAX (0, clip[H][0]); + int x0 = MAX (0, clip[H][0] + a->x); int y0 = MAX (0, clip[V][0] + a->y); - int x1 = clip[H][1]; + int x1 = MIN (a->width, clip[H][1] + a->x); int y1 = MIN (a->length, clip[V][1] + a->y); int x; @@ -669,96 +725,369 @@ text_draw (struct ascii_driver *a, const struct table_cell *cell, if (y < y0 || y >= y1) return; - switch (cell->options & TAB_ALIGNMENT) + switch (options & TAB_ALIGNMENT) { case TAB_LEFT: x = bb[H][0]; break; case TAB_CENTER: - x = (bb[H][0] + bb[H][1] - n + 1) / 2; + x = (bb[H][0] + bb[H][1] - width + 1) / 2; break; case TAB_RIGHT: - x = bb[H][1] - n; + x = bb[H][1] - width; break; default: NOT_REACHED (); } + x += a->x; + if (x >= x1) + return; - if (x0 > x) + while (x < x0) { - n -= x0 - x; - if (n <= 0) + ucs4_t uc; + int mblen; + int w; + + if (n == 0) return; - string += x0 - x; - x = x0; + mblen = u8_mbtouc (&uc, string, n); + + string += mblen; + n -= mblen; + + w = uc_width (uc, "UTF-8"); + if (w > 0) + { + x += w; + width -= w; + } } - if (x + n >= x1) - n = x1 - x; + if (n == 0) + return; - if (n > 0) + if (x + width > x1) { - int attr = cell->options & TAB_EMPH ? ATTR_EMPHASIS : 0; - size_t i; + int ofs; + + ofs = width = 0; + for (ofs = 0; ofs < n; ) + { + ucs4_t uc; + int mblen; + int w; + + mblen = u8_mbtouc (&uc, string + ofs, n - ofs); - ascii_expand_line (a, y, x + n); - for (i = 0; i < n; i++) - a->lines[y].chars[x + i] = string[i] | attr; + w = uc_width (uc, "UTF-8"); + if (w > 0) + { + if (width + w > x1 - x) + break; + width += w; + } + ofs += mblen; + } + n = ofs; + if (n == 0) + return; + } + + if (!(options & TAB_EMPH) || a->emphasis == EMPH_NONE) + memcpy (ascii_reserve (a, y, x, x + width, n), string, n); + else + { + size_t n_out; + size_t ofs; + char *out; + int mblen; + + /* First figure out how many bytes need to be inserted. */ + n_out = n; + for (ofs = 0; ofs < n; ofs += mblen) + { + ucs4_t uc; + int w; + + mblen = u8_mbtouc (&uc, string + ofs, n - ofs); + w = uc_width (uc, "UTF-8"); + + if (w > 0) + n_out += a->emphasis == EMPH_UNDERLINE ? 2 : 1 + mblen; + } + + /* Then insert them. */ + out = ascii_reserve (a, y, x, x + width, n_out); + for (ofs = 0; ofs < n; ofs += mblen) + { + ucs4_t uc; + int w; + + mblen = u8_mbtouc (&uc, string + ofs, n - ofs); + w = uc_width (uc, "UTF-8"); + + if (w > 0) + { + if (a->emphasis == EMPH_UNDERLINE) + *out++ = '_'; + else + out = mempcpy (out, string + ofs, mblen); + *out++ = '\b'; + } + out = mempcpy (out, string + ofs, mblen); + } } } -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], - enum wrap_mode wrap, int *width, int *height) +static int +ascii_layout_cell_text (struct ascii_driver *a, + const struct cell_contents *contents, + int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2], + int *widthp) { - size_t length = strlen (cell->contents); - int y, pos; + size_t length = strlen (contents->text); + char *breaks; + int bb_width; + size_t pos; + int y; + + y = bb[V][0]; + if (length == 0) + return y; + + breaks = xmalloc (length + 1); + u8_possible_linebreaks (CHAR_CAST (const uint8_t *, contents->text), length, + "UTF-8", breaks); + breaks[length] = (breaks[length - 1] == UC_BREAK_MANDATORY + ? UC_BREAK_PROHIBITED : UC_BREAK_POSSIBLE); - *width = 0; pos = 0; + bb_width = bb[H][1] - bb[H][0]; for (y = bb[V][0]; y < bb[V][1] && pos < length; y++) { - const char *line = &cell->contents[pos]; - const char *new_line; - size_t line_len; - - /* Find line length without considering word wrap. */ - line_len = MIN (bb[H][1] - bb[H][0], length - pos); - new_line = memchr (line, '\n', line_len); - if (new_line != NULL) - line_len = new_line - line; - - /* Word wrap. */ - if (pos + line_len < length && wrap != WRAP_CHAR) + const uint8_t *line = CHAR_CAST (const uint8_t *, contents->text + pos); + const char *b = breaks + pos; + size_t n = length - pos; + + size_t last_break_ofs = 0; + int last_break_width = 0; + int width = 0; + size_t graph_ofs; + size_t ofs; + + for (ofs = 0; ofs < n; ) { - size_t space_len = line_len; - while (space_len > 0 && !isspace ((unsigned char) line[space_len])) - space_len--; - if (space_len > 0) - line_len = space_len; - else if (wrap == WRAP_WORD) + ucs4_t uc; + int mblen; + int w; + + mblen = u8_mbtouc (&uc, line + ofs, n - ofs); + if (b[ofs] == UC_BREAK_MANDATORY) + break; + else if (b[ofs] == UC_BREAK_POSSIBLE) { - while (pos + line_len < length - && !isspace ((unsigned char) line[line_len])) - line_len++; + last_break_ofs = ofs; + last_break_width = width; } + + w = uc_width (uc, "UTF-8"); + if (w > 0) + { + if (width + w > bb_width) + { + if (isspace (line[ofs])) + break; + else if (last_break_ofs != 0) + { + ofs = last_break_ofs; + width = last_break_width; + break; + } + } + width += w; + } + ofs += mblen; } - if (line_len > *width) - *width = line_len; + + /* Trim any trailing spaces off the end of the text to be drawn. */ + for (graph_ofs = ofs; graph_ofs > 0; graph_ofs--) + if (!isspace (line[graph_ofs - 1])) + break; + width -= ofs - graph_ofs; /* Draw text. */ - text_draw (a, cell, bb, clip, y, line, line_len); + text_draw (a, contents->options, bb, clip, y, line, graph_ofs, width); + + /* If a new-line ended the line, just skip the new-line. Otherwise, skip + past any spaces past the end of the line (but not past a new-line). */ + if (b[ofs] == UC_BREAK_MANDATORY) + ofs++; + else + while (ofs < n && isspace (line[ofs]) && b[ofs] != UC_BREAK_MANDATORY) + ofs++; + + if (width > *widthp) + *widthp = width; + pos += ofs; + } + + free (breaks); + + return y; +} - /* Next line. */ - pos += line_len; - if (pos < length && isspace ((unsigned char) cell->contents[pos])) - pos++; +static int +ascii_layout_subtable (struct ascii_driver *a, + const struct cell_contents *contents, + int bb[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2] UNUSED, + int *widthp) +{ + const struct table *table = contents->table; + struct render_params params; + struct render_pager *p; + int r[TABLE_N_AXES][2]; + int width, height; + int i; + + params.draw_line = ascii_draw_line; + params.measure_cell_width = ascii_measure_cell_width; + params.measure_cell_height = ascii_measure_cell_height; + params.adjust_break = NULL; + params.draw_cell = ascii_draw_cell, + params.aux = a; + params.size[H] = bb[TABLE_HORZ][1] - bb[TABLE_HORZ][0]; + params.size[V] = bb[TABLE_VERT][1] - bb[TABLE_VERT][0]; + params.font_size[H] = 1; + params.font_size[V] = 1; + for (i = 0; i < RENDER_N_LINES; i++) + { + int width = i == RENDER_LINE_NONE ? 0 : 1; + params.line_widths[H][i] = width; + params.line_widths[V][i] = width; + } + + p = render_pager_create (render_page_create (¶ms, table)); + width = render_pager_get_size (p, TABLE_HORZ); + height = render_pager_get_size (p, TABLE_VERT); + + /* r = intersect(bb, clip) - bb. */ + for (i = 0; i < TABLE_N_AXES; i++) + { + r[i][0] = MAX (bb[i][0], clip[i][0]) - bb[i][0]; + r[i][1] = MIN (bb[i][1], clip[i][1]) - bb[i][0]; } - *height = y - bb[V][0]; + + if (r[H][0] < r[H][1] && r[V][0] < r[V][1]) + { + unsigned int alignment = contents->options & TAB_ALIGNMENT; + int save_x = a->x; + + a->x += bb[TABLE_HORZ][0]; + if (alignment == TAB_RIGHT) + a->x += params.size[H] - width; + else if (alignment == TAB_CENTER) + a->x += (params.size[H] - width) / 2; + a->y += bb[TABLE_VERT][0]; + render_pager_draw (p); + a->y -= bb[TABLE_VERT][0]; + a->x = save_x; + } + render_pager_destroy (p); + + if (width > *widthp) + *widthp = width; + return bb[V][0] + height; +} + +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; + } + + if (contents->text) + bb[V][0] = ascii_layout_cell_text (a, contents, bb, clip, widthp); + else + bb[V][0] = ascii_layout_subtable (a, contents, bb, clip, widthp); + } + *heightp = bb[V][0] - bb_[V][0]; +} + +void +ascii_test_write (struct output_driver *driver, + const char *s, int x, int y, unsigned int options) +{ + struct ascii_driver *a = ascii_driver_cast (driver); + struct cell_contents contents; + struct table_cell cell; + int bb[TABLE_N_AXES][2]; + int width, height; + + if (a->file == NULL && !ascii_open_page (a)) + return; + a->y = 0; + + contents.options = options | TAB_LEFT; + contents.text = CONST_CAST (char *, s); + contents.table = NULL; + + memset (&cell, 0, sizeof cell); + cell.contents = &contents; + cell.n_contents = 1; + + bb[TABLE_HORZ][0] = x; + bb[TABLE_HORZ][1] = a->width; + bb[TABLE_VERT][0] = y; + bb[TABLE_VERT][1] = a->length; + + ascii_layout_cell (a, &cell, bb, bb, &width, &height); + + a->y = 1; +} + +void +ascii_test_set_length (struct output_driver *driver, int y, int length) +{ + struct ascii_driver *a = ascii_driver_cast (driver); + + if (a->file == NULL && !ascii_open_page (a)) + return; + + if (y < 0 || y >= a->length) + return; + u8_line_set_length (&a->lines[y], length); } /* ascii_close_page () and support routines. */ +#if HAVE_DECL_SIGWINCH +static struct ascii_driver *the_driver; + +static void +winch_handler (int signum UNUSED) +{ + update_page_size (the_driver, false); +} +#endif + static bool ascii_open_page (struct ascii_driver *a) { @@ -772,12 +1101,23 @@ ascii_open_page (struct ascii_driver *a) a->file = fn_open (a->file_name, a->append ? "a" : "w"); if (a->file != NULL) { - if (a->init != NULL) - fputs (a->init, a->file); + if ( isatty (fileno (a->file))) + { +#if HAVE_DECL_SIGWINCH + struct sigaction action; + sigemptyset (&action.sa_mask); + action.sa_flags = 0; + action.sa_handler = winch_handler; + the_driver = a; + sigaction (SIGWINCH, &action, NULL); +#endif + a->auto_width = true; + a->auto_length = true; + } } else { - error (0, errno, _("ascii: opening output file \"%s\""), + msg_error (errno, _("ascii: opening output file `%s'"), a->file_name); a->error = true; return false; @@ -786,69 +1126,19 @@ ascii_open_page (struct ascii_driver *a) a->page_number++; - if (a->length > a->allocated_lines) - { - a->lines = xnrealloc (a->lines, a->length, sizeof *a->lines); - for (i = a->allocated_lines; i < a->length; i++) - { - struct ascii_line *line = &a->lines[i]; - line->chars = NULL; - line->allocated_chars = 0; - } - a->allocated_lines = a->length; - } + reallocate_lines (a); for (i = 0; i < a->length; i++) - a->lines[i].n_chars = 0; + u8_line_clear (&a->lines[i]); return true; } -/* Writes LINE to A's output file. */ -static void -output_line (struct ascii_driver *a, const struct ascii_line *line) -{ - size_t length; - size_t i; - - length = line->n_chars; - while (length > 0 && line->chars[length - 1] == ' ') - length--; - - for (i = 0; i < length; i++) - { - int attribute = line->chars[i] & (ATTR_BOX | ATTR_EMPHASIS); - int ch = line->chars[i] & ~(ATTR_BOX | ATTR_EMPHASIS); - - switch (attribute) - { - case ATTR_BOX: - fputs (a->box[ch], a->file); - break; - - case ATTR_EMPHASIS: - if (a->emphasis == EMPH_BOLD) - fprintf (a->file, "%c\b%c", ch, ch); - else if (a->emphasis == EMPH_UNDERLINE) - fprintf (a->file, "_\b%c", ch); - else - putc (ch, a->file); - break; - - default: - putc (ch, a->file); - break; - } - } - - putc ('\n', a->file); -} - static void output_title_line (FILE *out, int width, const char *left, const char *right) { struct string s = DS_EMPTY_INITIALIZER; - ds_put_char_multiple (&s, ' ', width); + ds_put_byte_multiple (&s, ' ', width); if (left != NULL) { size_t length = MIN (strlen (left), width); @@ -859,7 +1149,7 @@ output_title_line (FILE *out, int width, const char *left, const char *right) size_t length = MIN (strlen (right), width); memcpy (ds_end (&s) - length, right, length); } - ds_put_char (&s, '\n'); + ds_put_byte (&s, '\n'); fputs (ds_cstr (&s), out); ds_destroy (&s); } @@ -898,9 +1188,9 @@ ascii_close_page (struct ascii_driver *a) any_blank = false; for (y = 0; y < a->allocated_lines; y++) { - struct ascii_line *line = &a->lines[y]; + struct u8_line *line = &a->lines[y]; - if (a->squeeze_blank_lines && y > 0 && line->n_chars == 0) + if (a->squeeze_blank_lines && y > 0 && line->width == 0) any_blank = true; else { @@ -910,7 +1200,10 @@ ascii_close_page (struct ascii_driver *a) any_blank = false; } - output_line (a, line); + while (ds_chomp_byte (&line->s, ' ')) + continue; + fwrite (ds_data (&line->s), 1, ds_length (&line->s), a->file); + putc ('\n', a->file); } } if (!a->squeeze_blank_lines)