kc3-lang/ftgl

diff --git a/demo/FTGLDemo.cpp b/demo/FTGLDemo.cpp
index 9f0bce3..db865cb 100644
--- a/demo/FTGLDemo.cpp
+++ b/demo/FTGLDemo.cpp
@@ -345,16 +345,16 @@ void renderFontInfo()
         // Output the alignment mode of the layout
         switch (((FTSimpleLayout *)layouts[currentLayout])->GetAlignment())
         {
-            case FTSimpleLayout::ALIGN_LEFT:
+            case FTGL::ALIGN_LEFT:
                 infoFont->Render("Align Left");
                 break;
-            case FTSimpleLayout::ALIGN_RIGHT:
+            case FTGL::ALIGN_RIGHT:
                 infoFont->Render("Align Right");
                 break;
-            case FTSimpleLayout::ALIGN_CENTER:
+            case FTGL::ALIGN_CENTER:
                 infoFont->Render("Align Center");
                 break;
-            case FTSimpleLayout::ALIGN_JUST:
+            case FTGL::ALIGN_JUSTIFY:
                 infoFont->Render("Align Justified");
                 break;
         }
@@ -512,17 +512,17 @@ void parsekey(unsigned char key, int x, int y)
             // Decrement the layout
             switch (simpleLayout->GetAlignment())
             {
-            case FTSimpleLayout::ALIGN_LEFT:
-                simpleLayout->SetAlignment(FTSimpleLayout::ALIGN_RIGHT);
+            case FTGL::ALIGN_LEFT:
+                simpleLayout->SetAlignment(FTGL::ALIGN_RIGHT);
                 break;
-            case FTSimpleLayout::ALIGN_RIGHT:
-                simpleLayout->SetAlignment(FTSimpleLayout::ALIGN_CENTER);
+            case FTGL::ALIGN_RIGHT:
+                simpleLayout->SetAlignment(FTGL::ALIGN_CENTER);
                 break;
-            case FTSimpleLayout::ALIGN_CENTER:
-                simpleLayout->SetAlignment(FTSimpleLayout::ALIGN_JUST);
+            case FTGL::ALIGN_CENTER:
+                simpleLayout->SetAlignment(FTGL::ALIGN_JUSTIFY);
                 break;
-            case FTSimpleLayout::ALIGN_JUST:
-                simpleLayout->SetAlignment(FTSimpleLayout::ALIGN_LEFT);
+            case FTGL::ALIGN_JUSTIFY:
+                simpleLayout->SetAlignment(FTGL::ALIGN_LEFT);
                 break;
             }
         }
diff --git a/demo/FTGLMFontDemo.cpp b/demo/FTGLMFontDemo.cpp
index 09a6eb5..4bceab9 100644
--- a/demo/FTGLMFontDemo.cpp
+++ b/demo/FTGLMFontDemo.cpp
@@ -368,16 +368,16 @@ void renderFontInfo()
         // Output the alignment mode of the layout
         switch (((FTSimpleLayout *)layouts[currentLayout])->GetAlignment())
         {
-            case FTSimpleLayout::ALIGN_LEFT:
+            case FTGL::ALIGN_LEFT:
                 infoFont->Render("Align Left");
                 break;
-            case FTSimpleLayout::ALIGN_RIGHT:
+            case FTGL::ALIGN_RIGHT:
                 infoFont->Render("Align Right");
                 break;
-            case FTSimpleLayout::ALIGN_CENTER:
+            case FTGL::ALIGN_CENTER:
                 infoFont->Render("Align Center");
                 break;
-            case FTSimpleLayout::ALIGN_JUST:
+            case FTGL::ALIGN_JUSTIFY:
                 infoFont->Render("Align Justified");
                 break;
         }
@@ -517,17 +517,17 @@ void parsekey(unsigned char key, int x, int y)
             // Decrement the layout
             switch (simpleLayout->GetAlignment())
             {
-            case FTSimpleLayout::ALIGN_LEFT:
-                simpleLayout->SetAlignment(FTSimpleLayout::ALIGN_RIGHT);
+            case FTGL::ALIGN_LEFT:
+                simpleLayout->SetAlignment(FTGL::ALIGN_RIGHT);
                 break;
-            case FTSimpleLayout::ALIGN_RIGHT:
-                simpleLayout->SetAlignment(FTSimpleLayout::ALIGN_CENTER);
+            case FTGL::ALIGN_RIGHT:
+                simpleLayout->SetAlignment(FTGL::ALIGN_CENTER);
                 break;
-            case FTSimpleLayout::ALIGN_CENTER:
-                simpleLayout->SetAlignment(FTSimpleLayout::ALIGN_JUST);
+            case FTGL::ALIGN_CENTER:
+                simpleLayout->SetAlignment(FTGL::ALIGN_JUSTIFY);
                 break;
-            case FTSimpleLayout::ALIGN_JUST:
-                simpleLayout->SetAlignment(FTSimpleLayout::ALIGN_LEFT);
+            case FTGL::ALIGN_JUSTIFY:
+                simpleLayout->SetAlignment(FTGL::ALIGN_LEFT);
                 break;
             }
         }
diff --git a/include/FTGL.h b/include/FTGL.h
index 88104c6..57f137e 100644
--- a/include/FTGL.h
+++ b/include/FTGL.h
@@ -39,7 +39,11 @@
 namespace FTGL
 {
     typedef enum{RENDER_FRONT = 0x01, RENDER_BACK = 0x02, RENDER_SIDE = 0x04}ftglRenderMode;
+    typedef enum{ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT, ALIGN_JUSTIFY} TextAlignment;
 }
+#else
+    typedef enum{RENDER_FRONT = 0x01, RENDER_BACK = 0x02, RENDER_SIDE = 0x04}ftglRenderMode;
+    typedef enum{ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT, ALIGN_JUSTIFY} TextAlignment;
 #endif
 
 typedef double   FTGL_DOUBLE;
diff --git a/include/FTInternals.h b/include/FTInternals.h
index ea748ac..ac0fc2d 100644
--- a/include/FTInternals.h
+++ b/include/FTInternals.h
@@ -41,6 +41,9 @@
 #include    "FTGLExtrdFont.h"
 #include    "FTGLTextureFont.h"
 
+#include    "FTLayout.h"
+#include    "FTSimpleLayout.h"
+
 #include    <stdlib.h>
 #include    <stdio.h>
 
@@ -96,6 +99,32 @@ static inline FTGLfont *createFTFont(ftglType type, const char *fontname)
     return ftgl;
 }
 
+typedef enum ftglLayoutType
+{
+    Simple,
+};
+
+struct FTGLlayout
+{
+    FTLayout *ptr;
+    FTGLfont *font;
+    ftglLayoutType type;
+};
+
+static inline FTGLlayout *createFTLayout(ftglLayoutType type)
+{
+    FTGLlayout *layout = (FTGLlayout*)malloc(sizeof(FTGLlayout));
+    layout->font = NULL;
+    layout->type = type;
+    switch(type)
+    {
+        case Simple:
+            layout->ptr = new FTSimpleLayout();
+            break;
+    }
+    return layout;
+}
+
 #ifdef __cplusplus
 }
 }
diff --git a/include/FTLayout.h b/include/FTLayout.h
index 3393b17..6940b2e 100644
--- a/include/FTLayout.h
+++ b/include/FTLayout.h
@@ -35,6 +35,8 @@
 #ifndef    __FTLayout__
 #define    __FTLayout__
 
+#ifdef __cplusplus
+
 #include "FTGL.h"
 #include "FTPoint.h"
 #include "FTFont.h"
@@ -160,5 +162,22 @@ class FTGL_EXPORT FTLayout
             { return(font->charSize); }
 };
 
+#endif //__cplusplus
+
+#ifdef __cplusplus
+extern "C" {
+namespace C {
+#endif
+
+typedef struct FTGLlayout FTGLlayout;
+
+FTGL_EXPORT void ftglDestroyLayout(FTGLlayout*);
+
+#ifdef __cplusplus
+}
+}
+#endif
+
 #endif  /* __FTLayout__ */
 
+
diff --git a/include/FTSimpleLayout.h b/include/FTSimpleLayout.h
index 0c79f41..f0a1d19 100644
--- a/include/FTSimpleLayout.h
+++ b/include/FTSimpleLayout.h
@@ -35,6 +35,8 @@
 #ifndef    __FTSimpleLayout__
 #define    __FTSimpleLayout__
 
+#ifdef __cplusplus
+
 #include "FTLayout.h"
 #include "FTBBox.h"
 
@@ -129,9 +131,6 @@ class FTGL_EXPORT FTSimpleLayout : public FTLayout
         void RenderSpace(const wchar_t *string, const float ExtraSpace = 0.0)
             { pen.X(0); pen.Y(0); RenderSpace(string, 0, -1, 0, ExtraSpace); }
 
-        typedef enum
-            { ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT, ALIGN_JUST } TextAlignment;
-
         /**
          * Set he font to use for rendering the text.
          *
@@ -166,12 +165,12 @@ class FTGL_EXPORT FTSimpleLayout : public FTLayout
          *
          * @param Alignment The new alignment mode.
          */
-        void SetAlignment(const TextAlignment Alignment)
+        void SetAlignment(const FTGL::TextAlignment Alignment)
             { alignment = Alignment; }
         /**
          * @return The text alignment mode.
          */
-        TextAlignment GetAlignment() const
+        FTGL::TextAlignment GetAlignment() const
             { return(alignment); }
 
         /**
@@ -317,7 +316,7 @@ class FTGL_EXPORT FTSimpleLayout : public FTLayout
          * The text alignment mode used to distribute
          * space within a line or rendered text.
          */
-        TextAlignment alignment;
+        FTGL::TextAlignment alignment;
 
         /**
          * The height of each line of text expressed as
@@ -349,5 +348,40 @@ class FTGL_EXPORT FTSimpleLayout : public FTLayout
                             const float RemainingWidth, FTBBox *bounds, int renderMode);
 };
 
+#endif //__cplusplus
+
+#ifdef __cplusplus
+extern "C" {
+namespace C {
+#endif
+
+FTGL_EXPORT void  ftglLayoutBBox           (FTGLlayout *, const char*, float []);
+
+FTGL_EXPORT void  ftglLayoutRender         (FTGLlayout *, const char*);
+FTGL_EXPORT void  ftglLayoutRenderMode     (FTGLlayout *, int);
+FTGL_EXPORT void  ftglLayoutRenderSpace    (FTGLlayout *, const float);
+
+FTGL_EXPORT void      ftglLayoutSetFont    (FTGLlayout *, FTGLfont*);
+FTGL_EXPORT FTGLfont* ftglLayoutGetFont    (FTGLlayout *);
+
+FTGL_EXPORT void  ftglLayoutSetLineLength  (FTGLlayout *, const float);
+FTGL_EXPORT float ftglLayoutGetLineLength  (FTGLlayout *);
+
+#ifdef __cplusplus
+FTGL_EXPORT void                ftglLayoutSetAlignment   (FTGLlayout *, const FTGL::TextAlignment);
+FTGL_EXPORT FTGL::TextAlignment ftglLayoutGetAlignement  (FTGLlayout *);
+#else
+FTGL_EXPORT void                ftglLayoutSetAlignment   (FTGLlayout *, const TextAlignment);
+FTGL_EXPORT TextAlignment       ftglLayoutGetAlignement  (FTGLlayout *);
+#endif
+
+FTGL_EXPORT void  ftglLayoutSetLineSpacing (FTGLlayout *, const float);
+FTGL_EXPORT float ftglLayoutGetLineSpacing (FTGLlayout *);
+
+#ifdef __cplusplus
+}
+}
+#endif
+
 #endif  /* __FTSimpleLayout__ */
 
diff --git a/src/FTGlue.cpp b/src/FTGlue.cpp
index ce5a038..906f56a 100644
--- a/src/FTGlue.cpp
+++ b/src/FTGlue.cpp
@@ -11,10 +11,10 @@
  * 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.
@@ -40,12 +40,16 @@
 namespace C
 {
 
+//
+//  C wrappers for FTFont
+//
+
 #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); \
+            fprintf(stderr, "FTGL warning: NULL pointer in %s\n", #cname); \
             cxxerr; \
         } \
         switch(f->type) \
@@ -63,7 +67,7 @@ namespace C
             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); \
+        fprintf(stderr, "FTGL warning: %s not implemented for %d\n", #cname, f->type); \
         cxxerr; \
     }
 
@@ -138,5 +142,100 @@ 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, ());
 
+#undef C_FUN
+
+//
+//  C wrappers for FTLayout
+//
+
+#define C_FUN(cret, cname, cargs, cxxerr, cxxname, cxxarg) \
+    cret cname cargs \
+    { \
+        if(!f || !f->ptr) \
+        { \
+            fprintf(stderr, "FTGL warning: NULL pointer in %s\n", #cname); \
+            cxxerr; \
+        } \
+        switch(f->type) \
+        { \
+            case Simple: \
+                return dynamic_cast<FTSimpleLayout*>(f->ptr)->cxxname cxxarg; \
+        } \
+        fprintf(stderr, "FTGL warning: %s not implemented for %d\n", #cname, f->type); \
+        cxxerr; \
+    }
+
+// FTLayout::~FTLayout();
+C_FUN(void, ftglDestroyLayout, (FTGLlayout *f), return, ~FTLayout, ());
+
+// virtual void BBox(const char* string, float& llx, float& lly, float& llz, float& urx, float& ury, float& urz)
+C_FUN(void, ftglLayoutBBox, (FTGLlayout *f, const char * s, float c[6]),
+      return, BBox, (s, c[0], c[1], c[2], c[3], c[4], c[5]));
+
+// virtual void Render(const char* string);
+C_FUN(void, ftglLayoutRender, (FTGLlayout *f, const char *s),
+      return, Render, (s));
+
+// virtual void Render(const char* string, int renderMode);
+C_FUN(void, ftglLayoutRenderMode, (FTGLlayout *f, const char *s, int r),
+      return, Render, (s, r));
+
+// void RenderSpace(const char *string, const float ExtraSpace = 0.0)
+C_FUN(void, ftglLayoutRenderSpace, (FTGLlayout *f, const char *s,
+        const float e), return, RenderSpace, (s, e));
+
+// void SetFont(FTFont *fontInit)
+void ftglLayoutSetFont(FTGLlayout *f, FTGLfont *font)
+{
+    if(!f || !f->ptr)
+    {
+        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __func__);
+        return;
+    }
+    switch(f->type)
+    {
+        case Simple:
+            f->font = font;
+            return dynamic_cast<FTSimpleLayout*>(f->ptr)->SetFont(font->ptr);
+    }
+    fprintf(stderr, "FTGL warning: %s not implemented for %d\n",
+                    __func__, f->type);
+}
+
+// FTFont *GetFont()
+FTGLfont *ftglLayoutGetFont(FTGLlayout *f)
+{
+    if(!f || !f->ptr)
+    {
+        fprintf(stderr, "FTGL warning: NULL pointer in %s\n", __func__);
+        return NULL;
+    }
+    return f->font;
+}
+
+// void SetLineLength(const float LineLength);
+C_FUN(void, ftglLayoutSetLineLength, (FTGLlayout *f, const float length),
+      return, SetLineLength, (length));
+
+// float GetLineLength() const
+C_FUN(float, ftglLayoutGetLineLength, (FTGLlayout *f),
+      return 0.0f, GetLineLength, ());
+
+// void SetAlignment(const TextAlignment Alignment)
+C_FUN(void, ftglLayoutSetAlignment, (FTGLlayout *f, FTGL::TextAlignment a),
+      return, SetAlignment, (a));
+
+// TextAlignment GetAlignment() const
+C_FUN(FTGL::TextAlignment, ftglLayoutGetAlignement, (FTGLlayout *f),
+      return FTGL::ALIGN_LEFT, GetAlignment, ());
+
+// void SetLineSpacing(const float LineSpacing)
+C_FUN(void, ftglLayoutSetLineSpacing, (FTGLlayout *f, const float l),
+      return, SetLineSpacing, (l));
+
+// float GetLineSpacing() const
+C_FUN(float, ftglLayoutGetLineSpacing, (FTGLlayout *f),
+      return 0.0f, GetLineSpacing, ());
+
 } // namespace C
 
diff --git a/src/FTSimpleLayout.cpp b/src/FTSimpleLayout.cpp
index 0217021..fe0007a 100644
--- a/src/FTSimpleLayout.cpp
+++ b/src/FTSimpleLayout.cpp
@@ -34,6 +34,8 @@
 
 #include "config.h"
 
+#include "FTInternals.h"
+
 #include <ctype.h>
 
 #include "FTInternals.h"
@@ -49,7 +51,7 @@ FTSimpleLayout::FTSimpleLayout()
 {
     currentFont = NULL;
     lineLength = 100.0f;
-    alignment = ALIGN_LEFT;
+    alignment = FTGL::ALIGN_LEFT;
     lineSpacing = 1.0f;
 }
 
@@ -215,11 +217,11 @@ inline void FTSimpleLayout::WrapTextI(const T *buf, int renderMode, FTBBox *boun
     float remainingWidth = lineLength - currentWidth;
     // Render any remaining text on the last line
     // Disable justification for the last row
-    if(alignment == ALIGN_JUST)
+    if(alignment == FTGL::ALIGN_JUSTIFY)
     {
-        alignment = ALIGN_LEFT;
+        alignment = FTGL::ALIGN_LEFT;
         OutputWrapped(buf, lineStart, -1, remainingWidth, bounds, renderMode);
-        alignment = ALIGN_JUST;
+        alignment = FTGL::ALIGN_JUSTIFY;
     }
     else
     {
@@ -250,16 +252,16 @@ inline void FTSimpleLayout::OutputWrappedI(const T *buf, const int start,
     // Align the text according as specified by Alignment
     switch (alignment)
     {
-        case ALIGN_LEFT:
+        case FTGL::ALIGN_LEFT:
             pen.X(0);
             break;
-        case ALIGN_CENTER:
+        case FTGL::ALIGN_CENTER:
             pen.X(RemainingWidth / 2);
             break;
-        case ALIGN_RIGHT:
+        case FTGL::ALIGN_RIGHT:
             pen.X(RemainingWidth);
             break;
-        case ALIGN_JUST:
+        case FTGL::ALIGN_JUSTIFY:
             pen.X(0);
             distributeWidth = RemainingWidth;
             break;
@@ -367,3 +369,12 @@ void FTSimpleLayout::RenderSpace(const wchar_t *string, const int start,
     RenderSpaceI(string, start, end, renderMode, ExtraSpace);
 }
 
+namespace C
+{
+    extern "C" FTGLlayout* ftglCreateSimpleLayout()
+    {
+        FTGLlayout *layout = createFTLayout(Simple);
+        return layout;
+    }
+}
+