X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput.h;h=d79554ffb7237f7b9ced096f62855e2a82b32509;hb=ed7bce25787929340a3f264f00dde7c979e571a9;hp=4b31f050b1ca3712581ffa8147e8876670ff4fc7;hpb=eeb3352d718b0cd85afab3f7a7466fcac7791c1c;p=pspp diff --git a/src/output.h b/src/output.h index 4b31f050b1..d79554ffb7 100644 --- a/src/output.h +++ b/src/output.h @@ -21,6 +21,9 @@ #define output_h 1 #include "str.h" +#include "config.h" + +#include "chart.h" /* A rectangle. */ struct rect @@ -101,7 +104,7 @@ struct outp_text { /* Public. */ int options; /* What is specified. */ - struct len_string s; /* String. */ + struct fixed_string s; /* String. */ int h, v; /* Horizontal, vertical size. */ int x, y; /* Position. */ @@ -109,7 +112,7 @@ struct outp_text int w, l; /* Width, length. */ }; -struct som_table; +struct som_entity; struct outp_driver; /* Defines a class of output driver. */ @@ -135,8 +138,8 @@ struct outp_class int (*open_page) (struct outp_driver *); int (*close_page) (struct outp_driver *); - /* special != 0: Used to submit tables for output. */ - void (*submit) (struct outp_driver *, struct som_table *); + /* special != 0: Used to submit entities for output. */ + void (*submit) (struct outp_driver *, struct som_entity *); /* special != 0: Methods below need not be defined. */ @@ -166,6 +169,10 @@ struct outp_class int (*text_get_size) (struct outp_driver *, int *em_width); void (*text_metrics) (struct outp_driver *, struct outp_text *); void (*text_draw) (struct outp_driver *, struct outp_text *); + + void (*initialise_chart)(struct outp_class *, struct chart *); + void (*finialise_chart)(struct outp_class *, struct chart *); + }; /* Device types. */