X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=lib%2Fgfxdevice.h;h=699e7f6a16afcba814774fe547b2494d5b5f9606;hp=79f8f1c6dd65f16a7bf634422c794c8e052a8152;hb=bdad407fb79c2f7be9f3603694ebdeadc645b52d;hpb=f46a94646d446b43165e9043c07113cd366a77ca

diff --git a/lib/gfxdevice.h b/lib/gfxdevice.h
index 79f8f1c..699e7f6 100644
--- a/lib/gfxdevice.h
+++ b/lib/gfxdevice.h
@@ -27,16 +27,27 @@ typedef struct _gfxglyph
     gfxcoord_t advance;
 
     int unicode; // array?
-    char*name;
+    const char*name;
 } gfxglyph_t;
 
+typedef struct _gfxkerning
+{
+    int c1,c2,advance;
+} gfxkerning_t;
+
 typedef struct _gfxfont
 {
-    char*name;
+    const char*id;
     int num_glyphs;
     int max_unicode;
+    
+    double ascent,descent;
+
     gfxglyph_t*glyphs;
     int* unicode2glyph;
+
+    gfxkerning_t*kerning;
+    int kerning_size;
 } gfxfont_t;
 
 typedef struct _gfxcolor
@@ -55,13 +66,17 @@ typedef struct _gfxmatrix
 
 typedef struct _gfximage
 {
+    /* if the data contains an alpha layer (a != 255), the
+       r,g,b values will have to be premultiplied */
     gfxcolor_t*data;
     int width;
     int height;
 } gfximage_t;
 
+/* gradients: A radial gradient will start at 0,0 and have a radius of 1,0 
+              An axial gradient starts at -1,0 and ends at 1,0
+ */
 typedef enum {gfxgradient_radial, gfxgradient_linear} gfxgradienttype_t;
-
 typedef struct _gfxgradient
 {
     gfxcolor_t color;
@@ -71,11 +86,10 @@ typedef struct _gfxgradient
 
 typedef struct _gfxcxform
 {
-    float rr,rg,rb,ra;
-    float gr,gg,gb,ga;
-    float br,bg,bb,ba;
-    float ar,ag,ab,aa;
-    gfxcolor_t t;
+    float rr,rg,rb,ra, tr;
+    float gr,gg,gb,ga, tg;
+    float br,bg,bb,ba, tb;
+    float ar,ag,ab,aa, ta;
 } gfxcxform_t;
 
 typedef struct _gfxbbox
@@ -83,27 +97,45 @@ typedef struct _gfxbbox
     gfxcoord_t xmin, ymin, xmax, ymax;
 } gfxbbox_t;
 
+typedef struct _gfxresult
+{
+    void (*write)(struct _gfxresult*gfx, int filedesc);
+    int (*save)(struct _gfxresult*gfx, const char*filename);
+    void* (*get)(struct _gfxresult*gfx, const char*name);
+    void (*destroy)(struct _gfxresult*gfx);
+
+    void*internal;
+} gfxresult_t;
+
 typedef struct _gfxdevice
 {
+    const char* name; // gfx device name
+
     int (*setparameter)(struct _gfxdevice*dev, const char*key, const char*value);
 
-    int (*startpage)(struct _gfxdevice*dev, int xmin, int ymin, int xmax, int ymax); /*xmin/ymin?*/
+    void (*startpage)(struct _gfxdevice*dev, int width, int height);
 
     void (*startclip)(struct _gfxdevice*dev, gfxline_t*line);
     void (*endclip)(struct _gfxdevice*dev);
     void (*stroke)(struct _gfxdevice*dev, gfxline_t*line, gfxcoord_t width, gfxcolor_t*color, gfx_capType cap_style, gfx_joinType joint_style, gfxcoord_t miterLimit);
     void (*fill)(struct _gfxdevice*dev, gfxline_t*line, gfxcolor_t*color);
-    void (*fillbitmap)(struct _gfxdevice*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*matrix, gfxcxform_t*cxform); //cxform? tiling?
-    void (*fillgradient)(struct _gfxdevice*dev, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*matrix); //?
 
-    void (*addfont)(struct _gfxdevice*dev, char*fontid, gfxfont_t*font, gfxmatrix_t*matrix);
-    void (*drawchar)(struct _gfxdevice*dev, char*fontid, int glyph, int x, int y);
+    /* expects alpha channel in image to be non-premultiplied */
+    void (*fillbitmap)(struct _gfxdevice*dev, gfxline_t*line, gfximage_t*img, gfxmatrix_t*imgcoord2devcoord, gfxcxform_t*cxform); //cxform? tiling?
+
+    void (*fillgradient)(struct _gfxdevice*dev, gfxline_t*line, gfxgradient_t*gradient, gfxgradienttype_t type, gfxmatrix_t*gradcoord2devcoord); //?
 
-    void (*drawlink)(struct _gfxdevice*dev, int x1, int y1, int x2, int y2, char*action);
+    void (*addfont)(struct _gfxdevice*dev, gfxfont_t*font);
+
+    void (*drawchar)(struct _gfxdevice*dev, gfxfont_t*font, int glyph, gfxcolor_t*color, gfxmatrix_t*matrix);
+
+    void (*drawlink)(struct _gfxdevice*dev, gfxline_t*line, const char*action);
+    
+    void (*endpage)(struct _gfxdevice*dev);
     
-    int (*endpage)(struct _gfxdevice*dev); //?
+    const char* (*geterror)();
     
-    int (*finish)(struct _gfxdevice*dev);
+    gfxresult_t* (*finish)(struct _gfxdevice*dev);
 
     void* internal;
 } gfxdevice_t;