X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fascii.c;h=d9dcd0b92e05ce701f9258262e955b190d5c3152;hb=3b54533821614d17afc61f1cd3b87d3a06fbf4da;hp=cc173cc414b4cebec10c63f49f5a61bb6c690795;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp
diff --git a/src/output/ascii.c b/src/output/ascii.c
index cc173cc414..d9dcd0b92e 100644
--- a/src/output/ascii.c
+++ b/src/output/ascii.c
@@ -1,755 +1,1041 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
#include
#include
#include
+#include
+#include
#include
+#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 "chart.h"
-#include "error.h"
-#include "minmax.h"
-#include "output.h"
+#include "data/file-name.h"
+#include "data/file-handle-def.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 "output/render.h"
+#include "output/table-item.h"
+#include "output/text-item.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
+#include "gl/xsize.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
-/* ASCII driver options: (defaults listed first)
-
- output-file="pspp.list"
- paginate=on|off Formfeeds are desired?
- tab-width=8 Width of a tab; 0 to not use tabs.
-
- headers=on|off Put headers at top of page?
- emphasis=bold|underline|none Style to use for emphasis.
- length=66
- width=130
- squeeze=off|on Squeeze multiple newlines into exactly one.
-
- top-margin=2
- bottom-margin=2
-
- box[x]="strng" Sets box character X (X in base 4: 0-3333).
- */
-
-/* Disable messages by failed range checks. */
-/*#define SUPPRESS_WARNINGS 1 */
+/* This file uses TABLE_HORZ and TABLE_VERT enough to warrant abbreviating. */
+#define H TABLE_HORZ
+#define V TABLE_VERT
-/* Line styles bit shifts. */
enum
{
- LNS_TOP = 0,
- LNS_LEFT = 2,
- LNS_BOTTOM = 4,
- LNS_RIGHT = 6,
-
- LNS_COUNT = 256
+ ASCII_LINE_NONE,
+ ASCII_LINE_SINGLE,
+ ASCII_LINE_DOUBLE,
+ ASCII_N_LINES
};
-/* Character attributes. */
-#define ATTR_EMPHASIS 0x100 /* Bold-face. */
-#define ATTR_BOX 0x200 /* Line drawing character. */
+#define N_BOX (ASCII_N_LINES * ASCII_N_LINES \
+ * ASCII_N_LINES * ASCII_N_LINES)
-/* A line of text. */
-struct line
+static const ucs4_t ascii_box_chars[N_BOX] =
{
- unsigned short *chars; /* Characters and attributes. */
- int char_cnt; /* Length. */
- int char_cap; /* Allocated bytes. */
+ ' ', '|', '#',
+ '-', '+', '#',
+ '=', '#', '#',
+ '|', '|', '#',
+ '+', '+', '#',
+ '#', '#', '#',
+ '#', '#', '#',
+ '#', '#', '#',
+ '#', '#', '#',
+ '-', '+', '#',
+ '-', '+', '#',
+ '#', '#', '#',
+ '+', '+', '#',
+ '+', '+', '#',
+ '#', '#', '#',
+ '#', '#', '#',
+ '#', '#', '#',
+ '#', '#', '#',
+ '=', '#', '#',
+ '#', '#', '#',
+ '=', '#', '#',
+ '#', '#', '#',
+ '#', '#', '#',
+ '#', '#', '#',
+ '#', '#', '#',
+ '#', '#', '#',
+ '#', '#', '#',
};
-/* How to emphasize text. */
-enum emphasis_style
+static const ucs4_t unicode_box_chars[N_BOX] =
{
- EMPH_BOLD, /* Overstrike for bold. */
- EMPH_UNDERLINE, /* Overstrike for underlining. */
- EMPH_NONE /* No emphasis. */
+ 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,
};
-/* ASCII output driver extension record. */
-struct ascii_driver_ext
+static int
+ascii_line_from_render_line (int render_line)
+{
+ switch (render_line)
+ {
+ case RENDER_LINE_NONE:
+ return ASCII_LINE_NONE;
+
+ case RENDER_LINE_SINGLE:
+ case RENDER_LINE_DASHED:
+ case RENDER_LINE_THICK:
+ case RENDER_LINE_THIN:
+ return ASCII_LINE_SINGLE;
+
+ case RENDER_LINE_DOUBLE:
+ return ASCII_LINE_DOUBLE;
+
+ default:
+ return ASCII_LINE_NONE;
+ }
+
+}
+
+static int
+make_box_index (int left_, int right_, int top_, int bottom_)
+{
+ bool rtl = render_direction_rtl ();
+ int left = ascii_line_from_render_line (rtl ? right_ : left_);
+ int right = ascii_line_from_render_line (rtl ? left_ : right_);
+ 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;
+}
+
+/* ASCII output driver. */
+struct ascii_driver
{
- struct pool *pool;
+ struct output_driver driver;
/* User parameters. */
- bool headers; /* Print headers at top of page? */
- bool paginate; /* Insert formfeeds? */
- bool squeeze_blank_lines; /* Squeeze multiple blank lines into one? */
- enum emphasis_style emphasis; /* How to emphasize text. */
- int tab_width; /* Width of a tab; 0 not to use tabs. */
+ bool append; /* Append if output file already exists? */
+ 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 {
+ FIXED_WIDTH, /* Specified by configuration. */
+ VIEW_WIDTH, /* From SET WIDTH. */
+ TERMINAL_WIDTH /* From the terminal's width. */
+ } width_mode;
+ int width; /* Page width. */
- int page_length; /* Page length before subtracting margins. */
- int top_margin; /* Top margin in lines. */
- int bottom_margin; /* Bottom margin in lines. */
+ int min_hbreak; /* Min cell size to break across pages. */
- char *box[LNS_COUNT]; /* Line & box drawing characters. */
+ const ucs4_t *box; /* Line & box drawing characters. */
/* Internal state. */
- char *file_name; /* Output file name. */
+ struct file_handle *handle;
FILE *file; /* Output file. */
- int page_number; /* Current page number. */
- struct line *lines; /* Page content. */
- int line_cap; /* Number of lines allocated. */
+ 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. */
+ struct render_params params;
};
-static int get_default_box_char (size_t idx);
-static bool handle_option (struct outp_driver *this, const char *key,
- const struct string *val);
+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 void ascii_draw_line (void *, int bb[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 color_idx,
+ int bb[TABLE_N_AXES][2], int valign_offset,
+ int spill[TABLE_N_AXES][2],
+ int clip[TABLE_N_AXES][2]);
+
+static struct ascii_driver *
+ascii_driver_cast (struct output_driver *driver)
+{
+ assert (driver->class == &ascii_driver_class);
+ return UP_CAST (driver, struct ascii_driver, driver);
+}
+
+static struct driver_option *
+opt (struct output_driver *d, struct string_map *options, const char *key,
+ const char *default_value)
+{
+ 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
-ascii_open_driver (struct outp_driver *this, struct substring options)
+term_is_utf8_xterm (void)
{
- struct ascii_driver_ext *x;
- int i;
+ 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")));
+}
- this->width = 79;
- this->font_height = 1;
- this->prop_em_width = 1;
- this->fixed_width = 1;
- for (i = 0; i < OUTP_L_COUNT; i++)
- this->horiz_line_width[i] = this->vert_line_width[i] = i != OUTP_L_NONE;
-
- this->ext = x = pool_create_container (struct ascii_driver_ext, pool);
- x->headers = true;
- x->paginate = true;
- x->squeeze_blank_lines = false;
- x->emphasis = EMPH_BOLD;
- x->tab_width = 8;
- x->page_length = 66;
- x->top_margin = 2;
- x->bottom_margin = 2;
- for (i = 0; i < LNS_COUNT; i++)
- x->box[i] = NULL;
- x->file_name = pool_strdup (x->pool, "pspp.list");
- x->file = NULL;
- x->page_number = 0;
- x->lines = NULL;
- x->line_cap = 0;
-
- if (!outp_parse_options (options, handle_option, this))
- goto error;
+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;
+ struct output_driver *d;
+ struct ascii_driver *a;
+
+ a = xzalloc (sizeof *a);
+ 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_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;
+
+
+ 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
+ a->bg = parse_color (opt (d, o, "background-color", "#FFFFFFFFFFFF"));
+ a->fg = parse_color (opt (d, o, "foreground-color", "#000000000000"));
+#endif
- x->file = pool_fopen (x->pool, x->file_name, "w");
- if (x->file == NULL)
- {
- error (0, errno, _("ascii: opening output file \"%s\""), x->file_name);
- goto error;
- }
+ 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->file = NULL;
+ a->error = false;
+ a->lines = NULL;
+ a->allocated_lines = 0;
+ 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 ();
- this->length = x->page_length - x->top_margin - x->bottom_margin - 1;
- if (x->headers)
- this->length -= 3;
+ if (!update_page_size (a, true))
+ goto error;
- if (this->width < 59 || this->length < 15)
+ a->file = fn_open (a->handle, a->append ? "a" : "w");
+ if (!a->file)
{
- error (0, 0,
- _("ascii: page excluding margins and headers "
- "must be at least 59 characters wide by 15 lines long, but as "
- "configured is only %d characters by %d lines"),
- this->width, this->length);
- return false;
+ msg_error (errno, _("ascii: opening output file `%s'"),
+ fh_get_file_name (a->handle));
+ goto error;
}
- for (i = 0; i < LNS_COUNT; i++)
- if (x->box[i] == NULL)
- {
- char s[2];
- s[0] = get_default_box_char (i);
- s[1] = '\0';
- x->box[i] = pool_strdup (x->pool, s);
- }
-
- return true;
+ return d;
- error:
- pool_destroy (x->pool);
- return false;
+error:
+ output_driver_destroy (d);
+ return NULL;
}
static int
-get_default_box_char (size_t idx)
+parse_page_size (struct driver_option *option)
{
- /* Disassemble IDX into components. */
- unsigned top = (idx >> LNS_TOP) & 3;
- unsigned left = (idx >> LNS_LEFT) & 3;
- unsigned bottom = (idx >> LNS_BOTTOM) & 3;
- unsigned right = (idx >> LNS_RIGHT) & 3;
-
- /* Reassemble components into nibbles in the order TLBR.
- This makes it easy to read the case labels. */
- unsigned value = (top << 12) | (left << 8) | (bottom << 4) | (right << 0);
- switch (value)
- {
- case 0x0000:
- return ' ';
-
- case 0x0100: case 0x0101: case 0x0001:
- return '-';
+ int dim = atol (option->default_value);
- case 0x1000: case 0x1010: case 0x0010:
- return '|';
+ if (option->value != NULL)
+ {
+ if (!strcmp (option->value, "auto"))
+ dim = -1;
+ else
+ {
+ int value;
+ char *tail;
+
+ errno = 0;
+ value = strtol (option->value, &tail, 0);
+ if (value >= 1 && errno != ERANGE && *tail == '\0')
+ dim = value;
+ else
+ msg (MW, _("%s: %s must be positive integer or `auto'"),
+ option->driver_name, option->name);
+ }
+ }
- case 0x0300: case 0x0303: case 0x0003:
- case 0x0200: case 0x0202: case 0x0002:
- return '=';
+ driver_option_destroy (option);
- default:
- return left > 1 || top > 1 || right > 1 || bottom > 1 ? '#' : '+';
- }
+ return dim;
}
+/* Re-calculates the page width based on settings, margins, and, if "auto" is
+ set, the size of the user's terminal window or GUI output window. */
static bool
-ascii_close_driver (struct outp_driver *this)
+update_page_size (struct ascii_driver *a, bool issue_error)
{
- struct ascii_driver_ext *x = this->ext;
-
- if (fn_close (x->file_name, x->file) != 0)
- error (0, errno, _("ascii: closing output file \"%s\""), x->file_name);
- pool_detach_file (x->pool, x->file);
- pool_destroy (x->pool);
-
- 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;
}
-/* Generic option types. */
-enum
- {
- boolean_arg,
- string_arg,
- nonneg_int_arg,
- pos_int_arg,
- output_file_arg
- };
+static void
+ascii_destroy (struct output_driver *driver)
+{
+ struct ascii_driver *a = ascii_driver_cast (driver);
+ int i;
-static const struct outp_option option_tab[] =
- {
- {"headers", boolean_arg, 0},
- {"paginate", boolean_arg, 1},
- {"squeeze", boolean_arg, 2},
+ if (a->file != NULL)
+ fn_close (a->handle, a->file);
+ fh_unref (a->handle);
+ free (a->chart_file_name);
+ for (i = 0; i < a->allocated_lines; i++)
+ u8_line_destroy (&a->lines[i]);
+ free (a->lines);
+ free (a);
+}
- {"emphasis", string_arg, 3},
+static void
+ascii_flush (struct output_driver *driver)
+{
+ struct ascii_driver *a = ascii_driver_cast (driver);
+ if (a->file)
+ fflush (a->file);
+}
- {"output-file", output_file_arg, 0},
+static void
+ascii_output_lines (struct ascii_driver *a, size_t n_lines)
+{
+ for (size_t y = 0; y < n_lines; y++)
+ {
+ if (y < a->allocated_lines)
+ {
+ struct u8_line *line = &a->lines[y];
- {"length", pos_int_arg, 0},
- {"width", pos_int_arg, 1},
+ 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);
+ }
+}
- {"top-margin", nonneg_int_arg, 0},
- {"bottom-margin", nonneg_int_arg, 1},
- {"tab-width", nonneg_int_arg, 2},
+static void
+ascii_output_table_item (struct ascii_driver *a,
+ const struct table_item *table_item)
+{
+ struct render_pager *p;
- {NULL, 0, 0},
- };
+ update_page_size (a, false);
-static bool
-handle_option (struct outp_driver *this, const char *key,
- const struct string *val)
-{
- struct ascii_driver_ext *x = this->ext;
- int subcat;
- const char *value;
+ if (a->object_cnt++)
+ putc ('\n', a->file);
- value = ds_cstr (val);
- if (!strncmp (key, "box[", 4))
+ p = render_pager_create (&a->params, table_item);
+ for (int i = 0; render_pager_has_next (p); i++)
{
- char *tail;
- int indx = strtol (&key[4], &tail, 4);
- if (*tail != ']' || indx < 0 || indx > LNS_COUNT)
- {
- error (0, 0, _("ascii: bad index value for `box' key: syntax "
- "is box[INDEX], 0 <= INDEX < %d decimal, with INDEX "
- "expressed in base 4"),
- LNS_COUNT);
- return false;
- }
- if (x->box[indx] != NULL)
- error (0, 0, _("ascii: multiple values for %s"), key);
- x->box[indx] = pool_strdup (x->pool, value);
- return true;
+ if (i)
+ putc ('\n', a->file);
+ ascii_output_lines (a, render_pager_draw_next (p, INT_MAX));
}
+ render_pager_destroy (p);
+}
- switch (outp_match_keyword (key, option_tab, &subcat))
- {
- case -1:
- error (0, 0, _("ascii: unknown parameter `%s'"), key);
- break;
- case output_file_arg:
- x->file_name = pool_strdup (x->pool, value);
- break;
- case pos_int_arg:
- {
- char *tail;
- int arg;
-
- errno = 0;
- arg = strtol (value, &tail, 0);
- if (arg < 1 || errno == ERANGE || *tail)
- {
- error (0, 0, _("ascii: positive integer required as `%s' value"),
- key);
- break;
- }
- switch (subcat)
- {
- case 0:
- x->page_length = arg;
- break;
- case 1:
- this->width = arg;
- break;
- default:
- NOT_REACHED ();
- }
- }
- break;
- case string_arg:
- if (!strcmp (value, "bold"))
- x->emphasis = EMPH_BOLD;
- else if (!strcmp (value, "underline"))
- x->emphasis = EMPH_UNDERLINE;
- else if (!strcmp (value, "none"))
- x->emphasis = EMPH_NONE;
- else
- error (0, 0,
- _("ascii: `emphasis' value must be `bold', "
- "`underline', or `none'"));
- break;
- case nonneg_int_arg:
- {
- char *tail;
- int arg;
-
- errno = 0;
- arg = strtol (value, &tail, 0);
- if (arg < 0 || errno == ERANGE || *tail)
- {
- error (0, 0,
- _("ascii: zero or positive integer required as `%s' value"),
- key);
- break;
- }
- switch (subcat)
- {
- case 0:
- x->top_margin = arg;
- break;
- case 1:
- x->bottom_margin = arg;
- break;
- case 2:
- x->tab_width = arg;
- break;
- default:
- NOT_REACHED ();
- }
- }
- break;
- case boolean_arg:
- {
- bool setting;
- if (!strcmp (value, "on") || !strcmp (value, "true")
- || !strcmp (value, "yes") || atoi (value))
- setting = true;
- else if (!strcmp (value, "off") || !strcmp (value, "false")
- || !strcmp (value, "no") || !strcmp (value, "0"))
- setting = false;
- else
- {
- error (0, 0, _("ascii: boolean value expected for `%s'"), key);
- return false;
- }
- switch (subcat)
- {
- case 0:
- x->headers = setting;
- break;
- case 1:
- x->paginate = setting;
- break;
- case 2:
- x->squeeze_blank_lines = setting;
- break;
- default:
- NOT_REACHED ();
- }
- }
- break;
- default:
- NOT_REACHED ();
- }
+static void
+ascii_output_table_item_unref (struct ascii_driver *a,
+ struct table_item *table_item)
+{
+ ascii_output_table_item (a, table_item);
+ table_item_unref (table_item);
+}
- return true;
+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_open_page (struct outp_driver *this)
+ascii_submit (struct output_driver *driver,
+ const struct output_item *output_item)
{
- struct ascii_driver_ext *x = this->ext;
- int i;
+ struct ascii_driver *a = ascii_driver_cast (driver);
- x->page_number++;
+ if (a->error)
+ return;
- if (this->length > x->line_cap)
+ 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)
{
- x->lines = pool_nrealloc (x->pool,
- x->lines, this->length, sizeof *x->lines);
- for (i = x->line_cap; i < this->length; i++)
+ 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 line *line = &x->lines[i];
- line->chars = NULL;
- line->char_cap = 0;
+ struct text_item *text_item;
+
+ text_item = text_item_create_format (
+ TEXT_ITEM_LOG, _("See %s for a chart."), file_name);
+
+ ascii_submit (driver, &text_item->output_item);
+ text_item_unref (text_item);
+ free (file_name);
}
- x->line_cap = this->length;
}
+#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);
- for (i = 0; i < this->length; i++)
- x->lines[i].char_cnt = 0;
+ 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);
+ char *s = msg_to_string (message_item_get_msg (message_item));
+ ascii_output_text (a, s);
+ free (s);
+ }
}
-/* Ensures that at least the first LENGTH characters of line Y in
- THIS driver identified X have been cleared out. */
-static inline void
-expand_line (struct outp_driver *this, int y, int length)
+const struct output_driver_factory txt_driver_factory =
+ { "txt", "-", ascii_create };
+const struct output_driver_factory list_driver_factory =
+ { "list", "-", ascii_create };
+
+static const struct output_driver_class ascii_driver_class =
+ {
+ "text",
+ ascii_destroy,
+ ascii_submit,
+ ascii_flush,
+ };
+
+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],
+ int *width, int *height);
+
+static void
+ascii_draw_line (void *a_, int bb[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_ext *ext = this->ext;
- struct line *line = &ext->lines[y];
- if (line->char_cnt < length)
+ struct ascii_driver *a = a_;
+ char mbchar[6];
+ int x0, y0, x1, y1;
+ ucs4_t uc;
+ int mblen;
+ int x, y;
+
+ /* Clip to the page. */
+ x0 = MAX (bb[H][0], 0);
+ y0 = MAX (bb[V][0], 0);
+ x1 = MIN (bb[H][1], a->width);
+ y1 = bb[V][1];
+ if (x1 <= 0 || y1 <= 0 || x0 >= a->width)
+ return;
+
+ /* Draw. */
+ 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++)
{
- int x;
- if (line->char_cap < length)
+ char *p = ascii_reserve (a, y, x0, x1, mblen * (x1 - x0));
+ for (x = x0; x < x1; x++)
{
- line->char_cap = MIN (length * 2, this->width);
- line->chars = pool_nrealloc (ext->pool,
- line->chars,
- line->char_cap, sizeof *line->chars);
+ memcpy (p, mbchar, mblen);
+ p += mblen;
}
- for (x = line->char_cnt; x < length; x++)
- line->chars[x] = ' ';
- line->char_cnt = length;
}
}
static void
-ascii_line (struct outp_driver *this,
- int x0, int y0, int x1, int y1,
- enum outp_line_style top, enum outp_line_style left,
- enum outp_line_style bottom, enum outp_line_style right)
+ascii_measure_cell_width (void *a_, const struct table_cell *cell,
+ int *min_width, int *max_width)
{
- struct ascii_driver_ext *ext = this->ext;
- int y;
- unsigned short value;
-
- assert (this->page_open);
-#if DEBUGGING
- if (x0 < 0 || x1 > this->width || y0 < 0 || y1 > this->length)
+ struct ascii_driver *a = a_;
+ int bb[TABLE_N_AXES][2];
+ int clip[TABLE_N_AXES][2];
+ int h;
+
+ bb[H][0] = 0;
+ bb[H][1] = INT_MAX;
+ 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, max_width, &h);
+
+ if (cell->n_footnotes || strchr (cell->text, ' ')
+ || cell->n_subscripts || cell->superscript)
{
-#if !SUPPRESS_WARNINGS
- printf (_("ascii: bad line (%d,%d)-(%d,%d) out of (%d,%d)\n"),
- x0, y0, x1, y1, this->width, this->length);
-#endif
- return;
+ bb[H][1] = 1;
+ ascii_layout_cell (a, cell, bb, clip, min_width, &h);
}
-#endif
+ else
+ *min_width = *max_width;
+}
- value = ((left << LNS_LEFT) | (right << LNS_RIGHT)
- | (top << LNS_TOP) | (bottom << LNS_BOTTOM) | ATTR_BOX);
- for (y = y0; y < y1; y++)
- {
- int x;
+static int
+ascii_measure_cell_height (void *a_, const struct table_cell *cell, int width)
+{
+ struct ascii_driver *a = a_;
+ int bb[TABLE_N_AXES][2];
+ int clip[TABLE_N_AXES][2];
+ int w, h;
+
+ bb[H][0] = 0;
+ bb[H][1] = 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, &w, &h);
+ return h;
+}
- expand_line (this, y, x1);
- for (x = x0; x < x1; x++)
- ext->lines[y].chars[x] = value;
+static void
+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);
+}
+
+static char *
+ascii_reserve (struct ascii_driver *a, int y, int x0, int x1, int n)
+{
+ if (y >= a->allocated_lines)
+ {
+ size_t new_alloc = MAX (25, a->allocated_lines);
+ while (new_alloc <= y)
+ new_alloc = xtimes (new_alloc, 2);
+ a->lines = xnrealloc (a->lines, new_alloc, sizeof *a->lines);
+ for (size_t i = a->allocated_lines; i < new_alloc; i++)
+ u8_line_init (&a->lines[i]);
+ a->allocated_lines = new_alloc;
}
+ return u8_line_reserve (&a->lines[y], x0, x1, n);
}
static void
-text_draw (struct outp_driver *this,
- enum outp_font font,
- int x, int y,
- enum outp_justification justification, int width,
- const char *string, size_t length)
+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)
{
- struct ascii_driver_ext *ext = this->ext;
- unsigned short attr = font == OUTP_EMPHASIS ? ATTR_EMPHASIS : 0;
+ int x0 = MAX (0, clip[H][0]);
+ int y0 = MAX (0, clip[V][0]);
+ int x1 = MIN (a->width, clip[H][1]);
+ int y1 = clip[V][1];
+ int x;
- int line_len;
+ if (y < y0 || y >= y1)
+ return;
- switch (justification)
+ switch (table_halign_interpret (halign, options & TAB_NUMERIC))
{
- case OUTP_LEFT:
+ case TABLE_HALIGN_LEFT:
+ x = bb[H][0];
break;
- case OUTP_CENTER:
- x += (width - length + 1) / 2;
+ case TABLE_HALIGN_CENTER:
+ x = (bb[H][0] + bb[H][1] - width + 1) / 2;
break;
- case OUTP_RIGHT:
- x += width - length;
+ case TABLE_HALIGN_RIGHT:
+ case TABLE_HALIGN_DECIMAL:
+ x = bb[H][1] - width;
break;
default:
NOT_REACHED ();
}
-
- if (y >= this->length || x >= this->width)
+ if (x >= x1)
return;
- if (x + length > this->width)
- length = this->width - x;
-
- line_len = x + length;
+ while (x < x0)
+ {
+ ucs4_t uc;
+ int mblen;
+ int w;
- expand_line (this, y, line_len);
- while (length-- > 0)
- ext->lines[y].chars[x++] = *string++ | attr;
-}
+ if (n == 0)
+ return;
+ mblen = u8_mbtouc (&uc, string, n);
-/* Divides the text T->S into lines of width T->H. Sets T->V to the
- number of lines necessary. Actually draws the text if DRAW is
- true. */
-static void
-delineate (struct outp_driver *this, const struct outp_text *text, bool draw,
- int *width, int *height)
-{
- int max_width;
- int height_left;
+ string += mblen;
+ n -= mblen;
- const char *cp = ss_data (text->string);
-
- max_width = 0;
- height_left = text->v;
+ w = uc_width (uc, "UTF-8");
+ if (w > 0)
+ {
+ x += w;
+ width -= w;
+ }
+ }
+ if (n == 0)
+ return;
- while (height_left > 0)
+ if (x + width > x1)
{
- size_t chars_left;
- size_t line_len;
- const char *end;
-
- /* Initially the line is up to text->h characters long. */
- chars_left = ss_end (text->string) - cp;
- if (chars_left == 0)
- break;
- line_len = MIN (chars_left, text->h);
+ int ofs;
- /* A new-line terminates the line prematurely. */
- end = memchr (cp, '\n', line_len);
- if (end != NULL)
- line_len = end - cp;
+ ofs = width = 0;
+ for (ofs = 0; ofs < n;)
+ {
+ ucs4_t uc;
+ int mblen;
+ int w;
+
+ mblen = u8_mbtouc (&uc, string + ofs, n - ofs);
+
+ 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;
+ }
- /* Don't cut off words if it can be avoided. */
- if (cp + line_len < ss_end (text->string))
+ if (!a->emphasis || (!bold && !underline))
+ 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)
{
- size_t space_len = line_len;
- while (space_len > 0 && !isspace ((unsigned char) cp[space_len]))
- space_len--;
- if (space_len > 0)
- line_len = space_len;
+ ucs4_t uc;
+ int w;
+
+ mblen = u8_mbtouc (&uc, string + ofs, n - ofs);
+ w = uc_width (uc, "UTF-8");
+
+ if (w > 0)
+ {
+ if (bold)
+ n_out += 1 + mblen;
+ if (underline)
+ n_out += 2;
+ }
}
- /* Draw text. */
- if (draw)
- text_draw (this,
- text->font,
- text->x, text->y + (text->v - height_left),
- text->justification, text->h,
- cp, line_len);
-
- /* Update. */
- height_left--;
- if (line_len > max_width)
- max_width = line_len;
-
- /* Next line. */
- cp += line_len;
- if (cp < ss_end (text->string) && isspace ((unsigned char) *cp))
- cp++;
+ /* 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 (bold)
+ {
+ out = mempcpy (out, string + ofs, mblen);
+ *out++ = '\b';
+ }
+ if (underline)
+ {
+ *out++ = '_';
+ *out++ = '\b';
+ }
+ }
+ out = mempcpy (out, string + ofs, mblen);
+ }
}
-
- if (width != NULL)
- *width = max_width;
- if (height != NULL)
- *height = text->v - height_left;
}
-static void
-ascii_text_metrics (struct outp_driver *this, const struct outp_text *t,
- int *width, int *height)
+static char *
+add_markers (const char *text, const struct table_cell *cell)
{
- delineate (this, t, false, width, height);
+ 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]);
+ if (cell->superscript)
+ ds_put_format (&s, "^%s", cell->superscript);
+ 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_text_draw (struct outp_driver *this, const struct outp_text *t)
+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)
{
- assert (this->page_open);
- delineate (this, t, true, NULL, NULL);
-}
+ *widthp = 0;
+ *heightp = 0;
-
-/* ascii_close_page () and support routines. */
-
-/* Writes the LENGTH characters in S to OUT. */
-static void
-output_line (struct outp_driver *this, const struct line *line,
- struct string *out)
-{
- struct ascii_driver_ext *ext = this->ext;
- const unsigned short *s = line->chars;
- size_t length;
-
- for (length = line->char_cnt; length-- > 0; s++)
- if (*s & ATTR_BOX)
- ds_put_cstr (out, ext->box[*s & 0xff]);
- else
- {
- if (*s & ATTR_EMPHASIS)
- {
- if (ext->emphasis == EMPH_BOLD)
- {
- ds_put_char (out, *s);
- ds_put_char (out, '\b');
- }
- else if (ext->emphasis == EMPH_UNDERLINE)
- ds_put_cstr (out, "_\b");
- }
- ds_put_char (out, *s);
- }
-}
+ /* Get the basic textual contents. */
+ const char *plain_text = (cell->options & TAB_MARKUP
+ ? output_get_text_from_markup (cell->text)
+ : cell->text);
-static void
-append_lr_justified (struct string *out, int width,
- const char *left, const char *right)
-{
- ds_put_char_multiple (out, ' ', width);
- if (left != NULL)
+ /* Append footnotes, subscripts, superscript if any. */
+ const char *text;
+ if (cell->n_footnotes || cell->n_subscripts || cell->superscript)
{
- size_t length = MIN (strlen (left), width);
- memcpy (ds_end (out) - width, left, length);
+ text = add_markers (plain_text, cell);
+ if (plain_text != cell->text)
+ free (CONST_CAST (char *, plain_text));
}
- if (right != NULL)
+ else
+ text = plain_text;
+
+ /* Calculate length; if it's zero, then there's nothing to do. */
+ size_t length = strlen (text);
+ if (!length)
{
- size_t length = MIN (strlen (right), width);
- memcpy (ds_end (out) - length, right, length);
+ if (text != cell->text)
+ free (CONST_CAST (char *, text));
+ return;
}
- ds_put_char (out, '\n');
-}
-static void
-dump_output (struct outp_driver *this, struct string *out)
-{
- struct ascii_driver_ext *x = this->ext;
- fwrite (ds_data (out), ds_length (out), 1, x->file);
- ds_clear (out);
-}
+ 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);
-static void
-ascii_close_page (struct outp_driver *this)
-{
- struct ascii_driver_ext *x = this->ext;
- struct string out;
- int line_num;
+ 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;
+ size_t n = length - pos;
- ds_init_empty (&out);
+ size_t last_break_ofs = 0;
+ int last_break_width = 0;
+ int width = 0;
+ size_t graph_ofs;
+ size_t ofs;
- ds_put_char_multiple (&out, '\n', x->top_margin);
- if (x->headers)
- {
- char *r1, *r2;
+ for (ofs = 0; ofs < n;)
+ {
+ ucs4_t uc;
+ int mblen;
+ int w;
- r1 = xasprintf (_("%s - Page %d"), get_start_date (), x->page_number);
- r2 = xasprintf ("%s - %s" , version, host_system);
+ mblen = u8_mbtouc (&uc, line + ofs, n - ofs);
+ if (b[ofs] == UC_BREAK_MANDATORY)
+ break;
+ else if (b[ofs] == UC_BREAK_POSSIBLE)
+ {
+ 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;
+ }
- append_lr_justified (&out, this->width, outp_title, r1);
- append_lr_justified (&out, this->width, outp_subtitle, r2);
- ds_put_char (&out, '\n');
+ /* 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;
- free (r1);
- free (r2);
+ /* Draw text. */
+ 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
+ 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;
+ ++*heightp;
+ pos += ofs;
}
- dump_output (this, &out);
- for (line_num = 0; line_num < this->length; line_num++)
- {
+ free (breaks);
+ if (text != cell->text)
+ free (CONST_CAST (char *, text));
+}
- /* Squeeze multiple blank lines into a single blank line if
- requested. */
- if (x->squeeze_blank_lines)
- {
- if (line_num >= x->line_cap)
- break;
- if (line_num > 0
- && x->lines[line_num].char_cnt == 0
- && x->lines[line_num - 1].char_cnt == 0)
- continue;
- }
+void
+ascii_test_write (struct output_driver *driver,
+ 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 (line_num < x->line_cap)
- output_line (this, &x->lines[line_num], &out);
- ds_put_char (&out, '\n');
- dump_output (this, &out);
- }
+ if (!a->file)
+ return;
+
+ struct table_area_style style = {
+ .cell_style.halign = TABLE_HALIGN_LEFT,
+ .font_style.bold = bold,
+ .font_style.underline = underline,
+ };
+ struct table_cell cell = {
+ .text = CONST_CAST (char *, s),
+ .style = &style,
+ };
- ds_put_char_multiple (&out, '\n', x->bottom_margin);
- if (x->paginate)
- ds_put_char (&out, '\f');
+ bb[TABLE_HORZ][0] = x;
+ bb[TABLE_HORZ][1] = a->width;
+ bb[TABLE_VERT][0] = y;
+ bb[TABLE_VERT][1] = INT_MAX;
- dump_output (this, &out);
- ds_destroy (&out);
+ ascii_layout_cell (a, &cell, bb, bb, &width, &height);
}
-static void
-ascii_chart_initialise (struct outp_driver *d UNUSED, struct chart *ch)
+void
+ascii_test_set_length (struct output_driver *driver, int y, int length)
{
- error (0, 0, _("ascii: charts are unsupported by this driver"));
- ch->lp = 0;
+ struct ascii_driver *a = ascii_driver_cast (driver);
+
+ if (!a->file)
+ return;
+
+ if (y < 0)
+ return;
+ u8_line_set_length (&a->lines[y], length);
}
-static void
-ascii_chart_finalise (struct outp_driver *d UNUSED, struct chart *ch UNUSED)
+void
+ascii_test_flush (struct output_driver *driver)
{
+ struct ascii_driver *a = ascii_driver_cast (driver);
+ for (size_t i = a->allocated_lines; i-- > 0;)
+ if (a->lines[i].width)
+ {
+ ascii_output_lines (a, i + 1);
+ break;
+ }
}
+
+static sig_atomic_t terminal_changed = true;
+static int terminal_width;
-const struct outp_class ascii_class =
+#if HAVE_DECL_SIGWINCH
+static void
+winch_handler (int signum UNUSED)
{
- "ascii",
- 0,
+ terminal_changed = true;
+}
+#endif
- ascii_open_driver,
- ascii_close_driver,
+int
+get_terminal_width (void)
+{
+#if HAVE_DECL_SIGWINCH
+ 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
- ascii_open_page,
- ascii_close_page,
+ if (terminal_changed)
+ {
+ terminal_changed = false;
- NULL,
+#ifdef HAVE_TERMIOS_H
+ struct winsize ws;
+ if (!ioctl (0, TIOCGWINSZ, &ws))
+ terminal_width = ws.ws_col;
+ else
+#endif
+ {
+ if (getenv ("COLUMNS"))
+ terminal_width = atoi (getenv ("COLUMNS"));
+ }
- ascii_line,
- ascii_text_metrics,
- ascii_text_draw,
+ if (terminal_width <= 0 || terminal_width > 1024)
+ terminal_width = 79;
+ }
- ascii_chart_initialise,
- ascii_chart_finalise
-};
+ return terminal_width;
+}