X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Frrd_graph.h;h=dd036151712abf26e849c2a322803424f1f14e9a;hb=2815c8a96b82730e41cebf8a5065e00666c560b8;hp=8d5dc35cae9421998a60eadef125f2760fb6385f;hpb=1bf4194f061e0000eff34e71e6c46c7f72eb252f;p=rrdtool.git

diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index 8d5dc35..dd03615 100644
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -20,7 +20,7 @@
 #define FORCE_UNITS 0x100   /* mask for all FORCE_UNITS_* flags */
 #define FORCE_UNITS_SI 0x100    /* force use of SI units in Y axis (no effect in linear graph, SI instead of E in log graph) */
 
-#define FULL_SIZE_MODE     0x200   /* -width and -height indicate the total size of the image */
+#define FULL_SIZE_MODE     0x200    /* -width and -height indicate the total size of the image */
 
 enum tmt_en { TMT_SECOND = 0, TMT_MINUTE, TMT_HOUR, TMT_DAY,
     TMT_WEEK, TMT_MONTH, TMT_YEAR
@@ -101,7 +101,6 @@ typedef struct ylab_t {
     int       lfac[4];  /* associated label spacing */
 } ylab_t;
 
-
 /* this structure describes the elements which can make up a graph.
    because they are quite diverse, not all elements will use all the
    possible parts of the structure. */
@@ -122,7 +121,7 @@ typedef struct graph_desc_t {
     long      ds;       /* data source number */
     enum cf_en cf;      /* consolidation function */
     enum cf_en cf_reduce;   /* consolidation function for reduce_data() */
-    gfx_color_t col;    /* graph color */
+    struct gfx_color_t col; /* graph color */
     char      format[FMT_LEG_LEN + 5];  /* format for PRINT AND GPRINT */
     char      legend[FMT_LEG_LEN + 5];  /* legend */
     int       strftm;   /* should the VDEF legend be formated with strftime */
@@ -160,7 +159,7 @@ typedef struct image_desc_t {
 #ifdef WITH_PIECHART
     long      piesize;  /* size of the piechart */
 #endif
-    gfx_color_t graph_col[__GRC_END__]; /* real colors for the graph */
+    struct gfx_color_t graph_col[__GRC_END__];  /* real colors for the graph */
     text_prop_t text_prop[TEXT_PROP_LAST];  /* text properties */
     char      ylegend[210]; /* legend along the yaxis */
     char      title[210];   /* title for graph */
@@ -184,6 +183,7 @@ typedef struct image_desc_t {
                            grindlines falls in integer pixel values */
     char     *imginfo;  /* construct an <IMG ... tag and return 
                            as first retval */
+    enum gfx_if_en imgformat;   /* image format */
     int       lazy;     /* only update the image if there is
                            reasonable probablility that the
                            existing one is out of date */
@@ -197,6 +197,7 @@ typedef struct image_desc_t {
     long      pie_x, pie_y; /* where is the centerpoint */
 #endif
     long      ximg, yimg;   /* total size of the image */
+    double    zoom;
     double    magfact;  /* numerical magnitude */
     long      base;     /* 1000 or 1024 depending on what we graph */
     char      symbol;   /* magnitude symbol for y-axis */
@@ -211,7 +212,8 @@ typedef struct image_desc_t {
     long      prt_c;    /* number of print elements */
     long      gdes_c;   /* number of graphics elements */
     graph_desc_t *gdes; /* points to an array of graph elements */
-    gfx_canvas_t *canvas;   /* graphics library */
+    cairo_surface_t *surface;   /* graphics library */
+    cairo_t  *cr;       /* drawin context */
 } image_desc_t;
 
 /* Prototypes */
@@ -279,7 +281,7 @@ int       print_calc(
     char ***);
 int       leg_place(
     image_desc_t *,
-    int*);
+    int *);
 int       calc_horizontal_grid(
     image_desc_t *);
 int       draw_horizontal_grid(