Changeset 2074 for libcaca/trunk/cxxTweet

Timestamp:

Nov 26, 2007, 2:04:32 AM (13 years ago)

Author:

Sam Hocevar

Message:

• Add cucul_get_version() and caca_get_version() and updated C++ bindings accordingly.
• The C++ test example no longer needs "config.h".

Location:

libcaca/trunk/cxx

Files:

• caca++.cpp (modified) (1 diff)
• caca++.h (modified) (1 diff)
• cucul++.cpp (modified) (1 diff)
• cucul++.h (modified) (2 diffs)
• cxxtest.cpp (modified) (4 diffs)

libcaca/trunk/cxx/caca++.cpp

@@ -97 +97 @@
 }
 
+const char * Caca::getVersion()
+{
+    return caca_get_version();
+}
+

libcaca/trunk/cxx/caca++.h

@@ -79 +79 @@
     void setMouse(int);
 
+    static char const * getVersion();
  private:
     caca_display_t *dp;

libcaca/trunk/cxx/cucul++.cpp

@@ -237 +237 @@
 }
 
+const char * Cucul::getVersion()
+{
+    return cucul_get_version();
+}
+
 int Cucul::setAttr(unsigned long int attr)
 {

libcaca/trunk/cxx/cucul++.h

@@ -130 +130 @@
     void drawThinTriangle(int, int, int, int, int, int);
     void fillTriangle(int, int, int, int, int, int, unsigned long int);
-    int Rand(int, int);
     int setBoundaries(cucul_canvas_t *, int, int, unsigned int, unsigned int);
     unsigned int getFrameCount();
@@ -143 +142 @@
     void *exportMemory(char const *, unsigned long int *);
 
+    static int Rand(int, int);
+    static char const * getVersion();
  protected:
     cucul_canvas_t *get_cucul_canvas_t();

libcaca/trunk/cxx/cxxtest.cpp

@@ -12 +12 @@
  *  http://sam.zoy.org/wtfpl/COPYING for more details.
  */
-
-#include "config.h"
 
 #include <iostream>
@@ -42 +40 @@
 int main(int argc, char *argv[])
 {
-    Cucul *qq, *pig;
-    Caca  *kk;
+    Cucul *cv, *pig;
+    Caca  *dp;
 
     int x = 0, y = 0, ix = 1, iy = 1;
 
     try {
-        qq = new Cucul();
+        cv = new Cucul();
     }
     catch (int e) {
@@ -56 +54 @@
 
     try {
-        kk = new Caca(qq);
+        dp = new Caca(cv);
     }
     catch(int e) {
@@ -74 +72 @@
     }
 
-    kk->setDisplayTime(20000);
+    dp->setDisplayTime(20000);
 
-    while(!kk->getEvent(Event::CACA_EVENT_KEY_PRESS, NULL, 0))
+    while(!dp->getEvent(Event::CACA_EVENT_KEY_PRESS, NULL, 0))
     {
 
         /* In case of resize ...*/
-        if((x + pig->getWidth())-1 >= qq->getWidth() || x < 0 )
+        if((x + pig->getWidth())-1 >= cv->getWidth() || x < 0 )
             x = 0;
-        if((y + pig->getHeight())-1 >= qq->getHeight() || y < 0 )
+        if((y + pig->getHeight())-1 >= cv->getHeight() || y < 0 )
             y = 0;
 
-        qq->Clear();
+        cv->Clear();
 
         /* Draw pig */
-        qq->Blit(x, y, pig, NULL);
+        cv->Blit(x, y, pig, NULL);
 
         /* printf works */
-        qq->setColorANSI(CUCUL_LIGHTBLUE, CUCUL_BLACK);
-        qq->Printf(qq->getWidth() / 2 - 10, qq->getHeight() / 2,
-                   "Powered by libcaca %s", VERSION);
+        cv->setColorANSI(CUCUL_LIGHTBLUE, CUCUL_BLACK);
+        cv->Printf(cv->getWidth() / 2 - 10, cv->getHeight() / 2,
+                   "Powered by libcaca %s", dp->getVersion());
 
         /* Blit */
-        kk->Display();
+        dp->Display();
 
         x += ix;
         y += iy;
 
-        if(x + pig->getWidth() >= qq->getWidth() || x < 0 )
+        if(x + pig->getWidth() >= cv->getWidth() || x < 0 )
             ix = -ix;
-        if(y + pig->getHeight() >= qq->getHeight() || y < 0 )
+        if(y + pig->getHeight() >= cv->getHeight() || y < 0 )
             iy = -iy;
 
     }
 
-    delete kk;
-    delete qq;
+    delete dp;
+    delete cv;
 
     return 0;