ruby-iup 0.0.1 → 0.0.2

data/examples/elem/progressbar.rb

@@ -1,11 +1,9 @@
 require 'rubygems'
-require 'iupruby'
+require 'iup'
 
-exit
+@increment = 0.01
 
-$increment = 0.01
-
-$pixmap_play = [
+@pixmap_play = [
  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -29,7 +27,7 @@ $pixmap_play = [
  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
  2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2]
 
-$pixmap_restart = [
+@pixmap_restart = [
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -53,7 +51,7 @@ $pixmap_restart = [
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2]
 
-$pixmap_rewind = [
+@pixmap_rewind = [
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -77,7 +75,7 @@ $pixmap_rewind = [
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2]
 
-$pixmap_forward = [
+@pixmap_forward = [
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -101,7 +99,7 @@ $pixmap_forward = [
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2]
 
-$pixmap_pause = [
+@pixmap_pause = [
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
@@ -126,169 +124,157 @@ $pixmap_pause = [
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2]
 
 def createimg_s()
-  img_restart = Iup.Image(22,22, $pixmap_restart)
-  img_play = Iup.Image(22,22, $pixmap_play)
-  img_forward = Iup.Image(22,22, $pixmap_forward)
-  img_rewind = Iup.Image(22,22, $pixmap_rewind)
-  img_pause = Iup.Image(22,22, $pixmap_pause)
-  
-  Iup.SetHandle("img_restart", img_restart) 
-  Iup.SetHandle("img_play", img_play)
-  Iup.SetHandle("img_forward", img_forward) 
-  Iup.SetHandle("img_rewind", img_rewind)
-  Iup.SetHandle("img_pause", img_pause)
-  
-  Iup.SetAttribute(img_restart, "1", "0 0 0") 
-  Iup.SetAttribute(img_restart, "2", "BGCOLOR")
-  Iup.SetAttribute(img_play, "1", "0 0 0") 
-  Iup.SetAttribute(img_play, "2", "BGCOLOR") 
-  Iup.SetAttribute(img_forward, "1", "0 0 0") 
-  Iup.SetAttribute(img_forward, "2", "BGCOLOR")
-  Iup.SetAttribute(img_rewind, "1", "0 0 0") 
-  Iup.SetAttribute(img_rewind, "2", "BGCOLOR") 
-  Iup.SetAttribute(img_pause, "1", "0 0 0") 
-  Iup.SetAttribute(img_pause, "2", "BGCOLOR")
+  @img_restart = Iup.Image(22,22, @pixmap_restart)
+  @img_play = Iup.Image(22,22, @pixmap_play)
+  @img_forward = Iup.Image(22,22, @pixmap_forward)
+  @img_rewind = Iup.Image(22,22, @pixmap_rewind)
+  @img_pause = Iup.Image(22,22, @pixmap_pause)
+   
+  @img_restart["1"]= "0 0 0" 
+  @img_restart["2"]= "BGCOLOR"
+  @img_play["1"]= "0 0 0" 
+  @img_play["2"]= "BGCOLOR" 
+  @img_forward["1"]= "0 0 0" 
+  @img_forward["2"]= "BGCOLOR"
+  @img_rewind["1"]= "0 0 0" 
+  @img_rewind["2"]= "BGCOLOR" 
+  @img_pause["1"]= "0 0 0" 
+  @img_pause["2"]= "BGCOLOR"
 end
 
-def time_cb(ih)
-  value = Iup.GetFloat($progressbar1, "VALUE")
-  value += $increment
+@time_cb = lambda do |ih|
+  value = @progressbar1.value.to_f
+  value += @increment
   if(value > 1) 
   	value = 0 # start over */
   end
-  Iup.SetAttribute($progressbar1, "VALUE", "%f" % value)
+  @progressbar1.value = value
 
-  value = Iup.GetFloat($progressbar2, "VALUE")
-  value += $increment*50
+  value = @progressbar2.value.to_f
+  value += @increment*50
   if(value > 50) 
   	value = 0 # start over */
   end
-  Iup.SetAttribute($progressbar2, "VALUE", "%f" % value)
+  @progressbar2.value = value
   return Iup::DEFAULT
 end
 
-def btn_pause_cb(ih)
-  if(Iup.GetInt($timer, "RUN")==0)
-    Iup.SetAttribute($timer, "RUN", "YES")
-    Iup.SetAttribute($btn_pause, "IMAGE", "img_pause")
+@btn_pause_cb = lambda do |ih|
+  if(@timer.run == "NO")
+    @timer.run = "YES"
+    @btn_pause.image = @img_pause
   else
-    Iup.SetAttribute($timer, "RUN", "NO")
-    Iup.SetAttribute($btn_pause, "IMAGE", "img_play")
+    @timer.run = "NO"
+    @btn_pause.image = @img_play
   end
   
   return Iup::DEFAULT
 end
 
-def btn_restart_cb(ih)
-  Iup.SetAttribute($progressbar1, "VALUE", "0")
-  Iup.SetAttribute($progressbar2, "VALUE", "0")
+@btn_restart_cb = lambda do |ih|
+  @progressbar1.value = 0
+  @progressbar2.value = 0
   return Iup::DEFAULT
 end
 
-def btn_accelerate_cb(ih)
-  $increment *= 2
+@btn_accelerate_cb = lambda do |ih|
+  @increment *= 2
   return Iup::DEFAULT
 end
 
-def btn_decelerate_cb(ih)
-  $increment /= 2
+@btn_decelerate_cb = lambda do |ih|
+  @increment /= 2
   return Iup::DEFAULT
 end
 
-def btn_show1_cb(ih)
-  if(Iup.GetInt($progressbar1, "DASHED")==0)
-    Iup.SetAttribute($progressbar1, "DASHED", "YES")
+@btn_show1_cb = lambda do |ih|
+  if(@progressbar1.dashed=="NO")
+    @progressbar1.dashed = "YES"
   else
-    Iup.SetAttribute($progressbar1, "DASHED", "NO")
+    @progressbar1.dashed = "NO"
   end
   return Iup::DEFAULT
 end
 
-def btn_show2_cb(ih)
-  if(Iup.GetInt($progressbar1, "MARQUEE")==0)
-    Iup.SetAttribute($progressbar1, "MARQUEE", "YES")
+@btn_show2_cb = lambda do |ih|
+  if(@progressbar1.marquee=="NO")
+    @progressbar1.marquee = "YES"
   else
-    Iup.SetAttribute($progressbar1, "MARQUEE", "NO")
+    @progressbar1.marquee = "NO"
   end
   return Iup::DEFAULT
 end
 
-  Iup.Open                  # IUP initialization */
 
-  $timer = Iup.Timer()
-  Iup.SetCallback($timer, "ACTION_CB",'time_cb')
-  Iup.SetAttribute($timer, "TIME", "100")
+  @timer = Iup.Timer()
+  @timer.action_cb = @time_cb
+  @timer.time = 100
   
-  $progressbar1 = Iup.ProgressBar()
-  $progressbar2 = Iup.ProgressBar()
+  @progressbar1 = Iup.ProgressBar()
+  @progressbar2 = Iup.ProgressBar()
  
-  Iup.SetAttribute($progressbar1, "EXPAND", "YES")
-  Iup.SetAttribute($progressbar1, "DASHED", "YES")
+  @progressbar1.expand =  "YES"
+  @progressbar1.dashed =  "YES"
+               
+  @progressbar2.orientation = "VERTICAL"
+  @progressbar2.bgcolor = "255 0 128"
+  @progressbar2.fgcolor = "0 128 0"
+  @progressbar2.rastersize = "30x100"
+  @progressbar2.max = 50
+  @progressbar2.value = 25
 
-  Iup.SetAttribute($progressbar2, "ORIENTATION", "VERTICAL")
-  Iup.SetAttribute($progressbar2, "BGCOLOR", "255 0 128")
-  Iup.SetAttribute($progressbar2, "FGCOLOR", "0 128 0")
-  Iup.SetAttribute($progressbar2, "RASTERSIZE", "30x100")
-  Iup.SetAttribute($progressbar2, "MAX", "50")
-  Iup.SetAttribute($progressbar2, "VALUE", "25")
-
-  btn_restart = Iup.Button(NULL, NULL)
-  $btn_pause = Iup.Button(NULL, NULL)
-  btn_accelerate = Iup.Button(NULL, NULL)
-  btn_decelerate = Iup.Button(NULL, NULL)
-  btn_show1 = Iup.Button("Dashed", NULL)
-  btn_show2 = Iup.Button("Marquee", NULL)
+  @btn_restart = Iup.Button('')
+  @btn_pause = Iup.Button('')
+  @btn_accelerate = Iup.Button('')
+  @btn_decelerate = Iup.Button('')
+  @btn_show1 = Iup.Button("Dashed")
+  @btn_show2 = Iup.Button("Marquee")
 
   createimg_s()
 
-  Iup.SetAttribute(btn_restart, "IMAGE", "img_restart")
-  Iup.SetAttribute(btn_restart, "TIP", "Restart" )
-  Iup.SetAttribute($btn_pause, "IMAGE", "img_pause")
-  Iup.SetAttribute($btn_pause, "TIP", "Play/Pause")
-  Iup.SetAttribute(btn_accelerate, "IMAGE", "img_forward")
-  Iup.SetAttribute(btn_accelerate, "TIP", "Accelerate")
-  Iup.SetAttribute(btn_decelerate, "IMAGE", "img_rewind")
-  Iup.SetAttribute(btn_decelerate, "TIP", "Decelerate")
-  Iup.SetAttribute(btn_show1, "TIP", "Dashed or Continuous")
-  Iup.SetAttribute(btn_show2, "TIP", "Marquee or Defined")
+  @btn_restart.image = @img_restart
+  @btn_restart.tip = "Restart"
+  @btn_pause.image = @img_pause
+  @btn_pause.tip = "Play/Pause"
+  @btn_accelerate.image = @img_forward
+  @btn_accelerate.tip = "Accelerate"
+  @btn_decelerate.image = @img_rewind
+  @btn_decelerate.tip = "Decelerate"
+  @btn_show1.tip = "Dashed or Continuous"
+  @btn_show2.tip = "Marquee or Defined"
+
+  @progressbar1.dashed =  "NO"
 
-  hbox = Iup.Hbox([
+  @hbox = Iup.Hbox([
            Iup.Fill(), 
-           $btn_pause,
-           btn_restart,
-           btn_decelerate,
-           btn_accelerate,
-           btn_show1,
-           btn_show2,
+           @btn_pause,
+           @btn_restart,
+           @btn_decelerate,
+           @btn_accelerate,
+           @btn_show1,
+           @btn_show2,
            Iup.Fill()])
 
-  vbox = Iup.Hbox([Iup.Vbox([$progressbar1, hbox]), $progressbar2])
-  Iup.SetAttribute(vbox, "MARGIN", "10x10")
-  Iup.SetAttribute(vbox, "GAP", "5")
+  vbox = Iup.Hbox([Iup.Vbox([@progressbar1, @hbox]), @progressbar2])
+  vbox.margin = "10x10"
+  vbox.gap = "5"
 
   dlg = Iup.Dialog(vbox)
   
-  Iup.SetAttribute(dlg, "TITLE", "Iup.ProgressBar Test")
+  dlg.title = "IupProgressBar Test"
 
-  Iup.SetCallback($btn_pause, "ACTION",'$btn_pause_cb')
-  Iup.SetCallback(btn_restart, "ACTION",'btn_restart_cb')
-  Iup.SetCallback(btn_accelerate, "ACTION",'btn_accelerate_cb')
-  Iup.SetCallback(btn_decelerate, "ACTION",'btn_decelerate_cb')
-  Iup.SetCallback(btn_show1, "ACTION",'btn_show1_cb')
-  Iup.SetCallback(btn_show2, "ACTION",'btn_show2_cb')
+  @btn_pause.action = @btn_pause_cb
+  @btn_restart.action = @btn_restart_cb
+  @btn_accelerate.action = @btn_accelerate_cb
+  @btn_decelerate.action = @btn_decelerate_cb
+  @btn_show1.action = @btn_show1_cb
+  @btn_show2.action = @btn_show2_cb
   
-  Iup.ShowXY(dlg, Iup::CENTER, Iup::CENTER)
+  dlg.ShowXY(Iup::CENTER, Iup::CENTER)
 
-  Iup.SetAttribute($timer, "RUN", "YES")
+  @timer.run = "YES"
 
-  Iup.MainLoop()
+  Iup.MainLoop
   
-  Iup.Destroy(dlg)
-  Iup.Destroy(Iup.GetHandle("img_restart")) 
-  Iup.Destroy(Iup.GetHandle("img_play"))
-  Iup.Destroy(Iup.GetHandle("img_forward")) 
-  Iup.Destroy(Iup.GetHandle("img_rewind"))
-  Iup.Destroy(Iup.GetHandle("img_pause"))
-
-  Iup.Close()
+  dlg.Destroy
 

data/ext/iup-linux/include/cd.h

@@ -1,494 +1,494 @@
-/** \file
- * \brief User API
- * CD - Canvas Draw
- * Tecgraf: Computer Graphics Technology Group, PUC-Rio, Brazil
- * http://www.tecgraf.puc-rio.br/cd	
- * mailto:cd@tecgraf.puc-rio.br
- *
- * See Copyright Notice at the end of this file
- */
- 
-#ifndef __CD_H
-#define __CD_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#define CD_NAME "CD - Canvas Draw"
-#define CD_DESCRIPTION "A 2D Graphics Library"
-#define CD_COPYRIGHT    "Copyright (C) 1994-2008 Tecgraf, PUC-Rio."
-#define CD_VERSION "5.1.0"
-#define CD_VERSION_DATE "2008/10/14"
-#define CD_VERSION_NUMBER 501000
-
-typedef struct _cdContext cdContext;
-typedef struct _cdCanvas cdCanvas;
-typedef struct _cdCanvas cdState;
-typedef struct _cdImage cdImage;
-
-/* client images using bitmap structure */
-typedef struct _cdBitmap {
-  int w;
-  int h;
-  int type;
-  void *data;
-} cdBitmap;
-
-
-/* library */
-char*         cdVersion(void);
-char*         cdVersionDate(void);
-int           cdVersionNumber(void);
-
-/* canvas init */
-cdCanvas*   cdCreateCanvas(cdContext *context, void *data);
-cdCanvas*   cdCreateCanvasf(cdContext *context, const char* format, ...);
-void        cdKillCanvas(cdCanvas* canvas);
-
-cdContext*  cdCanvasGetContext(cdCanvas* canvas);
-int         cdCanvasActivate(cdCanvas* canvas);
-void        cdCanvasDeactivate(cdCanvas* canvas);
-int         cdUseContextPlus(int use);
-void        cdInitContextPlus(void);   /* need an external library */
-
-/* context */
-typedef int (*cdCallback)(cdCanvas* canvas, ...);
-int cdContextRegisterCallback(cdContext *context, int cb, cdCallback func);
-unsigned long cdContextCaps(cdContext *context);
-
-/* control */
-int      cdCanvasSimulate(cdCanvas* canvas, int mode);
-void     cdCanvasFlush(cdCanvas* canvas);
-void     cdCanvasClear(cdCanvas* canvas);
-cdState* cdCanvasSaveState(cdCanvas* canvas);
-void     cdCanvasRestoreState(cdCanvas* canvas, cdState* state);
-void     cdReleaseState(cdState* state);
-void     cdCanvasSetAttribute(cdCanvas* canvas, const char* name, char* data);
-void     cdCanvasSetfAttribute(cdCanvas* canvas, const char* name, const char* format, ...);
-char*    cdCanvasGetAttribute(cdCanvas* canvas, const char* name);
-
-/* interpretation */
-int  cdCanvasPlay(cdCanvas* canvas, cdContext *context, int xmin, int xmax, int ymin, int ymax, void *data);
-
-/* coordinate transformation */
-void cdCanvasGetSize(cdCanvas* canvas, int *width, int *height, double *width_mm, double *height_mm);
-int cdCanvasUpdateYAxis(cdCanvas* canvas, int* y);
-double cdfCanvasUpdateYAxis(cdCanvas* canvas, double* y);
-int cdCanvasInvertYAxis(cdCanvas* canvas, int y);
-double cdfCanvasInvertYAxis(cdCanvas* canvas, double y);
-void cdCanvasMM2Pixel(cdCanvas* canvas, double mm_dx, double mm_dy, int *dx, int *dy);
-void cdCanvasPixel2MM(cdCanvas* canvas, int dx, int dy, double *mm_dx, double *mm_dy);
-void cdfCanvasMM2Pixel(cdCanvas* canvas, double mm_dx, double mm_dy, double *dx, double *dy);
-void cdfCanvasPixel2MM(cdCanvas* canvas, double dx, double dy, double *mm_dx, double *mm_dy);
-void cdCanvasOrigin(cdCanvas* canvas, int x, int y);
-void cdfCanvasOrigin(cdCanvas* canvas, double x, double y);
-void cdCanvasGetOrigin(cdCanvas* canvas, int *x, int *y);
-void cdfCanvasGetOrigin(cdCanvas* canvas, double *x, double *y);
-void cdCanvasTransform(cdCanvas* canvas, const double* matrix);
-double* cdCanvasGetTransform(cdCanvas* canvas);
-void cdCanvasTransformMultiply(cdCanvas* canvas, const double* matrix);
-void cdCanvasTransformRotate(cdCanvas* canvas, double angle);
-void cdCanvasTransformScale(cdCanvas* canvas, double sx, double sy);
-void cdCanvasTransformTranslate(cdCanvas* canvas, double dx, double dy);
-void cdCanvasTransformPoint(cdCanvas* canvas, int x, int y, int *tx, int *ty);
-void cdfCanvasTransformPoint(cdCanvas* canvas, double x, double y, double *tx, double *ty);
-
-/* clipping */
-int  cdCanvasClip(cdCanvas* canvas, int mode);
-void cdCanvasClipArea(cdCanvas* canvas, int xmin, int xmax, int ymin, int ymax);
-int  cdCanvasGetClipArea(cdCanvas* canvas, int *xmin, int *xmax, int *ymin, int *ymax);
-void cdfCanvasClipArea(cdCanvas* canvas, double xmin, double xmax, double ymin, double ymax);
-int  cdfCanvasGetClipArea(cdCanvas* canvas, double *xmin, double *xmax, double *ymin, double *ymax);
-
-/* clipping region */
-int  cdCanvasIsPointInRegion(cdCanvas* canvas, int x, int y);
-void cdCanvasOffsetRegion(cdCanvas* canvas, int x, int y);
-void cdCanvasGetRegionBox(cdCanvas* canvas, int *xmin, int *xmax, int *ymin, int *ymax);
-int  cdCanvasRegionCombineMode(cdCanvas* canvas, int mode);
-
-/* primitives */
-void cdCanvasPixel(cdCanvas* canvas, int x, int y, long color);
-void cdCanvasMark(cdCanvas* canvas, int x, int y);
-
-void cdCanvasLine(cdCanvas* canvas, int x1, int y1, int x2, int y2);
-void cdCanvasBegin(cdCanvas* canvas, int mode);
-void cdCanvasVertex(cdCanvas* canvas, int x, int y);
-void cdCanvasEnd(cdCanvas* canvas);
-void cdCanvasRect(cdCanvas* canvas, int xmin, int xmax, int ymin, int ymax);
-void cdCanvasBox(cdCanvas* canvas, int xmin, int xmax, int ymin, int ymax);
-void cdCanvasArc(cdCanvas* canvas, int xc, int yc, int w, int h, double angle1, double angle2);
-void cdCanvasSector(cdCanvas* canvas, int xc, int yc, int w, int h, double angle1, double angle2);
-void cdCanvasChord(cdCanvas* canvas, int xc, int yc, int w, int h, double angle1, double angle2);
-void cdCanvasText(cdCanvas* canvas, int x, int y, const char* s);
-
-void cdfCanvasLine(cdCanvas* canvas, double x1, double y1, double x2, double y2);
-void cdfCanvasVertex(cdCanvas* canvas, double x, double y);
-void cdfCanvasRect(cdCanvas* canvas, double xmin, double xmax, double ymin, double ymax);
-void cdfCanvasBox(cdCanvas* canvas, double xmin, double xmax, double ymin, double ymax);
-void cdfCanvasArc(cdCanvas* canvas, double xc, double yc, double w, double h, double angle1, double angle2);
-void cdfCanvasSector(cdCanvas* canvas, double xc, double yc, double w, double h, double angle1, double angle2);
-void cdfCanvasChord(cdCanvas* canvas, double xc, double yc, double w, double h, double angle1, double angle2);
-void cdfCanvasText(cdCanvas* canvas, double x, double y, const char* s);
-
-/* attributes */
-void cdCanvasSetBackground(cdCanvas* canvas, long color);
-void cdCanvasSetForeground(cdCanvas* canvas, long color);
-long cdCanvasBackground(cdCanvas* canvas, long color);
-long cdCanvasForeground(cdCanvas* canvas, long color);
-int  cdCanvasBackOpacity(cdCanvas* canvas, int opacity);
-int  cdCanvasWriteMode(cdCanvas* canvas, int mode);
-int  cdCanvasLineStyle(cdCanvas* canvas, int style);
-void cdCanvasLineStyleDashes(cdCanvas* canvas, const int* dashes, int count);
-int  cdCanvasLineWidth(cdCanvas* canvas, int width);
-int  cdCanvasLineJoin(cdCanvas* canvas, int join);
-int  cdCanvasLineCap(cdCanvas* canvas, int cap);
-int  cdCanvasInteriorStyle(cdCanvas* canvas, int style);
-int  cdCanvasHatch(cdCanvas* canvas, int style);
-void cdCanvasStipple(cdCanvas* canvas, int w, int h, const unsigned char* stipple);
-unsigned char* cdCanvasGetStipple(cdCanvas* canvas, int *n, int *m);
-void   cdCanvasPattern(cdCanvas* canvas, int w, int h, long const int *pattern);
-long*  cdCanvasGetPattern(cdCanvas* canvas, int* n, int* m);
-int    cdCanvasFillMode(cdCanvas* canvas, int mode);
-int   cdCanvasFont(cdCanvas* canvas, const char* type_face, int style, int size);
-void   cdCanvasGetFont(cdCanvas* canvas, char *type_face, int *style, int *size);
-char*  cdCanvasNativeFont(cdCanvas* canvas, const char* font);
-int    cdCanvasTextAlignment(cdCanvas* canvas, int alignment);
-double cdCanvasTextOrientation(cdCanvas* canvas, double angle);
-int    cdCanvasMarkType(cdCanvas* canvas, int type);
-int    cdCanvasMarkSize(cdCanvas* canvas, int size);
-
-/* vector text */
-void cdCanvasVectorText(cdCanvas* canvas, int x, int y, const char* s);
-void cdCanvasMultiLineVectorText(cdCanvas* canvas, int x, int y, const char* s);
-
-/* vector text attributes */
-char *cdCanvasVectorFont(cdCanvas* canvas, const char *filename);
-void cdCanvasVectorTextDirection(cdCanvas* canvas, int x1, int y1, int x2, int y2);
-double* cdCanvasVectorTextTransform(cdCanvas* canvas, const double* matrix);
-void cdCanvasVectorTextSize(cdCanvas* canvas, int size_x, int size_y, const char* s);
-int  cdCanvasVectorCharSize(cdCanvas* canvas, int size);
-
-/* vector text properties */
-void cdCanvasGetVectorTextSize(cdCanvas* canvas, const char* s, int *x, int *y);
-void cdCanvasGetVectorTextBounds(cdCanvas* canvas, const char* s, int x, int y, int *rect);
-
-/* properties */
-void cdCanvasGetFontDim(cdCanvas* canvas, int *max_width, int *height, int *ascent, int *descent);
-void cdCanvasGetTextSize(cdCanvas* canvas, const char* s, int *width, int *height);
-void cdCanvasGetTextBox(cdCanvas* canvas, int x, int y, const char* s, int *xmin, int *xmax, int *ymin, int *ymax);
-void cdCanvasGetTextBounds(cdCanvas* canvas, int x, int y, const char* s, int *rect);
-int  cdCanvasGetColorPlanes(cdCanvas* canvas);
-
-/* color */
-void cdCanvasPalette(cdCanvas* canvas, int n, const long *palette, int mode);
-
-/* client images */
-void cdCanvasGetImageRGB(cdCanvas* canvas, unsigned char* r, unsigned char* g, unsigned char* b, int x, int y, int w, int h);
-void cdCanvasPutImageRectRGB(cdCanvas* canvas, int iw, int ih, const unsigned char* r, const unsigned char* g, const unsigned char* b, int x, int y, int w, int h, int xmin, int xmax, int ymin, int ymax);
-void cdCanvasPutImageRectRGBA(cdCanvas* canvas, int iw, int ih, const unsigned char* r, const unsigned char* g, const unsigned char* b, const unsigned char* a, int x, int y, int w, int h, int xmin, int xmax, int ymin, int ymax);
-void cdCanvasPutImageRectMap(cdCanvas* canvas, int iw, int ih, const unsigned char* index, const long* colors, int x, int y, int w, int h, int xmin, int xmax, int ymin, int ymax);
-
-/* server images */
-cdImage* cdCanvasCreateImage(cdCanvas* canvas, int w, int h);
-void cdKillImage(cdImage* image);
-void cdCanvasGetImage(cdCanvas* canvas, cdImage* image, int x, int y);
-void cdCanvasPutImageRect(cdCanvas* canvas, cdImage* image, int x, int y, int xmin, int xmax, int ymin, int ymax);
-void cdCanvasScrollArea(cdCanvas* canvas, int xmin, int xmax, int ymin, int ymax, int dx, int dy);
-
-/* bitmap */
-cdBitmap* cdCreateBitmap(int w, int h, int type);
-cdBitmap* cdInitBitmap(int w, int h, int type, ...);
-void cdKillBitmap(cdBitmap* bitmap);
-unsigned char* cdBitmapGetData(cdBitmap* bitmap, int dataptr);
-void cdBitmapSetRect(cdBitmap* bitmap, int xmin, int xmax, int ymin, int ymax);
-void cdCanvasPutBitmap(cdCanvas* canvas, cdBitmap* bitmap, int x, int y, int w, int h);
-void cdCanvasGetBitmap(cdCanvas* canvas, cdBitmap* bitmap, int x, int y);
-void cdBitmapRGB2Map(cdBitmap* bitmap_rgb, cdBitmap* bitmap_map);
-
-/* color */
-long cdEncodeColor(unsigned char red, unsigned char green, unsigned char blue);
-void cdDecodeColor(long color, unsigned char* red, unsigned char* green, unsigned char* blue);
-unsigned char cdDecodeAlpha(long color);
-long cdEncodeAlpha(long color, unsigned char alpha);
-
-#define cdAlpha(_)    (unsigned char)(~(((_) >> 24) & 0xFF))
-#define cdReserved(_) (unsigned char)(((_) >> 24) & 0xFF)
-#define cdRed(_)      (unsigned char)(((_) >> 16) & 0xFF)
-#define cdGreen(_)    (unsigned char)(((_) >>  8) & 0xFF)
-#define cdBlue(_)     (unsigned char)(((_) >>  0) & 0xFF)
-
-/* client image color convertion */
-void cdRGB2Map(int width, int height, const unsigned char* red, const unsigned char* green, const unsigned char* blue, unsigned char* index, int pal_size, long *color);
-
-
-/* CD Values */
-
-#define CD_QUERY -1             /* query value */
-
-enum {                        /* bitmap type */
- CD_RGB,                      /* these definitions are compatible with the IM library */
- CD_MAP,
- CD_RGBA = 0x100 
-};
-
-enum {                         /* bitmap data */
- CD_IRED,
- CD_IGREEN,
- CD_IBLUE,
- CD_IALPHA,
- CD_INDEX,
- CD_COLORS
-};
-
-enum {                          /* status report */
- CD_ERROR = -1,
- CD_OK    =  0
-};
-
-enum {                          /* clip mode */
- CD_CLIPOFF,
- CD_CLIPAREA,
- CD_CLIPPOLYGON,
- CD_CLIPREGION
-};
-
-enum {                          /* region combine mode */
- CD_UNION,
- CD_INTERSECT,
- CD_DIFFERENCE,
- CD_NOTINTERSECT
-};
-
-enum {                          /* polygon mode (begin...end) */
- CD_FILL,
- CD_OPEN_LINES,
- CD_CLOSED_LINES,
- CD_CLIP,
- CD_BEZIER,
- CD_REGION
-};
-
-#define CD_POLYCUSTOM 10
-
-enum {                          /* fill mode */
- CD_EVENODD,
- CD_WINDING
-};
-
-enum {                          /* line join  */
- CD_MITER,
- CD_BEVEL,
- CD_ROUND
-};  
-
-enum {                          /* line cap  */
- CD_CAPFLAT,  
- CD_CAPSQUARE,
- CD_CAPROUND
-};  
-
-enum {                          /* background opacity mode */
- CD_OPAQUE,
- CD_TRANSPARENT
-};
-
-enum {                          /* write mode */
- CD_REPLACE,
- CD_XOR,
- CD_NOT_XOR
-};
-
-enum {                          /* color allocation mode (palette) */
- CD_POLITE,
- CD_FORCE
-};
-
-enum {                          /* line style */
- CD_CONTINUOUS,
- CD_DASHED,
- CD_DOTTED,
- CD_DASH_DOT,
- CD_DASH_DOT_DOT,
- CD_CUSTOM
-};
-
-enum {                          /* marker type */
- CD_PLUS,
- CD_STAR,
- CD_CIRCLE,
- CD_X,
- CD_BOX,
- CD_DIAMOND,
- CD_HOLLOW_CIRCLE,
- CD_HOLLOW_BOX,
- CD_HOLLOW_DIAMOND
-};
-
-enum {                          /* hatch type */
- CD_HORIZONTAL,
- CD_VERTICAL,
- CD_FDIAGONAL,
- CD_BDIAGONAL,
- CD_CROSS,
- CD_DIAGCROSS
-};
-
-enum {                          /* interior style */
- CD_SOLID,
- CD_HATCH,
- CD_STIPPLE,
- CD_PATTERN,
- CD_HOLLOW
-};
-
-enum {                          /* text alignment */
- CD_NORTH,
- CD_SOUTH,
- CD_EAST,
- CD_WEST,
- CD_NORTH_EAST,
- CD_NORTH_WEST,
- CD_SOUTH_EAST,
- CD_SOUTH_WEST,
- CD_CENTER,
- CD_BASE_LEFT,
- CD_BASE_CENTER,
- CD_BASE_RIGHT
-};
-
-enum {                          /* style */
- CD_PLAIN  = 0,
- CD_BOLD   = 1,
- CD_ITALIC = 2,
- CD_UNDERLINE = 4,
- CD_STRIKEOUT = 8
-};
-
-#define CD_BOLD_ITALIC (CD_BOLD|CD_ITALIC)  /* compatibility name */
-
-enum {                          /* some font sizes */
- CD_SMALL    =  8,
- CD_STANDARD = 12,
- CD_LARGE    = 18
-};
-
-/* Canvas Capabilities */
-#define CD_CAP_NONE             0x00000000
-#define CD_CAP_FLUSH            0x00000001
-#define CD_CAP_CLEAR            0x00000002
-#define CD_CAP_PLAY             0x00000004
-#define CD_CAP_YAXIS            0x00000008
-#define CD_CAP_CLIPAREA         0x00000010
-#define CD_CAP_CLIPPOLY         0x00000020
-#define CD_CAP_REGION           0x00000040
-#define CD_CAP_RECT             0x00000080
-#define CD_CAP_CHORD            0x00000100
-#define CD_CAP_IMAGERGB         0x00000200
-#define CD_CAP_IMAGERGBA        0x00000400
-#define CD_CAP_IMAGEMAP         0x00000800
-#define CD_CAP_GETIMAGERGB      0x00001000
-#define CD_CAP_IMAGESRV         0x00002000
-#define CD_CAP_BACKGROUND       0x00004000
-#define CD_CAP_BACKOPACITY      0x00008000
-#define CD_CAP_WRITEMODE        0x00010000
-#define CD_CAP_LINESTYLE        0x00020000
-#define CD_CAP_LINEWITH         0x00040000
-#define CD_CAP_FPRIMTIVES       0x00080000
-#define CD_CAP_HATCH            0x00100000
-#define CD_CAP_STIPPLE          0x00200000
-#define CD_CAP_PATTERN          0x00400000
-#define CD_CAP_FONT             0x00800000
-#define CD_CAP_FONTDIM          0x01000000
-#define CD_CAP_TEXTSIZE         0x02000000
-#define CD_CAP_TEXTORIENTATION  0x04000000
-#define CD_CAP_PALETTE          0x08000000
-#define CD_CAP_LINECAP          0x10000000
-#define CD_CAP_LINEJOIN         0x20000000
-#define CD_CAP_ALL              0xFFFFFFFF
-
-/* cdPlay definitions */
-#define CD_SIZECB 0        /* size callback */
-typedef int(*cdSizeCB)(cdCanvas *canvas, int w, int h, double w_mm, double h_mm);
-#define CD_ABORT 1
-#define CD_CONTINUE 0
-
-/* simulation flags */
-#define CD_SIM_NONE         0x0000
-#define CD_SIM_LINE         0x0001
-#define CD_SIM_RECT         0x0002
-#define CD_SIM_BOX          0x0004
-#define CD_SIM_ARC          0x0008
-#define CD_SIM_SECTOR       0x0010
-#define CD_SIM_CHORD        0x0020
-#define CD_SIM_POLYLINE     0x0040
-#define CD_SIM_POLYGON      0x0080
-#define CD_SIM_TEXT         0x0100
-#define CD_SIM_ALL          0xFFFF
-
-#define CD_SIM_LINES (CD_SIM_LINE | CD_SIM_RECT | CD_SIM_ARC | CD_SIM_POLYLINE)
-#define CD_SIM_FILLS (CD_SIM_BOX | CD_SIM_SECTOR | CD_SIM_CHORD | CD_SIM_POLYGON)
-
-/* some predefined colors for convenience */
-#define  CD_RED           0xFF0000L   /* 255,  0,  0 */
-#define  CD_DARK_RED      0x800000L   /* 128,  0,  0 */
-#define  CD_GREEN         0x00FF00L   /*   0,255,  0 */
-#define  CD_DARK_GREEN    0x008000L   /*   0,128,  0 */
-#define  CD_BLUE          0x0000FFL   /*   0,  0,255 */
-#define  CD_DARK_BLUE     0x000080L   /*   0,  0,128 */
-
-#define  CD_YELLOW        0xFFFF00L   /* 255,255,  0 */
-#define  CD_DARK_YELLOW   0x808000L   /* 128,128,  0 */
-#define  CD_MAGENTA       0xFF00FFL   /* 255,  0,255 */
-#define  CD_DARK_MAGENTA  0x800080L   /* 128,  0,128 */
-#define  CD_CYAN          0x00FFFFL   /*   0,255,255 */
-#define  CD_DARK_CYAN     0x008080L   /*   0,128,128 */
-
-#define  CD_WHITE         0xFFFFFFL   /* 255,255,255 */
-#define  CD_BLACK         0x000000L   /*   0,  0,  0 */
-
-#define  CD_DARK_GRAY     0x808080L   /* 128,128,128 */
-#define  CD_GRAY          0xC0C0C0L   /* 192,192,192 */
-
-/* some usefull conversion factors */
-#define CD_MM2PT     2.834645669   /* milimeters to points (pt = CD_MM2PT * mm) */
-#define CD_RAD2DEG  57.295779513   /* radians to degrees (deg = CD_RAD2DEG * rad) */
-#define CD_DEG2RAD  0.01745329252  /* degrees to radians (rad = CD_DEG2RAD * deg) */
-
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#ifndef CD_NO_OLD_INTERFACE
-#include "cd_old.h"
-#endif
-
-
-/******************************************************************************
-Copyright (C) 1994-2008 Tecgraf, PUC-Rio.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-******************************************************************************/
-
-#endif /* ifndef CD_H */
-
+/** \file
+ * \brief User API
+ * CD - Canvas Draw
+ * Tecgraf: Computer Graphics Technology Group, PUC-Rio, Brazil
+ * http://www.tecgraf.puc-rio.br/cd	
+ * mailto:cd@tecgraf.puc-rio.br
+ *
+ * See Copyright Notice at the end of this file
+ */
+ 
+#ifndef __CD_H
+#define __CD_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#define CD_NAME "CD - Canvas Draw"
+#define CD_DESCRIPTION "A 2D Graphics Library"
+#define CD_COPYRIGHT    "Copyright (C) 1994-2008 Tecgraf, PUC-Rio."
+#define CD_VERSION "5.1"
+#define CD_VERSION_DATE "2008/10/14"
+#define CD_VERSION_NUMBER 501000
+
+typedef struct _cdContext cdContext;
+typedef struct _cdCanvas cdCanvas;
+typedef struct _cdCanvas cdState;
+typedef struct _cdImage cdImage;
+
+/* client images using bitmap structure */
+typedef struct _cdBitmap {
+  int w;
+  int h;
+  int type;
+  void *data;
+} cdBitmap;
+
+
+/* library */
+char*         cdVersion(void);
+char*         cdVersionDate(void);
+int           cdVersionNumber(void);
+
+/* canvas init */
+cdCanvas*   cdCreateCanvas(cdContext *context, void *data);
+cdCanvas*   cdCreateCanvasf(cdContext *context, const char* format, ...);
+void        cdKillCanvas(cdCanvas* canvas);
+
+cdContext*  cdCanvasGetContext(cdCanvas* canvas);
+int         cdCanvasActivate(cdCanvas* canvas);
+void        cdCanvasDeactivate(cdCanvas* canvas);
+int         cdUseContextPlus(int use);
+void        cdInitContextPlus(void);   /* need an external library */
+
+/* context */
+typedef int (*cdCallback)(cdCanvas* canvas, ...);
+int cdContextRegisterCallback(cdContext *context, int cb, cdCallback func);
+unsigned long cdContextCaps(cdContext *context);
+
+/* control */
+int      cdCanvasSimulate(cdCanvas* canvas, int mode);
+void     cdCanvasFlush(cdCanvas* canvas);
+void     cdCanvasClear(cdCanvas* canvas);
+cdState* cdCanvasSaveState(cdCanvas* canvas);
+void     cdCanvasRestoreState(cdCanvas* canvas, cdState* state);
+void     cdReleaseState(cdState* state);
+void     cdCanvasSetAttribute(cdCanvas* canvas, const char* name, char* data);
+void     cdCanvasSetfAttribute(cdCanvas* canvas, const char* name, const char* format, ...);
+char*    cdCanvasGetAttribute(cdCanvas* canvas, const char* name);
+
+/* interpretation */
+int  cdCanvasPlay(cdCanvas* canvas, cdContext *context, int xmin, int xmax, int ymin, int ymax, void *data);
+
+/* coordinate transformation */
+void cdCanvasGetSize(cdCanvas* canvas, int *width, int *height, double *width_mm, double *height_mm);
+int cdCanvasUpdateYAxis(cdCanvas* canvas, int* y);
+double cdfCanvasUpdateYAxis(cdCanvas* canvas, double* y);
+int cdCanvasInvertYAxis(cdCanvas* canvas, int y);
+double cdfCanvasInvertYAxis(cdCanvas* canvas, double y);
+void cdCanvasMM2Pixel(cdCanvas* canvas, double mm_dx, double mm_dy, int *dx, int *dy);
+void cdCanvasPixel2MM(cdCanvas* canvas, int dx, int dy, double *mm_dx, double *mm_dy);
+void cdfCanvasMM2Pixel(cdCanvas* canvas, double mm_dx, double mm_dy, double *dx, double *dy);
+void cdfCanvasPixel2MM(cdCanvas* canvas, double dx, double dy, double *mm_dx, double *mm_dy);
+void cdCanvasOrigin(cdCanvas* canvas, int x, int y);
+void cdfCanvasOrigin(cdCanvas* canvas, double x, double y);
+void cdCanvasGetOrigin(cdCanvas* canvas, int *x, int *y);
+void cdfCanvasGetOrigin(cdCanvas* canvas, double *x, double *y);
+void cdCanvasTransform(cdCanvas* canvas, const double* matrix);
+double* cdCanvasGetTransform(cdCanvas* canvas);
+void cdCanvasTransformMultiply(cdCanvas* canvas, const double* matrix);
+void cdCanvasTransformRotate(cdCanvas* canvas, double angle);
+void cdCanvasTransformScale(cdCanvas* canvas, double sx, double sy);
+void cdCanvasTransformTranslate(cdCanvas* canvas, double dx, double dy);
+void cdCanvasTransformPoint(cdCanvas* canvas, int x, int y, int *tx, int *ty);
+void cdfCanvasTransformPoint(cdCanvas* canvas, double x, double y, double *tx, double *ty);
+
+/* clipping */
+int  cdCanvasClip(cdCanvas* canvas, int mode);
+void cdCanvasClipArea(cdCanvas* canvas, int xmin, int xmax, int ymin, int ymax);
+int  cdCanvasGetClipArea(cdCanvas* canvas, int *xmin, int *xmax, int *ymin, int *ymax);
+void cdfCanvasClipArea(cdCanvas* canvas, double xmin, double xmax, double ymin, double ymax);
+int  cdfCanvasGetClipArea(cdCanvas* canvas, double *xmin, double *xmax, double *ymin, double *ymax);
+
+/* clipping region */
+int  cdCanvasIsPointInRegion(cdCanvas* canvas, int x, int y);
+void cdCanvasOffsetRegion(cdCanvas* canvas, int x, int y);
+void cdCanvasGetRegionBox(cdCanvas* canvas, int *xmin, int *xmax, int *ymin, int *ymax);
+int  cdCanvasRegionCombineMode(cdCanvas* canvas, int mode);
+
+/* primitives */
+void cdCanvasPixel(cdCanvas* canvas, int x, int y, long color);
+void cdCanvasMark(cdCanvas* canvas, int x, int y);
+
+void cdCanvasLine(cdCanvas* canvas, int x1, int y1, int x2, int y2);
+void cdCanvasBegin(cdCanvas* canvas, int mode);
+void cdCanvasVertex(cdCanvas* canvas, int x, int y);
+void cdCanvasEnd(cdCanvas* canvas);
+void cdCanvasRect(cdCanvas* canvas, int xmin, int xmax, int ymin, int ymax);
+void cdCanvasBox(cdCanvas* canvas, int xmin, int xmax, int ymin, int ymax);
+void cdCanvasArc(cdCanvas* canvas, int xc, int yc, int w, int h, double angle1, double angle2);
+void cdCanvasSector(cdCanvas* canvas, int xc, int yc, int w, int h, double angle1, double angle2);
+void cdCanvasChord(cdCanvas* canvas, int xc, int yc, int w, int h, double angle1, double angle2);
+void cdCanvasText(cdCanvas* canvas, int x, int y, const char* s);
+
+void cdfCanvasLine(cdCanvas* canvas, double x1, double y1, double x2, double y2);
+void cdfCanvasVertex(cdCanvas* canvas, double x, double y);
+void cdfCanvasRect(cdCanvas* canvas, double xmin, double xmax, double ymin, double ymax);
+void cdfCanvasBox(cdCanvas* canvas, double xmin, double xmax, double ymin, double ymax);
+void cdfCanvasArc(cdCanvas* canvas, double xc, double yc, double w, double h, double angle1, double angle2);
+void cdfCanvasSector(cdCanvas* canvas, double xc, double yc, double w, double h, double angle1, double angle2);
+void cdfCanvasChord(cdCanvas* canvas, double xc, double yc, double w, double h, double angle1, double angle2);
+void cdfCanvasText(cdCanvas* canvas, double x, double y, const char* s);
+
+/* attributes */
+void cdCanvasSetBackground(cdCanvas* canvas, long color);
+void cdCanvasSetForeground(cdCanvas* canvas, long color);
+long cdCanvasBackground(cdCanvas* canvas, long color);
+long cdCanvasForeground(cdCanvas* canvas, long color);
+int  cdCanvasBackOpacity(cdCanvas* canvas, int opacity);
+int  cdCanvasWriteMode(cdCanvas* canvas, int mode);
+int  cdCanvasLineStyle(cdCanvas* canvas, int style);
+void cdCanvasLineStyleDashes(cdCanvas* canvas, const int* dashes, int count);
+int  cdCanvasLineWidth(cdCanvas* canvas, int width);
+int  cdCanvasLineJoin(cdCanvas* canvas, int join);
+int  cdCanvasLineCap(cdCanvas* canvas, int cap);
+int  cdCanvasInteriorStyle(cdCanvas* canvas, int style);
+int  cdCanvasHatch(cdCanvas* canvas, int style);
+void cdCanvasStipple(cdCanvas* canvas, int w, int h, const unsigned char* stipple);
+unsigned char* cdCanvasGetStipple(cdCanvas* canvas, int *n, int *m);
+void   cdCanvasPattern(cdCanvas* canvas, int w, int h, long const int *pattern);
+long*  cdCanvasGetPattern(cdCanvas* canvas, int* n, int* m);
+int    cdCanvasFillMode(cdCanvas* canvas, int mode);
+int   cdCanvasFont(cdCanvas* canvas, const char* type_face, int style, int size);
+void   cdCanvasGetFont(cdCanvas* canvas, char *type_face, int *style, int *size);
+char*  cdCanvasNativeFont(cdCanvas* canvas, const char* font);
+int    cdCanvasTextAlignment(cdCanvas* canvas, int alignment);
+double cdCanvasTextOrientation(cdCanvas* canvas, double angle);
+int    cdCanvasMarkType(cdCanvas* canvas, int type);
+int    cdCanvasMarkSize(cdCanvas* canvas, int size);
+
+/* vector text */
+void cdCanvasVectorText(cdCanvas* canvas, int x, int y, const char* s);
+void cdCanvasMultiLineVectorText(cdCanvas* canvas, int x, int y, const char* s);
+
+/* vector text attributes */
+char *cdCanvasVectorFont(cdCanvas* canvas, const char *filename);
+void cdCanvasVectorTextDirection(cdCanvas* canvas, int x1, int y1, int x2, int y2);
+double* cdCanvasVectorTextTransform(cdCanvas* canvas, const double* matrix);
+void cdCanvasVectorTextSize(cdCanvas* canvas, int size_x, int size_y, const char* s);
+int  cdCanvasVectorCharSize(cdCanvas* canvas, int size);
+
+/* vector text properties */
+void cdCanvasGetVectorTextSize(cdCanvas* canvas, const char* s, int *x, int *y);
+void cdCanvasGetVectorTextBounds(cdCanvas* canvas, const char* s, int x, int y, int *rect);
+
+/* properties */
+void cdCanvasGetFontDim(cdCanvas* canvas, int *max_width, int *height, int *ascent, int *descent);
+void cdCanvasGetTextSize(cdCanvas* canvas, const char* s, int *width, int *height);
+void cdCanvasGetTextBox(cdCanvas* canvas, int x, int y, const char* s, int *xmin, int *xmax, int *ymin, int *ymax);
+void cdCanvasGetTextBounds(cdCanvas* canvas, int x, int y, const char* s, int *rect);
+int  cdCanvasGetColorPlanes(cdCanvas* canvas);
+
+/* color */
+void cdCanvasPalette(cdCanvas* canvas, int n, const long *palette, int mode);
+
+/* client images */
+void cdCanvasGetImageRGB(cdCanvas* canvas, unsigned char* r, unsigned char* g, unsigned char* b, int x, int y, int w, int h);
+void cdCanvasPutImageRectRGB(cdCanvas* canvas, int iw, int ih, const unsigned char* r, const unsigned char* g, const unsigned char* b, int x, int y, int w, int h, int xmin, int xmax, int ymin, int ymax);
+void cdCanvasPutImageRectRGBA(cdCanvas* canvas, int iw, int ih, const unsigned char* r, const unsigned char* g, const unsigned char* b, const unsigned char* a, int x, int y, int w, int h, int xmin, int xmax, int ymin, int ymax);
+void cdCanvasPutImageRectMap(cdCanvas* canvas, int iw, int ih, const unsigned char* index, const long* colors, int x, int y, int w, int h, int xmin, int xmax, int ymin, int ymax);
+
+/* server images */
+cdImage* cdCanvasCreateImage(cdCanvas* canvas, int w, int h);
+void cdKillImage(cdImage* image);
+void cdCanvasGetImage(cdCanvas* canvas, cdImage* image, int x, int y);
+void cdCanvasPutImageRect(cdCanvas* canvas, cdImage* image, int x, int y, int xmin, int xmax, int ymin, int ymax);
+void cdCanvasScrollArea(cdCanvas* canvas, int xmin, int xmax, int ymin, int ymax, int dx, int dy);
+
+/* bitmap */
+cdBitmap* cdCreateBitmap(int w, int h, int type);
+cdBitmap* cdInitBitmap(int w, int h, int type, ...);
+void cdKillBitmap(cdBitmap* bitmap);
+unsigned char* cdBitmapGetData(cdBitmap* bitmap, int dataptr);
+void cdBitmapSetRect(cdBitmap* bitmap, int xmin, int xmax, int ymin, int ymax);
+void cdCanvasPutBitmap(cdCanvas* canvas, cdBitmap* bitmap, int x, int y, int w, int h);
+void cdCanvasGetBitmap(cdCanvas* canvas, cdBitmap* bitmap, int x, int y);
+void cdBitmapRGB2Map(cdBitmap* bitmap_rgb, cdBitmap* bitmap_map);
+
+/* color */
+long cdEncodeColor(unsigned char red, unsigned char green, unsigned char blue);
+void cdDecodeColor(long color, unsigned char* red, unsigned char* green, unsigned char* blue);
+unsigned char cdDecodeAlpha(long color);
+long cdEncodeAlpha(long color, unsigned char alpha);
+
+#define cdAlpha(_)    (unsigned char)(~(((_) >> 24) & 0xFF))
+#define cdReserved(_) (unsigned char)(((_) >> 24) & 0xFF)
+#define cdRed(_)      (unsigned char)(((_) >> 16) & 0xFF)
+#define cdGreen(_)    (unsigned char)(((_) >>  8) & 0xFF)
+#define cdBlue(_)     (unsigned char)(((_) >>  0) & 0xFF)
+
+/* client image color convertion */
+void cdRGB2Map(int width, int height, const unsigned char* red, const unsigned char* green, const unsigned char* blue, unsigned char* index, int pal_size, long *color);
+
+
+/* CD Values */
+
+#define CD_QUERY -1             /* query value */
+
+enum {                        /* bitmap type */
+ CD_RGB,                      /* these definitions are compatible with the IM library */
+ CD_MAP,
+ CD_RGBA = 0x100 
+};
+
+enum {                         /* bitmap data */
+ CD_IRED,
+ CD_IGREEN,
+ CD_IBLUE,
+ CD_IALPHA,
+ CD_INDEX,
+ CD_COLORS
+};
+
+enum {                          /* status report */
+ CD_ERROR = -1,
+ CD_OK    =  0
+};
+
+enum {                          /* clip mode */
+ CD_CLIPOFF,
+ CD_CLIPAREA,
+ CD_CLIPPOLYGON,
+ CD_CLIPREGION
+};
+
+enum {                          /* region combine mode */
+ CD_UNION,
+ CD_INTERSECT,
+ CD_DIFFERENCE,
+ CD_NOTINTERSECT
+};
+
+enum {                          /* polygon mode (begin...end) */
+ CD_FILL,
+ CD_OPEN_LINES,
+ CD_CLOSED_LINES,
+ CD_CLIP,
+ CD_BEZIER,
+ CD_REGION
+};
+
+#define CD_POLYCUSTOM 10
+
+enum {                          /* fill mode */
+ CD_EVENODD,
+ CD_WINDING
+};
+
+enum {                          /* line join  */
+ CD_MITER,
+ CD_BEVEL,
+ CD_ROUND
+};  
+
+enum {                          /* line cap  */
+ CD_CAPFLAT,  
+ CD_CAPSQUARE,
+ CD_CAPROUND
+};  
+
+enum {                          /* background opacity mode */
+ CD_OPAQUE,
+ CD_TRANSPARENT
+};
+
+enum {                          /* write mode */
+ CD_REPLACE,
+ CD_XOR,
+ CD_NOT_XOR
+};
+
+enum {                          /* color allocation mode (palette) */
+ CD_POLITE,
+ CD_FORCE
+};
+
+enum {                          /* line style */
+ CD_CONTINUOUS,
+ CD_DASHED,
+ CD_DOTTED,
+ CD_DASH_DOT,
+ CD_DASH_DOT_DOT,
+ CD_CUSTOM
+};
+
+enum {                          /* marker type */
+ CD_PLUS,
+ CD_STAR,
+ CD_CIRCLE,
+ CD_X,
+ CD_BOX,
+ CD_DIAMOND,
+ CD_HOLLOW_CIRCLE,
+ CD_HOLLOW_BOX,
+ CD_HOLLOW_DIAMOND
+};
+
+enum {                          /* hatch type */
+ CD_HORIZONTAL,
+ CD_VERTICAL,
+ CD_FDIAGONAL,
+ CD_BDIAGONAL,
+ CD_CROSS,
+ CD_DIAGCROSS
+};
+
+enum {                          /* interior style */
+ CD_SOLID,
+ CD_HATCH,
+ CD_STIPPLE,
+ CD_PATTERN,
+ CD_HOLLOW
+};
+
+enum {                          /* text alignment */
+ CD_NORTH,
+ CD_SOUTH,
+ CD_EAST,
+ CD_WEST,
+ CD_NORTH_EAST,
+ CD_NORTH_WEST,
+ CD_SOUTH_EAST,
+ CD_SOUTH_WEST,
+ CD_CENTER,
+ CD_BASE_LEFT,
+ CD_BASE_CENTER,
+ CD_BASE_RIGHT
+};
+
+enum {                          /* style */
+ CD_PLAIN  = 0,
+ CD_BOLD   = 1,
+ CD_ITALIC = 2,
+ CD_UNDERLINE = 4,
+ CD_STRIKEOUT = 8
+};
+
+#define CD_BOLD_ITALIC (CD_BOLD|CD_ITALIC)  /* compatibility name */
+
+enum {                          /* some font sizes */
+ CD_SMALL    =  8,
+ CD_STANDARD = 12,
+ CD_LARGE    = 18
+};
+
+/* Canvas Capabilities */
+#define CD_CAP_NONE             0x00000000
+#define CD_CAP_FLUSH            0x00000001
+#define CD_CAP_CLEAR            0x00000002
+#define CD_CAP_PLAY             0x00000004
+#define CD_CAP_YAXIS            0x00000008
+#define CD_CAP_CLIPAREA         0x00000010
+#define CD_CAP_CLIPPOLY         0x00000020
+#define CD_CAP_REGION           0x00000040
+#define CD_CAP_RECT             0x00000080
+#define CD_CAP_CHORD            0x00000100
+#define CD_CAP_IMAGERGB         0x00000200
+#define CD_CAP_IMAGERGBA        0x00000400
+#define CD_CAP_IMAGEMAP         0x00000800
+#define CD_CAP_GETIMAGERGB      0x00001000
+#define CD_CAP_IMAGESRV         0x00002000
+#define CD_CAP_BACKGROUND       0x00004000
+#define CD_CAP_BACKOPACITY      0x00008000
+#define CD_CAP_WRITEMODE        0x00010000
+#define CD_CAP_LINESTYLE        0x00020000
+#define CD_CAP_LINEWITH         0x00040000
+#define CD_CAP_FPRIMTIVES       0x00080000
+#define CD_CAP_HATCH            0x00100000
+#define CD_CAP_STIPPLE          0x00200000
+#define CD_CAP_PATTERN          0x00400000
+#define CD_CAP_FONT             0x00800000
+#define CD_CAP_FONTDIM          0x01000000
+#define CD_CAP_TEXTSIZE         0x02000000
+#define CD_CAP_TEXTORIENTATION  0x04000000
+#define CD_CAP_PALETTE          0x08000000
+#define CD_CAP_LINECAP          0x10000000
+#define CD_CAP_LINEJOIN         0x20000000
+#define CD_CAP_ALL              0xFFFFFFFF
+
+/* cdPlay definitions */
+#define CD_SIZECB 0        /* size callback */
+typedef int(*cdSizeCB)(cdCanvas *canvas, int w, int h, double w_mm, double h_mm);
+#define CD_ABORT 1
+#define CD_CONTINUE 0
+
+/* simulation flags */
+#define CD_SIM_NONE         0x0000
+#define CD_SIM_LINE         0x0001
+#define CD_SIM_RECT         0x0002
+#define CD_SIM_BOX          0x0004
+#define CD_SIM_ARC          0x0008
+#define CD_SIM_SECTOR       0x0010
+#define CD_SIM_CHORD        0x0020
+#define CD_SIM_POLYLINE     0x0040
+#define CD_SIM_POLYGON      0x0080
+#define CD_SIM_TEXT         0x0100
+#define CD_SIM_ALL          0xFFFF
+
+#define CD_SIM_LINES (CD_SIM_LINE | CD_SIM_RECT | CD_SIM_ARC | CD_SIM_POLYLINE)
+#define CD_SIM_FILLS (CD_SIM_BOX | CD_SIM_SECTOR | CD_SIM_CHORD | CD_SIM_POLYGON)
+
+/* some predefined colors for convenience */
+#define  CD_RED           0xFF0000L   /* 255,  0,  0 */
+#define  CD_DARK_RED      0x800000L   /* 128,  0,  0 */
+#define  CD_GREEN         0x00FF00L   /*   0,255,  0 */
+#define  CD_DARK_GREEN    0x008000L   /*   0,128,  0 */
+#define  CD_BLUE          0x0000FFL   /*   0,  0,255 */
+#define  CD_DARK_BLUE     0x000080L   /*   0,  0,128 */
+
+#define  CD_YELLOW        0xFFFF00L   /* 255,255,  0 */
+#define  CD_DARK_YELLOW   0x808000L   /* 128,128,  0 */
+#define  CD_MAGENTA       0xFF00FFL   /* 255,  0,255 */
+#define  CD_DARK_MAGENTA  0x800080L   /* 128,  0,128 */
+#define  CD_CYAN          0x00FFFFL   /*   0,255,255 */
+#define  CD_DARK_CYAN     0x008080L   /*   0,128,128 */
+
+#define  CD_WHITE         0xFFFFFFL   /* 255,255,255 */
+#define  CD_BLACK         0x000000L   /*   0,  0,  0 */
+
+#define  CD_DARK_GRAY     0x808080L   /* 128,128,128 */
+#define  CD_GRAY          0xC0C0C0L   /* 192,192,192 */
+
+/* some usefull conversion factors */
+#define CD_MM2PT     2.834645669   /* milimeters to points (pt = CD_MM2PT * mm) */
+#define CD_RAD2DEG  57.295779513   /* radians to degrees (deg = CD_RAD2DEG * rad) */
+#define CD_DEG2RAD  0.01745329252  /* degrees to radians (rad = CD_DEG2RAD * deg) */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#ifndef CD_NO_OLD_INTERFACE
+#include "cd_old.h"
+#endif
+
+
+/******************************************************************************
+Copyright (C) 1994-2008 Tecgraf, PUC-Rio.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+******************************************************************************/
+
+#endif /* ifndef CD_H */
+