#include <uniwidth.h>
#ifdef HAVE_TERMIOS_H
-# include <termios.h>
-#endif
-
-#ifdef GWINSZ_IN_SYS_IOCTL
# include <sys/ioctl.h>
+# include <termios.h>
#endif
#include "data/file-name.h"
}
static void
-ascii_submit (struct output_driver *driver,
- const struct output_item *item)
+ascii_submit (struct output_driver *driver, const struct output_item *item)
{
struct ascii_driver *a = ascii_driver_cast (driver);
-
if (a->error)
return;
case OUTPUT_ITEM_CHART:
if (a->chart_file_name != NULL)
{
- char *file_name = xr_draw_png_chart (item->chart, a->chart_file_name,
- ++a->chart_cnt, &a->fg,
- &a->bg);
+ char *file_name = xr_draw_png_chart (
+ item->chart, a->chart_file_name, ++a->chart_cnt, &a->fg, &a->bg);
if (file_name != NULL)
{
struct output_item *text_item = text_item_create_nocopy (
ascii_output_table_item_unref (
a, text_item_to_table_item (
message_item_to_text_item (
- output_item_ref (item))));
+ output_item_ref (item))));
+ break;
+
+ case OUTPUT_ITEM_GROUP:
break;
- case OUTPUT_ITEM_GROUP_OPEN:
- case OUTPUT_ITEM_GROUP_CLOSE:
case OUTPUT_ITEM_PAGE_BREAK:
- case OUTPUT_ITEM_PAGE_SETUP:
break;
}
}
static const struct output_driver_class ascii_driver_class =
{
- "text",
- ascii_destroy,
- ascii_submit,
- ascii_flush,
+ .name = "text",
+ .destroy = ascii_destroy,
+ .submit = ascii_submit,
+ .flush = ascii_flush,
};
\f
static char *ascii_reserve (struct ascii_driver *, int y, int x0, int x1,
.underline = underline,
};
const struct pivot_value value = {
- .type = PIVOT_VALUE_TEXT,
.text = {
+ .type = PIVOT_VALUE_TEXT,
.local = CONST_CAST (char *, s),
.c = CONST_CAST (char *, s),
.id = CONST_CAST (char *, s),