kc3-lang/ftgl

diff --git a/include/FTFont.h b/include/FTFont.h
index bce8de6..be73d02 100644
--- a/include/FTFont.h
+++ b/include/FTFont.h
@@ -2,8 +2,11 @@
 #define    __FTFont__
 
 #include <ft2build.h>
+
 #include FT_FREETYPE_H
 
+#ifdef __cplusplus
+
 #include "FTFace.h"
 #include "FTGL.h"
 
@@ -271,6 +274,44 @@ class FTGL_EXPORT FTFont
         
 };
 
+#endif //__cplusplus
+
+#ifdef __cplusplus
+extern "C" {
+namespace C {
+#endif
+
+typedef struct FTGLfont FTGLfont;
+
+FTGL_EXPORT int ftglAttachFile (FTGLfont*, const char*);
+FTGL_EXPORT int ftglAttachData (FTGLfont*, const unsigned char *, size_t);
+
+FTGL_EXPORT int          ftglCharMap      (FTGLfont*, FT_Encoding);
+FTGL_EXPORT unsigned int ftglCharMapCount (FTGLfont*);
+FTGL_EXPORT FT_Encoding* CharMapList      (FTGLfont*);
+
+FTGL_EXPORT int          ftglSetFaceSize    (FTGLfont*, unsigned int );
+FTGL_EXPORT int          ftglSetFaceSizeRes (FTGLfont*,
+                                             unsigned int, unsigned int);
+FTGL_EXPORT unsigned int ftglGetFaceSize    (FTGLfont*);
+FTGL_EXPORT void         ftglSetDepth       (FTGLfont*, float);
+
+FTGL_EXPORT void ftglUseDisplayList (FTGLfont*, int);
+
+FTGL_EXPORT float ftglAscender   (FTGLfont*);
+FTGL_EXPORT float ftglDescender  (FTGLfont*);
+FTGL_EXPORT float ftglLineHeight (FTGLfont*);
+FTGL_EXPORT void  ftglBBox       (FTGLfont*, const char *, float[]);
+FTGL_EXPORT float ftglAdvance    (FTGLfont*, const char *);
+FTGL_EXPORT void  ftglRender     (FTGLfont*, const char *);
+
+FTGL_EXPORT FT_Error ftglError(FTGLfont*);
+
+#ifdef __cplusplus
+}
+}
+#endif
 
 #endif  //  __FTFont__
 
+
diff --git a/include/FTGLBitmapFont.h b/include/FTGLBitmapFont.h
index 3e6aa32..3f98b71 100644
--- a/include/FTGLBitmapFont.h
+++ b/include/FTGLBitmapFont.h
@@ -1,6 +1,8 @@
 #ifndef __FTGLBitmapFont__
 #define __FTGLBitmapFont__
 
+#ifdef __cplusplus
+
 #include "FTFont.h"
 #include "FTGL.h"
 
@@ -62,4 +64,17 @@ class FTGL_EXPORT FTGLBitmapFont : public FTFont
         inline virtual FTGlyph* MakeGlyph( unsigned int g);
                 
 };
+#endif //__cplusplus
+
+#ifdef __cplusplus
+extern "C" {
+namespace C {
+#endif
+FTGL_EXPORT FTGLfont *ftglBitmapFontMake(const char *fontname);
+#ifdef __cplusplus
+}
+}
+#endif
+
 #endif  //  __FTGLBitmapFont__
+
diff --git a/include/FTGLExtrdFont.h b/include/FTGLExtrdFont.h
index d234461..6804aac 100644
--- a/include/FTGLExtrdFont.h
+++ b/include/FTGLExtrdFont.h
@@ -1,9 +1,12 @@
 #ifndef __FTGLExtrdFont__
 #define __FTGLExtrdFont__
 
+#ifdef __cplusplus
+
 #include "FTFont.h"
 #include "FTGL.h"
 
+
 class FTGlyph;
 
 /**
@@ -58,6 +61,17 @@ class FTGL_EXPORT FTGLExtrdFont : public FTFont
         float depth;
 };
 
+#endif //__cplusplus
+
+#ifdef __cplusplus
+extern "C" {
+namespace C {
+#endif
+FTGL_EXPORT FTGLfont *ftglExtrdFontMake(const char *fontname);
+#ifdef __cplusplus
+}
+}
+#endif
 
 #endif	//	__FTGLExtrdFont__
 
diff --git a/include/FTGLOutlineFont.h b/include/FTGLOutlineFont.h
index fce7cf5..da6a7fd 100644
--- a/include/FTGLOutlineFont.h
+++ b/include/FTGLOutlineFont.h
@@ -1,6 +1,7 @@
 #ifndef     __FTGLOutlineFont__
 #define     __FTGLOutlineFont__
 
+#ifdef __cplusplus
 
 #include "FTFont.h"
 #include "FTGL.h"
@@ -61,4 +62,19 @@ class FTGL_EXPORT FTGLOutlineFont : public FTFont
         inline virtual FTGlyph* MakeGlyph( unsigned int g);
         
 };
+
+#endif //__cplusplus
+
+#ifdef __cplusplus
+namespace C {
+extern "C" {
+#endif
+
+FTGL_EXPORT FTGLfont *ftglOutlineFontMake(const char *fontname);
+
+#ifdef __cplusplus
+}
+}
+#endif
+
 #endif // __FTGLOutlineFont__
diff --git a/include/FTGLPixmapFont.h b/include/FTGLPixmapFont.h
index 053427b..f2e9b6e 100644
--- a/include/FTGLPixmapFont.h
+++ b/include/FTGLPixmapFont.h
@@ -1,6 +1,7 @@
 #ifndef     __FTGLPixmapFont__
 #define     __FTGLPixmapFont__
 
+#ifdef __cplusplus
 
 #include "FTFont.h"
 #include "FTGL.h"
@@ -63,6 +64,17 @@ class FTGL_EXPORT FTGLPixmapFont : public FTFont
         
 };
 
+#endif //__cplusplus
+
+#ifdef __cplusplus
+extern "C" {
+namespace C {
+#endif
+FTGL_EXPORT FTGLfont *ftglPixmapFontMake(const char *fontname);
+#ifdef __cplusplus
+}
+}
+#endif
 
 #endif  //  __FTGLPixmapFont__
 
diff --git a/include/FTGLPolygonFont.h b/include/FTGLPolygonFont.h
index 3a07de1..b6729ce 100644
--- a/include/FTGLPolygonFont.h
+++ b/include/FTGLPolygonFont.h
@@ -1,6 +1,7 @@
 #ifndef     __FTGLPolygonFont__
 #define     __FTGLPolygonFont__
 
+#ifdef __cplusplus
 
 #include "FTFont.h"
 #include "FTGL.h"
@@ -48,6 +49,17 @@ class FTGL_EXPORT FTGLPolygonFont : public FTFont
         
 };
 
+#endif //__cplusplus
+
+#ifdef __cplusplus
+extern "C" {
+namespace C {
+#endif
+FTGL_EXPORT FTGLfont *ftglPolygonFontMake(const char *fontname);
+#ifdef __cplusplus
+}
+}
+#endif
 
 #endif  //  __FTGLPolygonFont__
 
diff --git a/include/FTGLTextureFont.h b/include/FTGLTextureFont.h
index 7e97d6c..d5820aa 100644
--- a/include/FTGLTextureFont.h
+++ b/include/FTGLTextureFont.h
@@ -1,6 +1,8 @@
 #ifndef     __FTGLTextureFont__
 #define     __FTGLTextureFont__
 
+#ifdef __cplusplus
+
 #include "FTFont.h"
 #include "FTVector.h"
 #include "FTGL.h"
@@ -145,7 +147,19 @@ class  FTGL_EXPORT FTGLTextureFont : public FTFont
 
 };
 
+#endif //__cplusplus
+
+#ifdef __cplusplus
+extern "C" {
+namespace C {
+#endif
+FTGL_EXPORT FTGLfont *ftglTextureFontMake(const char *fontname);
+#ifdef __cplusplus
+}
+}
+#endif
 
 #endif // __FTGLTextureFont__
 
 
+
diff --git a/include/FTInternals.h b/include/FTInternals.h
new file mode 100644
index 0000000..6d55b36
--- /dev/null
+++ b/include/FTInternals.h
@@ -0,0 +1,69 @@
+#include    "FTFont.h"
+#include    "FTGLBitmapFont.h"
+#include    "FTGLPixmapFont.h"
+#include    "FTGLOutlineFont.h"
+#include    "FTGLPolygonFont.h"
+#include    "FTGLExtrdFont.h"
+#include    "FTGLTextureFont.h"
+#include    <stdlib.h>
+#include    <stdio.h>
+
+#ifndef __FTINTERNALS_H__
+#define __FTINTERNALS_H__
+
+#ifdef __cplusplus
+extern "C" {
+namespace C {
+#endif
+
+typedef enum ftglType
+{
+    Bitmap,
+    Pixmap,
+    Outline,
+    Polygon,
+    Extrude,
+    Texture,
+};
+
+struct FTGLfont
+{
+    FTFont *ptr;
+    ftglType type;
+};
+
+static inline FTGLfont *createFTFont(ftglType type, const char *fontname)
+{
+    FTGLfont *ftgl = (FTGLfont*)malloc(sizeof(FTGLfont));
+    ftgl->type = type;
+    switch(type)
+    {
+        case Bitmap:
+            ftgl->ptr = new FTGLBitmapFont(fontname);
+            break;
+        case Pixmap:
+            ftgl->ptr = new FTGLPixmapFont(fontname);
+            break;
+        case Outline:
+            ftgl->ptr = new FTGLOutlineFont(fontname);
+            break;
+        case Polygon:
+            ftgl->ptr = new FTGLPolygonFont(fontname);
+            break;
+        case Extrude:
+            ftgl->ptr = new FTGLExtrdFont(fontname);
+            break;
+        case Texture:
+            ftgl->ptr = new FTGLTextureFont(fontname);
+            break;
+    }
+    return ftgl;
+}
+
+#ifdef __cplusplus
+}
+}
+#endif
+
+#endif  //__FTINTERNALS_H__
+
diff --git a/src/FTGLBitmapFont.cpp b/src/FTGLBitmapFont.cpp
index ef3bb6b..05aa6b2 100644
--- a/src/FTGLBitmapFont.cpp
+++ b/src/FTGLBitmapFont.cpp
@@ -1,4 +1,5 @@
 #include "config.h"
+#include "FTInternals.h"
 
 #include "FTGLBitmapFont.h"
 #include "FTBitmapGlyph.h"
@@ -66,3 +67,17 @@ void FTGLBitmapFont::Render( const wchar_t* string)
     glPopClientAttrib();
 }
 
+#ifdef __cplusplus
+extern "C" {
+namespace C {
+#endif
+extern "C" FTGLfont* ftglBitmapFontMake(const char *fontname)
+{
+    FTGLfont *ftgl = createFTFont(Bitmap, fontname);
+    return ftgl;
+}
+#ifdef __cplusplus
+}
+}
+#endif
+
diff --git a/src/FTGLExtrdFont.cpp b/src/FTGLExtrdFont.cpp
index 4f264ff..dee644c 100644
--- a/src/FTGLExtrdFont.cpp
+++ b/src/FTGLExtrdFont.cpp
@@ -1,4 +1,5 @@
 #include "config.h"
+#include "FTInternals.h"
 
 #include "FTGLExtrdFont.h"
 #include "FTExtrdGlyph.h"
@@ -34,4 +35,17 @@ FTGlyph* FTGLExtrdFont::MakeGlyph( unsigned int glyphIndex)
     return NULL;
 }
 
+#ifdef __cplusplus
+extern "C" {
+namespace C {
+#endif
+extern "C" FTGLfont* ftglExtrdFontMake(const char *fontname)
+{
+    FTGLfont *ftgl = createFTFont(Extrude, fontname);
+    return ftgl;
+}
+#ifdef __cplusplus
+}
+}
+#endif
 
diff --git a/src/FTGLOutlineFont.cpp b/src/FTGLOutlineFont.cpp
index 714d38c..8fbb4da 100644
--- a/src/FTGLOutlineFont.cpp
+++ b/src/FTGLOutlineFont.cpp
@@ -1,4 +1,5 @@
 #include "config.h"
+#include    "FTInternals.h"
 
 #include "FTGLOutlineFont.h"
 #include "FTOutlineGlyph.h"
@@ -66,3 +67,16 @@ void FTGLOutlineFont::Render( const wchar_t* string)
     glPopAttrib();
 }
 
+#ifdef __cplusplus
+extern "C" {
+namespace C {
+#endif
+extern "C" FTGLfont* ftglOutlineFontMake(const char *fontname)
+{
+    FTGLfont *ftgl = createFTFont(Outline, fontname);
+    return ftgl;
+}
+#ifdef __cplusplus
+}
+}
+#endif
diff --git a/src/FTGLPixmapFont.cpp b/src/FTGLPixmapFont.cpp
index 135a0b2..f17bf51 100644
--- a/src/FTGLPixmapFont.cpp
+++ b/src/FTGLPixmapFont.cpp
@@ -1,4 +1,5 @@
 #include "config.h"
+#include "FTInternals.h"
 
 #include "FTGLPixmapFont.h"
 #include "FTPixmapGlyph.h"
@@ -82,4 +83,17 @@ void FTGLPixmapFont::Render( const wchar_t* string)
     glPopAttrib();
 }
 
+#ifdef __cplusplus
+extern "C" {
+namespace C {
+#endif
+extern "C" FTGLfont* ftglPixmapFontMake(const char *fontname)
+{
+    FTGLfont *ftgl = createFTFont(Pixmap, fontname);
+    return ftgl;
+}
+#ifdef __cplusplus
+}
+}
+#endif
 
diff --git a/src/FTGLPolygonFont.cpp b/src/FTGLPolygonFont.cpp
index 1246ba5..2863192 100644
--- a/src/FTGLPolygonFont.cpp
+++ b/src/FTGLPolygonFont.cpp
@@ -1,4 +1,5 @@
 #include "config.h"
+#include "FTInternals.h"
 
 #include "FTGLPolygonFont.h"
 #include "FTPolyGlyph.h"
@@ -32,4 +33,17 @@ FTGlyph* FTGLPolygonFont::MakeGlyph( unsigned int g)
     return NULL;
 }
 
+#ifdef __cplusplus
+extern "C" {
+namespace C {
+#endif
+extern "C" FTGLfont* ftglPolygonFontMake(const char *fontname)
+{
+    FTGLfont *ftgl = createFTFont(Polygon, fontname);
+    return ftgl;
+}
+#ifdef __cplusplus
+}
+}
+#endif
 
diff --git a/src/FTGLTextureFont.cpp b/src/FTGLTextureFont.cpp
index 3f180d4..9d4ac41 100644
--- a/src/FTGLTextureFont.cpp
+++ b/src/FTGLTextureFont.cpp
@@ -1,4 +1,5 @@
 #include "config.h"
+#include "FTInternals.h"
 
 #include <cassert>
 #include <string> // For memset
@@ -182,3 +183,17 @@ void FTGLTextureFont::Render( const wchar_t* string)
     glPopAttrib();
 }
 
+#ifdef __cplusplus
+extern "C" {
+namespace C {
+#endif
+extern "C" FTGLfont* ftglTextureFontMake(const char *fontname)
+{
+    FTGLfont *ftgl = createFTFont(Texture, fontname);
+    return ftgl;
+}
+#ifdef __cplusplus
+}
+}
+#endif
+
diff --git a/src/FTGlue.cpp b/src/FTGlue.cpp
new file mode 100644
index 0000000..7512033
--- /dev/null
+++ b/src/FTGlue.cpp
@@ -0,0 +1,103 @@
+#include "FTInternals.h"
+
+#ifdef __cplusplus
+extern "C" {
+namespace C {
+#endif
+
+#define C_FUN(cret, cname, cargs, cxxerr, cxxname, cxxarg) \
+    cret cname cargs \
+    { \
+        if(!f || !f->ptr) \
+        { \
+            fprintf(stderr, "FTGL Warning: NULL pointer .. %s\n", #cname); \
+            cxxerr; \
+        } \
+        switch(f->type) \
+        { \
+            case Bitmap: \
+                return dynamic_cast<FTGLBitmapFont*>(f->ptr)->cxxname cxxarg; \
+            case Extrude: \
+                return dynamic_cast<FTGLExtrdFont*>(f->ptr)->cxxname cxxarg; \
+            case Outline: \
+                return dynamic_cast<FTGLOutlineFont*>(f->ptr)->cxxname cxxarg; \
+            case Pixmap: \
+                return dynamic_cast<FTGLPixmapFont*>(f->ptr)->cxxname cxxarg; \
+            case Polygon: \
+                return dynamic_cast<FTGLPolygonFont*>(f->ptr)->cxxname cxxarg; \
+            case Texture: \
+                return dynamic_cast<FTGLTextureFont*>(f->ptr)->cxxname cxxarg; \
+        } \
+        fprintf(stderr, "FTGL Warning: Function not implemented yet .. %s for %d\n", #cname, f->type); \
+        cxxerr; \
+    }
+
+// bool FTFont::Attach(const char* fontFilePath);
+C_FUN(int, ftglAttachFile, (FTGLfont *f, const char* path),
+      return 0, Attach, (path));
+
+// bool FTFont::Attach(const unsigned char *pBufferBytes,
+//                     size_t bufferSizeInBytes);
+C_FUN(int, ftglAttachData, (FTGLfont *f, const unsigned char *p, size_t s),
+      return 0, Attach, (p, s));
+
+// bool FTFont::CharMap(FT_Encoding encoding);
+C_FUN(int, ftglCharMap, (FTGLfont *f, FT_Encoding enc),
+      return 0, CharMap, (enc));
+
+// unsigned int FTFont::CharMapCount();
+C_FUN(unsigned int, ftglCharMapCount, (FTGLfont *f),
+      return 0, CharMapCount, ());
+
+// FT_Encoding* FTFont::CharMapList();
+C_FUN(FT_Encoding *, ftglCharMapList, (FTGLfont* f),
+      return NULL, CharMapList, ());
+
+// virtual bool FTFont::FaceSize(const unsigned int size,
+//                               const unsigned int res = 72);
+C_FUN(int, ftglSetFaceSize, (FTGLfont *f, unsigned int s),
+      return 0, FaceSize, (s));
+C_FUN(int, ftglSetFaceSizeRes, (FTGLfont *f, unsigned int s, unsigned int r),
+      return 0, FaceSize, (s, r));
+
+// unsigned int FTFont::FaceSize() const;
+// XXX: need to call FaceSize() as FTFont::FaceSize() because of FTGLTexture
+C_FUN(unsigned int, ftglGetFaceSize, (FTGLfont *f),
+      return 0, FTFont::FaceSize, ());
+
+// virtual void FTFont::Depth(float depth);
+C_FUN(void, ftglSetDepth, (FTGLfont *f, float d), return, Depth, (d));
+
+// void FTFont::UseDisplayList(bool useList);
+C_FUN(void, ftglUseDisplayList, (FTGLfont *f, int l),
+      return, UseDisplayList, (l));
+
+// float FTFont::Ascender() const;
+C_FUN(float, ftglAscender, (FTGLfont *f), return 0.f, Ascender, ());
+
+// float FTFont::Descender() const;
+C_FUN(float, ftglDescender, (FTGLfont *f), return 0.f, Descender, ());
+
+// float FTFont::LineHeight() const;
+C_FUN(float, ftglLineHeight, (FTGLfont *f), return 0.f, LineHeight, ());
+
+// void FTFont::BBox(const char* string, float& llx, float& lly, float& llz,
+//                   float& urx, float& ury, float& urz);
+C_FUN(void, ftglBBox, (FTGLfont *f, const char* s, float c[6]),
+      return, BBox, (s, c[0], c[1], c[2], c[3], c[4], c[5]));
+
+// float FTFont::Advance(const char* string);
+C_FUN(float, ftglAdvance, (FTGLfont *f, const char* s),
+      return 0.f, Advance, (s));
+
+// virtual void FTFont::Render(const char* string);
+C_FUN(void, ftglRender, (FTGLfont *f, const char * s), return, Render, (s));
+
+// FT_Error FTFont::Error() const;
+C_FUN(FT_Error, ftglError, (FTGLfont *f), return -1, Error, ());
+
+#ifdef __cplusplus
+} // extern "C"
+} // namespace C
+#endif
+
diff --git a/src/Makefile.am b/src/Makefile.am
index e18633c..aa3308e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,6 +16,7 @@ libftgl_la_SOURCES = \
 	FTGLTextureFont.cpp \
 	FTGlyph.cpp \
 	FTGlyphContainer.cpp \
+	FTGlue.cpp \
 	FTLibrary.cpp \
 	FTOutlineGlyph.cpp \
 	FTPixmapGlyph.cpp \
@@ -59,3 +60,4 @@ ftgl_HEADERS = \
 	../include/FTVector.h \
 	../include/FTVectoriser.h
 
+