kc3-lang/ftgl

diff --git a/include/FTBBox.h b/include/FTBBox.h
index 3db2c4b..6202e41 100644
--- a/include/FTBBox.h
+++ b/include/FTBBox.h
@@ -26,8 +26,11 @@
 #ifndef __FTBBox__
 #define __FTBBox__
 
-#include "ftgl.h"
-#include "FTPoint.h"
+#include <ftgl.h>
+#include <FTPoint.h>
+
+#ifdef __cplusplus
+
 
 /**
  * FTBBox is a convenience class for handling bounding boxes.
@@ -158,5 +161,7 @@ class FTGL_EXPORT FTBBox
 
 };
 
+#endif //__cplusplus
+
 #endif  //  __FTBBox__
 
diff --git a/include/FTBitmapGlyph.h b/include/FTBitmapGlyph.h
index e2387f0..3c41b38 100644
--- a/include/FTBitmapGlyph.h
+++ b/include/FTBitmapGlyph.h
@@ -28,6 +28,9 @@
 
 #include <ftgl.h>
 
+#ifdef __cplusplus
+
+
 /**
  * FTBitmapGlyph is a specialisation of FTGlyph for creating bitmaps.
  *
@@ -54,5 +57,7 @@ class FTGL_EXPORT FTBitmapGlyph : public FTGlyph
         virtual ~FTBitmapGlyph();
 };
 
+#endif //__cplusplus
+
 #endif  //  __FTBitmapGlyph__
 
diff --git a/include/FTExtrdGlyph.h b/include/FTExtrdGlyph.h
index 50c6c0d..142f7b3 100644
--- a/include/FTExtrdGlyph.h
+++ b/include/FTExtrdGlyph.h
@@ -28,6 +28,9 @@
 
 #include <ftgl.h>
 
+#ifdef __cplusplus
+
+
 /**
  * FTExtrdGlyph is a specialisation of FTGlyph for creating tessellated
  * extruded polygon glyphs.
@@ -61,5 +64,7 @@ class FTGL_EXPORT FTExtrdGlyph : public FTGlyph
         virtual ~FTExtrdGlyph();
 };
 
+#endif //__cplusplus
+
 #endif  //  __FTExtrdGlyph__
 
diff --git a/include/FTGlyph.h b/include/FTGlyph.h
index 6a443de..a1716bf 100644
--- a/include/FTGlyph.h
+++ b/include/FTGlyph.h
@@ -28,6 +28,8 @@
 
 #include <ftgl.h>
 
+#ifdef __cplusplus
+
 class FTGlyphImpl;
 
 /**
@@ -85,5 +87,34 @@ class FTGL_EXPORT FTGlyph
         FTGlyphImpl *impl;
 };
 
+#endif //__cplusplus
+
+FTGL_BEGIN_C_DECLS
+
+FTGL_EXPORT FTGLglyph *ftglCreateBitmapGlyph(FT_GlyphSlot glyph);
+FTGL_EXPORT FTGLglyph *ftglCreateExtrdGlyph(FT_GlyphSlot glyph, float depth,
+                                float frontOutset, float backOutset,
+                                int useDisplayList);
+FTGL_EXPORT FTGLglyph *ftglCreateOutlineGlyph(FT_GlyphSlot glyph, float outset,
+                                  int useDisplayList);
+FTGL_EXPORT FTGLglyph *ftglCreatePixmapGlyph(FT_GlyphSlot glyph);
+FTGL_EXPORT FTGLglyph *ftglCreatePolyGlyph(FT_GlyphSlot glyph, float outset,
+                               int useDisplayList);
+FTGL_EXPORT FTGLglyph *ftglCreateTextureGlyph(FT_GlyphSlot glyph, int id,
+                                              int xOffset, int yOffset,
+                                              int width, int height);
+
+FTGL_EXPORT void ftglDestroyGlyph(FTGLglyph *g);
+
+FTGL_EXPORT void ftglGlyphRender(FTGLglyph *g, FTGL_DOUBLE penx,
+                                 FTGL_DOUBLE peny, int renderMode,
+                                 FTGL_DOUBLE *advancex, FTGL_DOUBLE *advancey);
+FTGL_EXPORT void ftglGlyphAdvance(FTGLglyph *g, FTGL_DOUBLE *advancex,
+                                  FTGL_DOUBLE *advancey);
+FTGL_EXPORT void ftglGlyphBBox(FTGLglyph *g, float *lx, float *ly, float *lz,
+                               float *ux, float *uy, float *uz);
+
+FTGL_END_C_DECLS
+
 #endif  //  __FTGlyph__
 
diff --git a/include/FTLayout.h b/include/FTLayout.h
index 11242b2..4dde6d6 100644
--- a/include/FTLayout.h
+++ b/include/FTLayout.h
@@ -91,7 +91,7 @@ FTGL_EXPORT float ftglLayoutGetLineLength  (FTGLlayout *);
 FTGL_EXPORT void                ftglLayoutSetAlignment   (FTGLlayout *, const FTGL::TextAlignment);
 FTGL_EXPORT FTGL::TextAlignment ftglLayoutGetAlignement  (FTGLlayout *);
 #else
-FTGL_EXPORT void                ftglLayoutSetAlignment   (FTGLlayout *, const TextAlignment);
+FTGL_EXPORT void                ftglLayoutSetAlignment   (FTGLlayout *, const int);
 FTGL_EXPORT int                 ftglLayoutGetAlignement  (FTGLlayout *);
 #endif
 
diff --git a/include/FTOutlineGlyph.h b/include/FTOutlineGlyph.h
index 1435996..1aad548 100644
--- a/include/FTOutlineGlyph.h
+++ b/include/FTOutlineGlyph.h
@@ -28,6 +28,9 @@
 
 #include <ftgl.h>
 
+#ifdef __cplusplus
+
+
 /**
  * FTOutlineGlyph is a specialisation of FTGlyph for creating outlines.
  *
@@ -57,5 +60,7 @@ class FTGL_EXPORT FTOutlineGlyph : public FTGlyph
         virtual ~FTOutlineGlyph();
 };
 
+#endif //__cplusplus
+
 #endif  // __FTOutlineGlyph__
 
diff --git a/include/FTPixmapGlyph.h b/include/FTPixmapGlyph.h
index 03f858e..86528da 100644
--- a/include/FTPixmapGlyph.h
+++ b/include/FTPixmapGlyph.h
@@ -28,6 +28,9 @@
 
 #include <ftgl.h>
 
+#ifdef __cplusplus
+
+
 /**
  * FTPixmapGlyph is a specialisation of FTGlyph for creating pixmaps.
  *
@@ -50,5 +53,7 @@ class  FTGL_EXPORT FTPixmapGlyph : public FTGlyph
         virtual ~FTPixmapGlyph();
 };
 
+#endif //__cplusplus
+
 #endif  //  __FTPixmapGlyph__
 
diff --git a/include/FTPoint.h b/include/FTPoint.h
index 4b86f3b..cb9d258 100644
--- a/include/FTPoint.h
+++ b/include/FTPoint.h
@@ -26,7 +26,10 @@
 #ifndef __FTPoint__
 #define __FTPoint__
 
-#include "ftgl.h"
+#include <ftgl.h>
+
+#ifdef __cplusplus
+
 
 /**
  * FTPoint class is a basic 3 dimensional point or vector.
@@ -221,5 +224,7 @@ class FTGL_EXPORT FTPoint
         FTGL_DOUBLE values[3];
 };
 
+#endif //__cplusplus
+
 #endif  //  __FTPoint__
 
diff --git a/include/FTPolyGlyph.h b/include/FTPolyGlyph.h
index 8732443..2d3e96a 100644
--- a/include/FTPolyGlyph.h
+++ b/include/FTPolyGlyph.h
@@ -28,6 +28,9 @@
 
 #include <ftgl.h>
 
+#ifdef __cplusplus
+
+
 /**
  * FTPolyGlyph is a specialisation of FTGlyph for creating tessellated
  * polygon glyphs.
@@ -58,5 +61,7 @@ class FTGL_EXPORT FTPolyGlyph : public FTGlyph
         virtual ~FTPolyGlyph();
 };
 
+#endif //__cplusplus
+
 #endif  //  __FTPolyGlyph__
 
diff --git a/include/FTSimpleLayout.h b/include/FTSimpleLayout.h
index 26fb6c1..6190f9b 100644
--- a/include/FTSimpleLayout.h
+++ b/include/FTSimpleLayout.h
@@ -123,7 +123,7 @@ class FTGL_EXPORT FTSimpleLayout : public FTLayout
 #endif //__cplusplus
 
 FTGL_BEGIN_C_DECLS
-    FTGL_EXPORT FTGLlayout *ftglCreateSimpleLayout();
+    FTGL_EXPORT FTGLlayout *ftglCreateSimpleLayout(void);
 FTGL_END_C_DECLS
 
 #endif  /* __FTSimpleLayout__ */
diff --git a/include/FTTextureGlyph.h b/include/FTTextureGlyph.h
index 6206513..c14bd96 100644
--- a/include/FTTextureGlyph.h
+++ b/include/FTTextureGlyph.h
@@ -28,6 +28,9 @@
 
 #include <ftgl.h>
 
+#ifdef __cplusplus
+
+
 /**
  * FTTextureGlyph is a specialisation of FTGlyph for creating texture
  * glyphs.
@@ -60,5 +63,7 @@ class FTGL_EXPORT FTTextureGlyph : public FTGlyph
         virtual ~FTTextureGlyph();
 };
 
+#endif //__cplusplus
+
 #endif  //  __FTTextureGlyph__
 
diff --git a/include/ftgl.h b/include/ftgl.h
index eba6ea5..0d558a0 100644
--- a/include/ftgl.h
+++ b/include/ftgl.h
@@ -47,6 +47,8 @@ typedef float    FTGL_FLOAT;
 
 FTGL_BEGIN_C_DECLS
 
+    struct _FTGLGlyph;
+    typedef struct _FTGLglyph FTGLglyph;
     struct _FTGLFont;
     typedef struct _FTGLfont FTGLfont;
     struct _FTGLlayout;
diff --git a/src/FTGlyph/FTGlyphGlue.cpp b/src/FTGlyph/FTGlyphGlue.cpp
index b74b528..d969c32 100644
--- a/src/FTGlyph/FTGlyphGlue.cpp
+++ b/src/FTGlyph/FTGlyphGlue.cpp
@@ -2,7 +2,7 @@
  * FTGL - OpenGL font library
  *
  * Copyright (c) 2001-2004 Henry Maddocks <ftgl@opengl.geek.nz>
- *               2008 Éric Beets <ericbeets@free.fr>
+ *               2008 Sam Hocevar <sam@zoy.org>
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -31,9 +31,150 @@
 
 FTGL_BEGIN_C_DECLS
 
-//
-//  C wrappers for FTGlyph
-//
+#define C_TOR(cname, cargs, cxxname, cxxarg, cxxtype) \
+    FTGLglyph* cname cargs \
+    { \
+        cxxname *g = new cxxname cxxarg; \
+        if(g->Error()) \
+        { \
+            delete g; \
+            return NULL; \
+        } \
+        FTGLglyph *ftgl = (FTGLglyph *)malloc(sizeof(FTGLglyph)); \
+        ftgl->ptr = g; \
+        ftgl->type = cxxtype; \
+        return ftgl; \
+    }
+
+// FTBitmapGlyph::FTBitmapGlyph();
+C_TOR(ftglCreateBitmapGlyph, (FT_GlyphSlot glyph),
+      FTBitmapGlyph, (glyph), GLYPH_BITMAP);
+
+// FTExtrdGlyph::FTExtrdGlyph();
+C_TOR(ftglCreateExtrdGlyph, (FT_GlyphSlot glyph, float depth, float frontOutset,
+                             float backOutset, int useDisplayList),
+      FTExtrdGlyph, (glyph, depth, frontOutset, backOutset, useDisplayList),
+      GLYPH_EXTRUDE);
+
+// FTOutlineGlyph::FTOutlineGlyph();
+C_TOR(ftglCreateOutlineGlyph, (FT_GlyphSlot glyph, float outset,
+                               int useDisplayList),
+      FTOutlineGlyph, (glyph, outset, useDisplayList), GLYPH_OUTLINE);
+
+// FTPixmapGlyph::FTPixmapGlyph();
+C_TOR(ftglCreatePixmapGlyph, (FT_GlyphSlot glyph),
+      FTPixmapGlyph, (glyph), GLYPH_PIXMAP);
+
+// FTPolyGlyph::FTPolyGlyph();
+C_TOR(ftglCreatePolyGlyph, (FT_GlyphSlot glyph, float outset,
+                            int useDisplayList),
+      FTPolyGlyph, (glyph, outset, useDisplayList), GLYPH_OUTLINE);
+
+// FTTextureGlyph::FTTextureGlyph();
+C_TOR(ftglCreateTextureGlyph, (FT_GlyphSlot glyph, int id, int xOffset,
+                               int yOffset, int width, int height),
+      FTTextureGlyph, (glyph, id, xOffset, yOffset, width, height),
+      GLYPH_TEXTURE);
+
+#define C_FUN(cret, cname, cargs, cxxerr, cxxname, cxxarg) \
+    cret cname cargs \
+    { \
+        if(!g || !g->ptr) \
+        { \
+            fprintf(stderr, "FTGL warning: NULL pointer in %s\n", #cname); \
+            cxxerr; \
+        } \
+        switch(g->type) \
+        { \
+            case FTGL::GLYPH_BITMAP: \
+                return dynamic_cast<FTBitmapGlyph*>(g->ptr)->cxxname cxxarg; \
+            case FTGL::GLYPH_EXTRUDE: \
+                return dynamic_cast<FTExtrdGlyph*>(g->ptr)->cxxname cxxarg; \
+            case FTGL::GLYPH_OUTLINE: \
+                return dynamic_cast<FTOutlineGlyph*>(g->ptr)->cxxname cxxarg; \
+            case FTGL::GLYPH_PIXMAP: \
+                return dynamic_cast<FTPixmapGlyph*>(g->ptr)->cxxname cxxarg; \
+            case FTGL::GLYPH_POLYGON: \
+                return dynamic_cast<FTPolyGlyph*>(g->ptr)->cxxname cxxarg; \
+            case FTGL::GLYPH_TEXTURE: \
+                return dynamic_cast<FTTextureGlyph*>(g->ptr)->cxxname cxxarg; \
+        } \
+        fprintf(stderr, "FTGL warning: %s not implemented for %d\n", #cname, g->type); \
+        cxxerr; \
+    }
+
+// FTGlyph::~FTGlyph();
+void ftglDestroyGlyph(FTGLglyph *g)
+{
+    if(!g || !g->ptr)
+    {
+        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __FUNCTION__);
+        return;
+    }
+    switch(g->type)
+    {
+        case FTGL::GLYPH_BITMAP:
+            delete dynamic_cast<FTBitmapGlyph*>(g->ptr); break;
+        case FTGL::GLYPH_EXTRUDE:
+            delete dynamic_cast<FTExtrdGlyph*>(g->ptr); break;
+        case FTGL::GLYPH_OUTLINE:
+            delete dynamic_cast<FTOutlineGlyph*>(g->ptr); break;
+        case FTGL::GLYPH_PIXMAP:
+            delete dynamic_cast<FTPixmapGlyph*>(g->ptr); break;
+        case FTGL::GLYPH_POLYGON:
+            delete dynamic_cast<FTPolyGlyph*>(g->ptr); break;
+        case FTGL::GLYPH_TEXTURE:
+            delete dynamic_cast<FTTextureGlyph*>(g->ptr); break;
+        default:
+            fprintf(stderr, "FTGL warning: %s not implemented for %d\n",
+                            __FUNCTION__, g->type);
+            break;
+    }
+
+    g->ptr = NULL;
+}
+
+// const FTPoint& FTGlyph::Render(const FTPoint& pen, int renderMode);
+C_FUN(static const FTPoint&, _ftglGlyphRender, (FTGLglyph *g,
+                                   const FTPoint& pen, int renderMode),
+      return *(new FTPoint()), Render, (pen, renderMode));
+
+void ftglGlyphRender(FTGLglyph *g, FTGL_DOUBLE penx, FTGL_DOUBLE peny,
+                     int renderMode, FTGL_DOUBLE *advancex,
+                     FTGL_DOUBLE *advancey)
+{
+    FTPoint pen(penx, peny);
+    FTPoint ret = _ftglGlyphRender(g, pen, renderMode);
+    *advancex = ret.X();
+    *advancey = ret.Y();
+}
+
+// const FTPoint& FTGlyph::Advance() const;
+C_FUN(static const FTPoint&, _ftglGlyphAdvance, (FTGLglyph *g),
+      return *(new FTPoint()), Advance, ());
+
+void ftglGlyphAdvance(FTGLglyph *g, FTGL_DOUBLE *advancex,
+                      FTGL_DOUBLE *advancey)
+{
+    FTPoint ret = _ftglGlyphAdvance(g);
+    *advancex = ret.X();
+    *advancey = ret.Y();
+}
+
+// const FTBBox& FTGlyph::BBox() const;
+C_FUN(static const FTBBox&, _ftglGlyphBBox, (FTGLglyph *g),
+      return *(new FTBBox()), BBox, ());
+
+void ftglGlyphBBox(FTGLglyph *g, float *lx, float *ly, float *lz,
+                   float *ux, float *uy, float *uz)
+{
+    FTBBox ret = _ftglGlyphBBox(g);
+    *lx = ret.lowerX; *ly = ret.lowerY; *lz = ret.lowerZ;
+    *ux = ret.upperX; *uy = ret.upperY; *uz = ret.upperZ;
+}
+
+// FT_Error FTGlyph::Error() const;
+C_FUN(FT_Error, ftglGlyphError, (FTGLglyph *g), return -1, Error, ());
 
 FTGL_END_C_DECLS
 
diff --git a/src/FTInternals.h b/src/FTInternals.h
index dce6887..871056d 100644
--- a/src/FTInternals.h
+++ b/src/FTInternals.h
@@ -92,6 +92,22 @@ FTGL_BEGIN_C_DECLS
 
 typedef enum
 {
+    GLYPH_BITMAP,
+    GLYPH_PIXMAP,
+    GLYPH_OUTLINE,
+    GLYPH_POLYGON,
+    GLYPH_EXTRUDE,
+    GLYPH_TEXTURE,
+} GlyphType;
+
+struct _FTGLglyph
+{
+    FTGlyph *ptr;
+    FTGL::GlyphType type;
+};
+
+typedef enum
+{
     FONT_BITMAP,
     FONT_PIXMAP,
     FONT_OUTLINE,