Changeset 1156

Timestamp:

09/30/06 20:56:23 (7 years ago)

Author:

jylam

Message:

• Updated C++ bindings to support every single cucul/caca functionnality. Renamed cpptest to cxxtext for consistency.

--This line, and those below, will be ignored--

M cxx/cucul++.cpp
A cxx/cxxtest.cpp
M cxx/cucul++.h
M cxx/Makefile.am

Location:

libcaca/trunk/cxx

Files:

• Makefile.am (modified) (1 diff)
• cucul++.cpp (modified) (7 diffs)
• cucul++.h (modified) (6 diffs)
• cxxtest.cpp (added)

libcaca/trunk/cxx/Makefile.am

@@ -17 +17 @@
 
 if USE_CXX
-noinst_PROGRAMS = cpptest
+noinst_PROGRAMS = cxxtest
 endif
 
-cpptest_SOURCES = cpptest.cpp
-cpptest_LDADD = libcaca++.la libcucul++.la ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
+cxxtest_SOURCES = cxxtest.cpp
+cxxtest_LDADD = libcaca++.la libcucul++.la ../caca/libcaca.la ../cucul/libcucul.la @CACA_LIBS@
 

libcaca/trunk/cxx/cucul++.cpp

@@ -24 +24 @@
 #include "cucul++.h"
 
+
+unsigned long int Charset::utf8ToUtf32(char const *s, unsigned int *read)
+{
+    return cucul_utf8_to_utf32(s, read);
+}
+unsigned int Charset::utf32ToUtf8(char *buf, unsigned long int ch)
+{
+    return cucul_utf32_to_utf8(buf, ch);
+}
+unsigned char Charset::utf32ToCp437(unsigned long int ch)
+{
+    return cucul_utf32_to_cp437(ch);
+}
+unsigned long int Charset::cp437ToUtf32(unsigned char ch)
+{
+    return cucul_cp437_to_utf32(ch);
+}
+
+
 Cucul::Cucul()
 {
@@ -39 +58 @@
 Cucul::Cucul(Buffer *b, char const *format)
 {
-    cv = cucul_import_canvas(b->get_buffer(), format);
+    cv = cucul_import_canvas(b->getBuffer(), format);
     if(!cv) throw -1;
 }
@@ -72 +91 @@
 {
     cucul_set_color(cv, f, b);
+}
+
+int  Cucul::setTruecolor(unsigned int f, unsigned int b)
+{
+    return cucul_set_truecolor(cv, f, b);
 }
 
@@ -212 +236 @@
 }
 
+unsigned long int Cucul::getColor(int x, int y)
+{
+    return cucul_get_color(cv, x, y);
+}
+
+int Cucul::setBoundaries(cucul_canvas_t *, int x, int y,
+                         unsigned int w, unsigned int h)
+{
+    return cucul_set_canvas_boundaries(cv, x, y, h, w);
+}
+
+unsigned int Cucul::getFrameCount()
+{
+    return cucul_get_canvas_frame_count(cv);
+}
+int Cucul::setFrame(unsigned int f)
+{
+    return cucul_set_canvas_frame(cv, f);
+}
+int Cucul::createFrame(unsigned int f)
+{
+    return cucul_create_canvas_frame(cv, f);
+}
+int Cucul::freeFrame(unsigned int f)
+{
+    return cucul_create_canvas_frame(cv, f);
+}
+
 Dither::Dither(unsigned int v1, unsigned int v2, unsigned int v3, unsigned int v4, unsigned int v5, unsigned int v6, unsigned int v7, unsigned int v8)
 {
@@ -317 +369 @@
 }
 
+unsigned long int const *Font::getBlocks()
+{
+    return cucul_get_font_blocks(font);
+}
+
 Font::~Font()
 {
@@ -322 +379 @@
 }
 
-Buffer::Buffer(Cucul *cv, char const *buf)
-{
-    buffer = cucul_export_canvas(cv->get_cucul_canvas_t(), buf);
-    if(!buffer) throw -1;
+Buffer::Buffer()
+{
+    buffer_ = NULL;
+}
+
+Buffer::~Buffer()
+{
+    if(buffer_)
+        cucul_free_buffer(buffer_);
 }
 
@@ -333 +395 @@
 }
 
-cucul_buffer *Buffer::get_buffer(void)
-{
-    return buffer;
-}
+void *Buffer::getData(void)
+{
+    return cucul_get_buffer_data(buffer_);
+}
+
+void Buffer::loadMemory(void *buf, unsigned long int size)
+{
+    buffer_ = cucul_load_memory(buf, size);
+    if(buffer_ == NULL)
+        throw -1;
+}
+
+void Buffer::loadFile(char const *filename)
+{
+    buffer_ = cucul_load_file(filename);
+    if(buffer_ == NULL)
+        throw -1;
+}
+
+unsigned long int Buffer::getSize()
+{
+    return cucul_get_buffer_size(buffer_);
+}
+
+cucul_buffer *Buffer::getBuffer()
+{
+    return buffer_;
+}

libcaca/trunk/cxx/cucul++.h

@@ -29 +29 @@
 class Cucul;
 
+
+class Charset
+{
+    unsigned long int utf8ToUtf32(char const *, unsigned int *);
+    unsigned int utf32ToUtf8(char *, unsigned long int);
+    unsigned char utf32ToCp437(unsigned long int);
+    unsigned long int cp437ToUtf32(unsigned char);
+};
+
+
+
+
+
 /* Ugly, I know */
 class Font
@@ -39 +52 @@
     unsigned int getHeight();
     void renderCanvas(Cucul *, unsigned char *, unsigned int, unsigned int, unsigned int);
-    
+    unsigned long int const *getBlocks();
+
  private:
     cucul_font *font;
-    
+
 };
 
@@ -75 +89 @@
     friend class Cucul;
  public:
-    Buffer(Cucul *cv, char const *);
+    Buffer();
     ~Buffer();
     char const *const * getExportList(void);
+    void *Buffer::getData(void);
+    void loadMemory(void *buf, unsigned long int size);
+    void loadFile(char const *filename);
+    unsigned long int getSize();
 
  protected:
@@ -83 +101 @@
 
  private:
-    cucul_buffer *buffer;
+    cucul_buffer *buffer_;
+    cucul_buffer *getBuffer();
 };
 
@@ -103 +122 @@
     unsigned int getHeight(void);
     void setColor(unsigned int f, unsigned int b);
+    int  setTruecolor(unsigned int f, unsigned int b);
+    unsigned long int getColor(int, int);
     char const * getColorName(unsigned int color);
     void Printf(int x , int y , char const * format,...);
     void putChar(int x, int y, char ch);
+    unsigned long int getChar(cucul_canvas_t *, int, int);
     void putStr(int x, int y, char *str);
     void Clear(void);
@@ -128 +150 @@
     void fillTriangle(int, int, int, int, int, int, char const *);
     int Rand(int, int);
+    int setBoundaries(cucul_canvas_t *, int, int,
+                                unsigned int, unsigned int);
+    unsigned int getFrameCount();
+    int setFrame(unsigned int);
+    int createFrame(unsigned int);
+    int freeFrame(unsigned int);
 
  protected: