X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fascii.c;h=b5c9c004b9eb2460b4fb6666ed256a0ee26f12f3;hb=f8659933d48c5682010d1e1f04ae7acb5cbcd611;hp=67634126f97d3345f36c522de946f23fbf3d2ada;hpb=311f2cd4115da767c61c548aa25e71e722ec937c;p=pspp diff --git a/src/output/ascii.c b/src/output/ascii.c index 67634126f9..b5c9c004b9 100644 --- a/src/output/ascii.c +++ b/src/output/ascii.c @@ -19,14 +19,22 @@ #include #include #include +#include #include #include -#include #include #include #include #include +#ifdef HAVE_TERMIOS_H +# include +#endif + +#ifdef GWINSZ_IN_SYS_IOCTL +# include +#endif + #include "data/file-name.h" #include "data/file-handle-def.h" #include "data/settings.h" @@ -39,13 +47,17 @@ #include "libpspp/u8-line.h" #include "libpspp/version.h" #include "output/ascii.h" -#include "output/cairo.h" +#ifdef HAVE_CAIRO +#include "output/cairo-chart.h" +#endif #include "output/chart-item-provider.h" #include "output/driver-provider.h" +#include "output/image-item.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/tab.h" #include "output/table-item.h" #include "output/text-item.h" @@ -63,76 +75,179 @@ enum { ASCII_LINE_NONE, + ASCII_LINE_DASHED, ASCII_LINE_SINGLE, ASCII_LINE_DOUBLE, ASCII_N_LINES }; -#define N_BOX (ASCII_N_LINES * ASCII_N_LINES \ - * ASCII_N_LINES * ASCII_N_LINES) - -static const ucs4_t ascii_box_chars[N_BOX] = +struct box_chars { - ' ', '|', '#', - '-', '+', '#', - '=', '#', '#', - '|', '|', '#', - '+', '+', '#', - '#', '#', '#', - '#', '#', '#', - '#', '#', '#', - '#', '#', '#', - '-', '+', '#', - '-', '+', '#', - '#', '#', '#', - '+', '+', '#', - '+', '+', '#', - '#', '#', '#', - '#', '#', '#', - '#', '#', '#', - '#', '#', '#', - '=', '#', '#', - '#', '#', '#', - '=', '#', '#', - '#', '#', '#', - '#', '#', '#', - '#', '#', '#', - '#', '#', '#', - '#', '#', '#', - '#', '#', '#', + ucs4_t c[ASCII_N_LINES][ASCII_N_LINES][ASCII_N_LINES][ASCII_N_LINES]; }; -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 const struct box_chars * +get_ascii_box (void) +{ + enum { + _ = ASCII_LINE_NONE, + d = ASCII_LINE_DASHED, + S = ASCII_LINE_SINGLE, + D = ASCII_LINE_DOUBLE, }; + static const struct box_chars ascii_box = + { + /* r b l t: _ d S D */ + .c[_][_][_] = { ' ', '|', '|', '#', }, + .c[_][_][d] = { '-', '+', '+', '#', }, + .c[_][_][S] = { '-', '+', '+', '#', }, + .c[_][_][D] = { '=', '#', '#', '#', }, + .c[_][d][_] = { '|', '|', '|', '#', }, + .c[_][d][d] = { '+', '+', '+', '#', }, + .c[_][d][S] = { '+', '+', '+', '#', }, + .c[_][d][D] = { '#', '#', '#', '#', }, + .c[_][S][_] = { '|', '|', '|', '#', }, + .c[_][S][d] = { '+', '+', '+', '#', }, + .c[_][S][S] = { '+', '+', '+', '#', }, + .c[_][S][D] = { '#', '#', '#', '#', }, + .c[_][D][_] = { '#', '#', '#', '#', }, + .c[_][D][d] = { '#', '#', '#', '#', }, + .c[_][D][S] = { '#', '#', '#', '#', }, + .c[_][D][D] = { '#', '#', '#', '#', }, + .c[d][_][_] = { '-', '+', '+', '#', }, + .c[d][_][d] = { '-', '+', '+', '#', }, + .c[d][_][S] = { '-', '+', '+', '#', }, + .c[d][_][D] = { '#', '#', '#', '#', }, + .c[d][d][_] = { '+', '+', '+', '#', }, + .c[d][d][d] = { '+', '+', '+', '#', }, + .c[d][d][S] = { '+', '+', '+', '#', }, + .c[d][d][D] = { '#', '#', '#', '#', }, + .c[d][S][_] = { '+', '+', '+', '#', }, + .c[d][S][d] = { '+', '+', '+', '#', }, + .c[d][S][S] = { '+', '+', '+', '#', }, + .c[d][S][D] = { '#', '#', '#', '#', }, + .c[d][D][_] = { '#', '#', '#', '#', }, + .c[d][D][d] = { '#', '#', '#', '#', }, + .c[d][D][S] = { '#', '#', '#', '#', }, + .c[d][D][D] = { '#', '#', '#', '#', }, + .c[S][_][_] = { '-', '+', '+', '#', }, + .c[S][_][d] = { '-', '+', '+', '#', }, + .c[S][_][S] = { '-', '+', '+', '#', }, + .c[S][_][D] = { '#', '#', '#', '#', }, + .c[S][d][_] = { '+', '+', '+', '#', }, + .c[S][d][d] = { '+', '+', '+', '#', }, + .c[S][d][S] = { '+', '+', '+', '#', }, + .c[S][d][D] = { '#', '#', '#', '#', }, + .c[S][S][_] = { '+', '+', '+', '#', }, + .c[S][S][d] = { '+', '+', '+', '#', }, + .c[S][S][S] = { '+', '+', '+', '#', }, + .c[S][S][D] = { '#', '#', '#', '#', }, + .c[S][D][_] = { '#', '#', '#', '#', }, + .c[S][D][d] = { '#', '#', '#', '#', }, + .c[S][D][S] = { '#', '#', '#', '#', }, + .c[S][D][D] = { '#', '#', '#', '#', }, + .c[D][_][_] = { '=', '#', '#', '#', }, + .c[D][_][d] = { '#', '#', '#', '#', }, + .c[D][_][S] = { '#', '#', '#', '#', }, + .c[D][_][D] = { '=', '#', '#', '#', }, + .c[D][d][_] = { '#', '#', '#', '#', }, + .c[D][d][d] = { '#', '#', '#', '#', }, + .c[D][d][S] = { '#', '#', '#', '#', }, + .c[D][d][D] = { '#', '#', '#', '#', }, + .c[D][S][_] = { '#', '#', '#', '#', }, + .c[D][S][d] = { '#', '#', '#', '#', }, + .c[D][S][S] = { '#', '#', '#', '#', }, + .c[D][S][D] = { '#', '#', '#', '#', }, + .c[D][D][_] = { '#', '#', '#', '#', }, + .c[D][D][d] = { '#', '#', '#', '#', }, + .c[D][D][S] = { '#', '#', '#', '#', }, + .c[D][D][D] = { '#', '#', '#', '#', }, + }; + return &ascii_box; +} + +static const struct box_chars * +get_unicode_box (void) +{ + enum { + _ = ASCII_LINE_NONE, + d = ASCII_LINE_DASHED, + S = ASCII_LINE_SINGLE, + D = ASCII_LINE_DOUBLE, + }; + + static const struct box_chars unicode_box = + { + /* r b l t: _ d S D */ + .c[_][_][_] = { 0x0020, 0x2575, 0x2575, 0x2551, }, /* ╵╵║ */ + .c[_][_][d] = { 0x2574, 0x256f, 0x256f, 0x255c, }, /* ╴╯╯╜ */ + .c[_][_][S] = { 0x2574, 0x256f, 0x256f, 0x255c, }, /* ╴╯╯╜ */ + .c[_][_][D] = { 0x2550, 0x255b, 0x255b, 0x255d, }, /* ═╛╛╝ */ + .c[_][S][_] = { 0x2577, 0x2502, 0x2502, 0x2551, }, /* ╷││║ */ + .c[_][S][d] = { 0x256e, 0x2524, 0x2524, 0x2562, }, /* ╮┤┤╢ */ + .c[_][S][S] = { 0x256e, 0x2524, 0x2524, 0x2562, }, /* ╮┤┤╢ */ + .c[_][S][D] = { 0x2555, 0x2561, 0x2561, 0x2563, }, /* ╕╡╡╣ */ + .c[_][d][_] = { 0x2577, 0x250a, 0x2502, 0x2551, }, /* ╷┊│║ */ + .c[_][d][d] = { 0x256e, 0x2524, 0x2524, 0x2562, }, /* ╮┤┤╢ */ + .c[_][d][S] = { 0x256e, 0x2524, 0x2524, 0x2562, }, /* ╮┤┤╢ */ + .c[_][d][D] = { 0x2555, 0x2561, 0x2561, 0x2563, }, /* ╕╡╡╣ */ + .c[_][D][_] = { 0x2551, 0x2551, 0x2551, 0x2551, }, /* ║║║║ */ + .c[_][D][d] = { 0x2556, 0x2562, 0x2562, 0x2562, }, /* ╖╢╢╢ */ + .c[_][D][S] = { 0x2556, 0x2562, 0x2562, 0x2562, }, /* ╖╢╢╢ */ + .c[_][D][D] = { 0x2557, 0x2563, 0x2563, 0x2563, }, /* ╗╣╣╣ */ + .c[d][_][_] = { 0x2576, 0x2570, 0x2570, 0x2559, }, /* ╶╰╰╙ */ + .c[d][_][d] = { 0x254c, 0x2534, 0x2534, 0x2568, }, /* ╌┴┴╨ */ + .c[d][_][S] = { 0x2500, 0x2534, 0x2534, 0x2568, }, /* ─┴┴╨ */ + .c[d][_][D] = { 0x2550, 0x2567, 0x2567, 0x2569, }, /* ═╧╧╩ */ + .c[d][d][_] = { 0x256d, 0x251c, 0x251c, 0x255f, }, /* ╭├├╟ */ + .c[d][d][d] = { 0x252c, 0x002b, 0x253c, 0x256a, }, /* ┬+┼╪ */ + .c[d][d][S] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */ + .c[d][d][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */ + .c[d][S][_] = { 0x256d, 0x251c, 0x251c, 0x255f, }, /* ╭├├╟ */ + .c[d][S][d] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */ + .c[d][S][S] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */ + .c[d][S][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */ + .c[d][D][_] = { 0x2553, 0x255f, 0x255f, 0x255f, }, /* ╓╟╟╟ */ + .c[d][D][d] = { 0x2565, 0x256b, 0x256b, 0x256b, }, /* ╥╫╫╫ */ + .c[d][D][S] = { 0x2565, 0x256b, 0x256b, 0x256b, }, /* ╥╫╫╫ */ + .c[d][D][D] = { 0x2566, 0x256c, 0x256c, 0x256c, }, /* ╦╬╬╬ */ + .c[S][_][_] = { 0x2576, 0x2570, 0x2570, 0x2559, }, /* ╶╰╰╙ */ + .c[S][_][d] = { 0x2500, 0x2534, 0x2534, 0x2568, }, /* ─┴┴╨ */ + .c[S][_][S] = { 0x2500, 0x2534, 0x2534, 0x2568, }, /* ─┴┴╨ */ + .c[S][_][D] = { 0x2550, 0x2567, 0x2567, 0x2569, }, /* ═╧╧╩ */ + .c[S][d][_] = { 0x256d, 0x251c, 0x251c, 0x255f, }, /* ╭├├╟ */ + .c[S][d][d] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */ + .c[S][d][S] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */ + .c[S][d][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */ + .c[S][S][_] = { 0x256d, 0x251c, 0x251c, 0x255f, }, /* ╭├├╟ */ + .c[S][S][d] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */ + .c[S][S][S] = { 0x252c, 0x253c, 0x253c, 0x256a, }, /* ┬┼┼╪ */ + .c[S][S][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */ + .c[S][D][_] = { 0x2553, 0x255f, 0x255f, 0x255f, }, /* ╓╟╟╟ */ + .c[S][D][d] = { 0x2565, 0x256b, 0x256b, 0x256b, }, /* ╥╫╫╫ */ + .c[S][D][S] = { 0x2565, 0x256b, 0x256b, 0x256b, }, /* ╥╫╫╫ */ + .c[S][D][D] = { 0x2566, 0x256c, 0x256c, 0x256c, }, /* ╦╬╬╬ */ + .c[D][_][_] = { 0x2550, 0x2558, 0x2558, 0x255a, }, /* ═╘╘╚ */ + .c[D][_][d] = { 0x2550, 0x2567, 0x2567, 0x2569, }, /* ═╧╧╩ */ + .c[D][_][S] = { 0x2550, 0x2567, 0x2567, 0x2569, }, /* ═╧╧╩ */ + .c[D][_][D] = { 0x2550, 0x2567, 0x2567, 0x2569, }, /* ═╧╧╩ */ + .c[D][d][_] = { 0x2552, 0x255e, 0x255e, 0x2560, }, /* ╒╞╞╠ */ + .c[D][d][d] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */ + .c[D][d][S] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */ + .c[D][d][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */ + .c[D][S][_] = { 0x2552, 0x255e, 0x255e, 0x2560, }, /* ╒╞╞╠ */ + .c[D][S][d] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */ + .c[D][S][S] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */ + .c[D][S][D] = { 0x2564, 0x256a, 0x256a, 0x256c, }, /* ╤╪╪╬ */ + .c[D][D][_] = { 0x2554, 0x2560, 0x2560, 0x2560, }, /* ╔╠╠╠ */ + .c[D][D][d] = { 0x2560, 0x256c, 0x256c, 0x256c, }, /* ╠╬╬╬ */ + .c[D][D][S] = { 0x2560, 0x256c, 0x256c, 0x256c, }, /* ╠╬╬╬ */ + .c[D][D][D] = { 0x2566, 0x256c, 0x256c, 0x256c, }, /* ╦╬╬╬ */ + }; + return &unicode_box; +} + static int ascii_line_from_render_line (int render_line) { @@ -141,8 +256,10 @@ ascii_line_from_render_line (int render_line) case RENDER_LINE_NONE: return ASCII_LINE_NONE; - case RENDER_LINE_SINGLE: case RENDER_LINE_DASHED: + return ASCII_LINE_DASHED; + + case RENDER_LINE_SINGLE: case RENDER_LINE_THICK: case RENDER_LINE_THIN: return ASCII_LINE_SINGLE; @@ -156,8 +273,9 @@ ascii_line_from_render_line (int render_line) } -static int -make_box_index (int left_, int right_, int top_, int bottom_) +static ucs4_t +box_get (const struct box_chars *box, + int left_, int right_, int top_, int bottom_) { bool rtl = render_direction_rtl (); int left = ascii_line_from_render_line (rtl ? right_ : left_); @@ -165,21 +283,9 @@ make_box_index (int left_, int right_, int top_, int bottom_) int top = ascii_line_from_render_line (top_); int bottom = ascii_line_from_render_line (bottom_); - int idx = right; - idx = idx * ASCII_N_LINES + bottom; - idx = idx * ASCII_N_LINES + left; - idx = idx * ASCII_N_LINES + top; - return idx; + return box->c[right][bottom][left][top]; } -/* How to emphasize text. */ -enum emphasis_style - { - EMPH_BOLD, /* Overstrike for bold. */ - EMPH_UNDERLINE, /* Overstrike for underlining. */ - EMPH_NONE /* No emphasis. */ - }; - /* ASCII output driver. */ struct ascii_driver { @@ -187,21 +293,26 @@ struct ascii_driver /* User parameters. */ bool append; /* Append if output file already exists? */ - enum emphasis_style emphasis; /* How to emphasize text. */ + 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 xr_color fg; - struct xr_color bg; + struct cell_color fg; + struct cell_color bg; #endif + /* How the page width is determined: */ + enum { + FIXED_WIDTH, /* Specified by configuration. */ + VIEW_WIDTH, /* From SET WIDTH. */ + TERMINAL_WIDTH /* From the terminal's width. */ + } width_mode; int width; /* Page width. */ - bool auto_width; /* Use viewwidth as page width? */ - int min_break[TABLE_N_AXES]; /* Min cell size to break across pages. */ + int min_hbreak; /* Min cell size to break across pages. */ - const ucs4_t *box; /* Line & box drawing characters. */ + const struct box_chars *box; /* Line & box drawing characters. */ /* Internal state. */ struct file_handle *handle; @@ -210,25 +321,29 @@ struct ascii_driver 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. */ + const struct pivot_table *pt; + struct render_params params; }; static const struct output_driver_class ascii_driver_class; static void ascii_submit (struct output_driver *, const struct output_item *); +static int get_terminal_width (void); + static bool update_page_size (struct ascii_driver *, bool issue_error); static int parse_page_size (struct driver_option *); -static bool ascii_open_page (struct ascii_driver *); - static void ascii_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 ascii_measure_cell_width (void *, const struct table_cell *, int *min, int *max); static int ascii_measure_cell_height (void *, const struct table_cell *, int width); -static void ascii_draw_cell (void *, const struct table_cell *, - int bb[TABLE_N_AXES][2], +static void ascii_draw_cell (void *, const struct table_cell *, int color_idx, + int bb[TABLE_N_AXES][2], int valign_offset, int spill[TABLE_N_AXES][2], int clip[TABLE_N_AXES][2]); @@ -246,12 +361,24 @@ 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) { enum { BOX_ASCII, BOX_UNICODE } box; - int min_break[TABLE_N_AXES]; struct output_driver *d; struct ascii_driver *a; @@ -259,39 +386,78 @@ ascii_create (struct file_handle *fh, enum settings_output_devices device_type, 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")); - a->emphasis = parse_enum (opt (d, o, "emphasis", "none"), - "bold", EMPH_BOLD, - "underline", EMPH_UNDERLINE, - "none", EMPH_NONE, - NULL_SENTINEL); + a->emphasis = parse_boolean (opt (d, o, "emphasis", "false")); a->chart_file_name = parse_chart_file_name (opt (d, o, "charts", fh_get_file_name (fh))); a->handle = fh; - min_break[H] = parse_int (opt (d, o, "min-hbreak", "-1"), -1, INT_MAX); - a->width = parse_page_size (opt (d, o, "width", "79")); - a->auto_width = a->width < 0; - a->min_break[H] = min_break[H] >= 0 ? min_break[H] : a->width / 2; + bool terminal = !strcmp (fh_get_file_name (fh), "-") && isatty (1); + a->width = parse_page_size (opt (d, o, "width", "-1")); + a->width_mode = (a->width > 0 ? FIXED_WIDTH + : terminal ? TERMINAL_WIDTH + : VIEW_WIDTH); + a->min_hbreak = parse_int (opt (d, o, "min-hbreak", "-1"), -1, INT_MAX); + #ifdef HAVE_CAIRO - parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &a->bg); - parse_color (d, o, "foreground-color", "#000000000000", &a->fg); + a->bg = parse_color (opt (d, o, "background-color", "#FFFFFFFFFFFF")); + a->fg = parse_color (opt (d, o, "foreground-color", "#000000000000")); #endif - box = parse_enum (opt (d, o, "box", "ascii"), + + const char *default_box = (terminal && (!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); - a->box = box == BOX_ASCII ? ascii_box_chars : unicode_box_chars; + a->box = box == BOX_ASCII ? get_ascii_box () : get_unicode_box (); a->file = NULL; a->error = false; a->lines = NULL; a->allocated_lines = 0; - a->chart_cnt = 1; + a->chart_cnt = 0; + a->object_cnt = 0; + + static const struct render_ops ascii_render_ops = { + .draw_line = ascii_draw_line, + .measure_cell_width = ascii_measure_cell_width, + .measure_cell_height = ascii_measure_cell_height, + .adjust_break = NULL, + .draw_cell = ascii_draw_cell, + }; + a->params.ops = &ascii_render_ops; + a->params.aux = a; + a->params.size[H] = a->width; + a->params.size[V] = INT_MAX; + a->params.font_size[H] = 1; + a->params.font_size[V] = 1; + + static const int ascii_line_widths[RENDER_N_LINES] = { + [RENDER_LINE_NONE] = 0, + [RENDER_LINE_SINGLE] = 1, + [RENDER_LINE_DASHED] = 1, + [RENDER_LINE_THICK] = 1, + [RENDER_LINE_THIN] = 1, + [RENDER_LINE_DOUBLE] = 1, + }; + 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; + a->file = fn_open (a->handle, a->append ? "a" : "w"); + if (!a->file) + { + msg_error (errno, _("ascii: opening output file `%s'"), + fh_get_file_name (a->handle)); + goto error; + } + return d; error: @@ -315,7 +481,7 @@ parse_page_size (struct driver_option *option) errno = 0; value = strtol (option->value, &tail, 0); - if (dim >= 1 && errno != ERANGE && *tail == '\0') + if (value >= 1 && errno != ERANGE && *tail == '\0') dim = value; else msg (MW, _("%s: %s must be positive integer or `auto'"), @@ -333,28 +499,22 @@ parse_page_size (struct driver_option *option) static bool update_page_size (struct ascii_driver *a, bool issue_error) { - enum { MIN_WIDTH = 6, MIN_LENGTH = 6 }; - - if (a->auto_width) - { - a->width = settings_get_viewwidth (); - a->min_break[H] = a->width / 2; - } - - if (a->width < MIN_WIDTH) - { - if (issue_error) - msg (ME, - _("ascii: page must be at least %d characters wide, but " - "as configured is only %d characters"), - MIN_WIDTH, - a->width); - if (a->width < MIN_WIDTH) - a->width = MIN_WIDTH; - return false; - } - - return true; + enum { MIN_WIDTH = 6 }; + + int want_width = (a->width_mode == VIEW_WIDTH ? settings_get_viewwidth () + : a->width_mode == TERMINAL_WIDTH ? get_terminal_width () + : a->width); + bool ok = want_width >= MIN_WIDTH; + if (!ok && issue_error) + msg (ME, _("ascii: page must be at least %d characters wide, but " + "as configured is only %d characters"), + MIN_WIDTH, want_width); + + a->width = ok ? want_width : MIN_WIDTH; + a->params.size[H] = a->width; + a->params.min_break[H] = a->min_hbreak >= 0 ? a->min_hbreak : a->width / 2; + + return ok; } static void @@ -386,14 +546,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]); } } @@ -401,54 +563,31 @@ static void ascii_output_table_item (struct ascii_driver *a, const struct table_item *table_item) { - struct render_params params; - struct render_pager *p; - int i; - update_page_size (a, false); + a->pt = table_item->pt; - 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] = INT_MAX; - params.font_size[H] = 1; - params.font_size[V] = 1; - for (i = 0; i < RENDER_N_LINES; i++) + size_t *layer_indexes; + PIVOT_OUTPUT_FOR_EACH_LAYER (layer_indexes, table_item->pt, true) { - 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]; - params.supports_margins = false; - - if (a->file) - putc ('\n', a->file); - else if (!ascii_open_page (a)) - return; + struct render_pager *p = render_pager_create (&a->params, table_item, + layer_indexes); + for (int i = 0; render_pager_has_next (p); i++) + { + if (a->object_cnt++) + putc ('\n', a->file); - p = render_pager_create (¶ms, table_item); - for (int i = 0; render_pager_has_next (p); i++) - { - if (i) - putc ('\n', a->file); - ascii_output_lines (a, render_pager_draw_next (p, INT_MAX)); + 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_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); } @@ -465,21 +604,42 @@ ascii_submit (struct output_driver *driver, if (is_table_item (output_item)) ascii_output_table_item (a, to_table_item (output_item)); #ifdef HAVE_CAIRO + else if (is_image_item (output_item) && a->chart_file_name != NULL) + { + struct image_item *image_item = to_image_item (output_item); + char *file_name = xr_write_png_image ( + image_item->image, a->chart_file_name, ++a->chart_cnt); + if (file_name != NULL) + { + struct text_item *text_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); + text_item_unref (text_item); + free (file_name); + } + } 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; - text_item = text_item_create_format ( - TEXT_ITEM_PARAGRAPH, _("See %s for a chart."), file_name); + 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); text_item_unref (text_item); @@ -491,35 +651,17 @@ 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); - const char *text = text_item_get_text (text_item); - - switch (type) - { - case TEXT_ITEM_TITLE: - case TEXT_ITEM_SUBTITLE: - case TEXT_ITEM_COMMAND_OPEN: - case TEXT_ITEM_COMMAND_CLOSE: - break; - - case TEXT_ITEM_BLANK_LINE: - break; - - case TEXT_ITEM_EJECT_PAGE: - break; - default: - ascii_output_text (a, text); - break; - } + if (type != TEXT_ITEM_PAGE_TITLE) + ascii_output_table_item_unref ( + a, text_item_to_table_item (text_item_ref (text_item))); } 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, message_item->command_name); - ascii_output_text (a, s); - free (s); - } + 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 = @@ -545,7 +687,8 @@ static void ascii_layout_cell (struct ascii_driver *, static void ascii_draw_line (void *a_, 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] UNUSED) { struct ascii_driver *a = a_; char mbchar[6]; @@ -563,8 +706,7 @@ ascii_draw_line (void *a_, int bb[TABLE_N_AXES][2], return; /* Draw. */ - uc = a->box[make_box_index (styles[V][0], styles[V][1], - styles[H][0], styles[H][1])]; + uc = box_get (a->box, 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++) { @@ -593,15 +735,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_contents != 1 - || cell->contents[0].n_footnotes - || strchr (cell->contents[0].text, ' ')) - { - 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 @@ -622,14 +757,15 @@ ascii_measure_cell_height (void *a_, const struct table_cell *cell, int width) } static void -ascii_draw_cell (void *a_, const struct table_cell *cell, - int bb[TABLE_N_AXES][2], +ascii_draw_cell (void *a_, const struct table_cell *cell, int color_idx UNUSED, + int bb[TABLE_N_AXES][2], int valign_offset, int spill[TABLE_N_AXES][2] UNUSED, int clip[TABLE_N_AXES][2]) { struct ascii_driver *a = a_; int w, h; + bb[V][0] += valign_offset; ascii_layout_cell (a, cell, bb, clip, &w, &h); } @@ -650,7 +786,8 @@ 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, 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) { @@ -663,15 +800,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, 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: @@ -708,7 +846,7 @@ text_draw (struct ascii_driver *a, unsigned int options, int ofs; ofs = width = 0; - for (ofs = 0; ofs < n; ) + for (ofs = 0; ofs < n;) { ucs4_t uc; int mblen; @@ -730,7 +868,7 @@ text_draw (struct ascii_driver *a, unsigned int options, return; } - if (!(options & TAB_EMPH) || a->emphasis == EMPH_NONE) + if (!a->emphasis || (!bold && !underline)) memcpy (ascii_reserve (a, y, x, x + width, n), string, n); else { @@ -750,7 +888,12 @@ text_draw (struct ascii_driver *a, unsigned int options, w = uc_width (uc, "UTF-8"); if (w > 0) - n_out += a->emphasis == EMPH_UNDERLINE ? 2 : 1 + mblen; + { + if (bold) + n_out += 1 + mblen; + if (underline) + n_out += 2; + } } /* Then insert them. */ @@ -765,64 +908,53 @@ text_draw (struct ascii_driver *a, unsigned int options, if (w > 0) { - if (a->emphasis == EMPH_UNDERLINE) - *out++ = '_'; - else - out = mempcpy (out, string + ofs, mblen); - *out++ = '\b'; + if (bold) + { + out = mempcpy (out, string + ofs, mblen); + *out++ = '\b'; + } + if (underline) + { + *out++ = '_'; + *out++ = '\b'; + } } out = mempcpy (out, string + ofs, mblen); } } } -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) +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) { - size_t length; - const char *text; - char *breaks; - int bb_width; - size_t pos; - int y; - - y = bb[V][0]; - length = strlen (contents->text); - if (contents->n_footnotes) - { - struct string s; - int i; + *widthp = 0; + *heightp = 0; - ds_init_empty (&s); - ds_extend (&s, length + contents->n_footnotes * 4); - ds_put_cstr (&s, contents->text); - for (i = 0; i < contents->n_footnotes; i++) - ds_put_format (&s, "[%s]", contents->footnotes[i]->marker); + struct string body = DS_EMPTY_INITIALIZER; + bool numeric = pivot_value_format_body (cell->value, a->pt, &body); - length = ds_length (&s); - text = ds_steal_cstr (&s); - } - else + /* Calculate length; if it's zero, then there's nothing to do. */ + if (ds_is_empty (&body)) { - if (length == 0) - return y; - text = contents->text; + ds_destroy (&body); + return; } - breaks = xmalloc (length + 1); - u8_possible_linebreaks (CHAR_CAST (const uint8_t *, text), length, - "UTF-8", breaks); + 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 (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 uint8_t *line = text + pos; const char *b = breaks + pos; size_t n = length - pos; @@ -832,7 +964,7 @@ ascii_layout_cell_text (struct ascii_driver *a, size_t graph_ofs; size_t ofs; - for (ofs = 0; ofs < n; ) + for (ofs = 0; ofs < n;) { ucs4_t uc; int mblen; @@ -873,7 +1005,10 @@ ascii_layout_cell_text (struct ascii_driver *a, width -= ofs - graph_ofs; /* Draw text. */ - text_draw (a, contents->options, bb, clip, y, line, graph_ofs, width); + 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 past any spaces past the end of the line (but not past a new-line). */ @@ -885,64 +1020,43 @@ ascii_layout_cell_text (struct ascii_driver *a, if (width > *widthp) *widthp = width; + ++*heightp; pos += ofs; } free (breaks); - if (text != contents->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, bb, clip, widthp); - } - *heightp = bb[V][0] - bb_[V][0]; + ds_destroy (&body); } void ascii_test_write (struct output_driver *driver, - const char *s, int x, int y, unsigned int options) + const char *s, int x, int y, bool bold, bool underline) { struct ascii_driver *a = ascii_driver_cast (driver); int bb[TABLE_N_AXES][2]; int width, height; - if (a->file == NULL && !ascii_open_page (a)) + if (!a->file) return; - struct cell_contents contents = { - .options = options | TAB_LEFT, - .text = CONST_CAST (char *, s), + struct cell_style cell_style = { .halign = TABLE_HALIGN_LEFT }; + struct font_style font_style = { + .bold = bold, + .underline = underline, + }; + const struct pivot_value value = { + .type = PIVOT_VALUE_TEXT, + .text = { + .local = CONST_CAST (char *, s), + .c = CONST_CAST (char *, s), + .id = CONST_CAST (char *, s), + .user_provided = true, + }, }; - struct table_cell cell = { - .contents = &contents, - .n_contents = 1, + .value = &value, + .font_style = &font_style, + .cell_style = &cell_style, }; bb[TABLE_HORZ][0] = x; @@ -950,7 +1064,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 @@ -958,7 +1078,7 @@ 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)) + if (!a->file) return; if (y < 0) @@ -971,7 +1091,7 @@ ascii_test_flush (struct output_driver *driver) { struct ascii_driver *a = ascii_driver_cast (driver); - for (size_t i = a->allocated_lines; i-- > 0; ) + for (size_t i = a->allocated_lines; i-- > 0;) if (a->lines[i].width) { ascii_output_lines (a, i + 1); @@ -979,50 +1099,50 @@ ascii_test_flush (struct output_driver *driver) } } -/* ascii_close_page () and support routines. */ +static sig_atomic_t terminal_changed = true; +static int terminal_width; #if HAVE_DECL_SIGWINCH -static struct ascii_driver *the_driver; - static void winch_handler (int signum UNUSED) { - update_page_size (the_driver, false); + terminal_changed = true; } #endif -static bool -ascii_open_page (struct ascii_driver *a) +int +get_terminal_width (void) { - if (a->error) - return false; - - if (a->file == NULL) - { - a->file = fn_open (a->handle, a->append ? "a" : "w"); - if (a->file != NULL) - { - 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); + static bool setup_signal; + if (!setup_signal) + { + setup_signal = true; + + struct sigaction action = { .sa_handler = winch_handler }; + sigemptyset (&action.sa_mask); + sigaction (SIGWINCH, &action, NULL); + } #endif - a->auto_width = true; - } - } + + if (terminal_changed) + { + terminal_changed = false; + +#ifdef HAVE_TERMIOS_H + struct winsize ws; + if (!ioctl (0, TIOCGWINSZ, &ws)) + terminal_width = ws.ws_col; else +#endif { - msg_error (errno, _("ascii: opening output file `%s'"), - fh_get_file_name (a->handle)); - a->error = true; - return false; + if (getenv ("COLUMNS")) + terminal_width = atoi (getenv ("COLUMNS")); } + + if (terminal_width <= 0 || terminal_width > 1024) + terminal_width = 79; } - return true; + return terminal_width; }