X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fascii.c;h=7de2d0523a5942dfabcc20bf4ae743c9ba6dfb59;hb=da8c6e44f6e8acaa04887901da4d835437221ccf;hp=8f69dfd883e99be0cb630b098beee3cd813fdc51;hpb=fce028c380d496e42823fd24774e0159ed7cc110;p=pspp diff --git a/src/output/ascii.c b/src/output/ascii.c index 8f69dfd883..7de2d0523a 100644 --- a/src/output/ascii.c +++ b/src/output/ascii.c @@ -150,6 +150,11 @@ struct ascii_driver enum emphasis_style emphasis; /* How to emphasize text. */ char *chart_file_name; /* Name of files used for charts. */ + /* Colours for charts */ + struct xr_color fg; + struct xr_color bg; + + int width; /* Page width. */ int length; /* Page length minus margins and header. */ bool auto_width; /* Use viewwidth as page width? */ @@ -257,6 +262,9 @@ ascii_create (const char *file_name, enum settings_output_devices device_type, a->auto_length = paper_length < 0; a->length = paper_length - vertical_margins (a); + parse_color (d, o, "background-color", "#FFFFFFFFFFFF", &a->bg); + parse_color (d, o, "foreground-color", "#000000000000", &a->fg); + box = parse_enum (opt (d, o, "box", "ascii"), "ascii", BOX_ASCII, "unicode", BOX_UNICODE, @@ -384,8 +392,7 @@ ascii_flush (struct output_driver *driver) ascii_close_page (a); if (fn_close (a->file_name, a->file) != 0) - msg_error (ME, errno, _("ascii: closing output file `%s'"), - a->file_name); + msg_error (errno, _("ascii: closing output file `%s'"), a->file_name); a->file = NULL; } } @@ -521,7 +528,9 @@ ascii_submit (struct output_driver *driver, 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;