Changeset 185 for libcaca/trunk/testTweet

Timestamp:

Nov 16, 2003, 1:33:35 AM (19 years ago)

Author:

Sam Hocevar

Message:

• Renamed libee to libcaca. Far less collisions.

Location:

libcaca/trunk/test

Files:

• Makefile.am (modified) (2 diffs)
• demo.c (modified) (16 diffs)
• spritedit.c (modified) (5 diffs)

libcaca/trunk/test/Makefile.am

@@ -1 +1 @@
 ###############################################################################
-# Automake targets and declarations for libee tests
+# Automake targets and declarations for libcaca tests
 ###############################################################################
 
-AM_CPPFLAGS = -I$(top_srcdir)/libee
+AM_CPPFLAGS = -I$(top_srcdir)/libcaca
 
 if USE_SLANG
@@ -15 +15 @@
 
 demo_SOURCES = demo.c
-demo_LDADD = ../libee/libee.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
+demo_LDADD = ../libcaca/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
 demo_CFLAGS = `pkg-config --cflags gtk+-2.0`
 demo_LDFLAGS = `pkg-config --libs gtk+-2.0`
 
 spritedit_SOURCES = spritedit.c
-spritedit_LDADD = ../libee/libee.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
+spritedit_LDADD = ../libcaca/libcaca.a $(LDFLAGS_slang) $(LDFLAGS_ncurses) -lm
 

libcaca/trunk/test/demo.c

@@ -1 +1 @@
 /*
- *   demo          demo using libee
+ *   demo          demo using libcaca
  *   Copyright (c) 2003 Sam Hocevar <sam@zoy.org>
  *                 All Rights Reserved
@@ -30 +30 @@
 #include <gdk/gdkpixbuf.h>
 
-#include "ee.h"
+#include "caca.h"
 
 static void display_menu(void);
@@ -47 +47 @@
 int bounds = 0;
 int outline = 0;
-struct ee_sprite *sprite = NULL;
+struct caca_sprite *sprite = NULL;
 
 GdkPixbuf *pixbuf;
@@ -58 +58 @@
     int quit = 0;
 
-    if(ee_init())
+    if(caca_init())
     {
         return 1;
     }
 
-    ee_set_delay(40000);
+    caca_set_delay(40000);
 
     /* Initialize data */
-    sprite = ee_load_sprite("data/barboss.txt");
+    sprite = caca_load_sprite("data/barboss.txt");
 
 gdk_init (&argc, &argv);
@@ -83 +83 @@
     /* Main menu */
     display_menu();
-    ee_refresh();
+    caca_refresh();
 
     /* Go ! */
     while(!quit)
     {
-        char key = ee_get_key();
+        char key = caca_get_key();
 
         if(key && demo)
         {
             display_menu();
-            ee_refresh();
+            caca_refresh();
             demo = NULL;
         }
@@ -149 +149 @@
 
             if(demo)
-                ee_clear();
-
-            key = ee_get_key();
+                caca_clear();
+
+            key = caca_get_key();
             if(key)
                 goto handle_key;
 
-            ee_refresh();
+            caca_refresh();
         }
 
@@ -162 +162 @@
             demo();
 
-            ee_set_color(EE_WHITE);
-            ee_draw_thin_box(1, 1, ee_get_width() - 2, ee_get_height() - 2);
-            ee_printf(4, 1, "[%i.%i fps]----",
-                            1000000 / ee_get_rendertime(),
-                            (10000000 / ee_get_rendertime()) % 10);
-            ee_refresh();
+            caca_set_color(EE_WHITE);
+            caca_draw_thin_box(1, 1, caca_get_width() - 2, caca_get_height() - 2);
+            caca_printf(4, 1, "[%i.%i fps]----",
+                            1000000 / caca_get_rendertime(),
+                            (10000000 / caca_get_rendertime()) % 10);
+            caca_refresh();
         }
     }
 
     /* Clean up */
-    ee_free_sprite(sprite);
-    ee_end();
+    caca_free_sprite(sprite);
+    caca_end();
 
     return 0;
@@ -180 +180 @@
 static void display_menu(void)
 {
-    int xo = ee_get_width() - 2;
-    int yo = ee_get_height() - 2;
-
-    ee_clear();
-    ee_set_color(EE_WHITE);
-    ee_draw_thin_box(1, 1, xo, yo);
-
-    ee_putstr((xo - strlen("libee demo")) / 2, 3, "libee demo");
-    ee_putstr((xo - strlen("============")) / 2, 4, "============");
-
-    ee_putstr(4, 6, "demos:");
-    ee_putstr(4, 7, "'f': full");
-    ee_putstr(4, 8, "'1': dots");
-    ee_putstr(4, 9, "'2': lines");
-    ee_putstr(4, 10, "'3': boxes");
-    ee_putstr(4, 11, "'4': triangles");
-    ee_putstr(4, 12, "'5': ellipses");
-    ee_putstr(4, 13, "'s': sprites");
-    ee_putstr(4, 14, "'c': color");
-    ee_putstr(4, 15, "'i': image blit");
-
-    ee_putstr(4, 17, "settings:");
-    ee_printf(4, 18, "'o': outline: %s",
+    int xo = caca_get_width() - 2;
+    int yo = caca_get_height() - 2;
+
+    caca_clear();
+    caca_set_color(EE_WHITE);
+    caca_draw_thin_box(1, 1, xo, yo);
+
+    caca_putstr((xo - strlen("libcaca demo")) / 2, 3, "libcaca demo");
+    caca_putstr((xo - strlen("==============")) / 2, 4, "==============");
+
+    caca_putstr(4, 6, "demos:");
+    caca_putstr(4, 7, "'f': full");
+    caca_putstr(4, 8, "'1': dots");
+    caca_putstr(4, 9, "'2': lines");
+    caca_putstr(4, 10, "'3': boxes");
+    caca_putstr(4, 11, "'4': triangles");
+    caca_putstr(4, 12, "'5': ellipses");
+    caca_putstr(4, 13, "'s': sprites");
+    caca_putstr(4, 14, "'c': color");
+    caca_putstr(4, 15, "'i': image blit");
+
+    caca_putstr(4, 17, "settings:");
+    caca_printf(4, 18, "'o': outline: %s",
               outline == 0 ? "none" : outline == 1 ? "solid" : "thin");
-    ee_printf(4, 19, "'b': drawing boundaries: %s",
+    caca_printf(4, 19, "'b': drawing boundaries: %s",
               bounds == 0 ? "screen" : "infinite");
 
-    ee_putstr(4, yo - 2, "'q': quit");
+    caca_putstr(4, yo - 2, "'q': quit");
 }
 
@@ -218 +218 @@
     i++;
 
-    ee_clear();
+    caca_clear();
 
     /* Draw the sun */
-    ee_set_color(EE_YELLOW);
-    xo = ee_get_width() / 4;
-    yo = ee_get_height() / 4 + 5 * sin(0.03*i);
+    caca_set_color(EE_YELLOW);
+    xo = caca_get_width() / 4;
+    yo = caca_get_height() / 4 + 5 * sin(0.03*i);
 
     for(j = 0; j < 16; j++)
@@ -229 +229 @@
         xa = xo - (30 + sin(0.03*i) * 8) * sin(0.03*i + M_PI*j/8);
         ya = yo + (15 + sin(0.03*i) * 4) * cos(0.03*i + M_PI*j/8);
-        ee_draw_thin_line(xo, yo, xa, ya);
+        caca_draw_thin_line(xo, yo, xa, ya);
     }
 
     j = 15 + sin(0.03*i) * 8;
-    ee_set_color(EE_WHITE);
-    ee_fill_ellipse(xo, yo, j, j / 2, '#');
-    ee_set_color(EE_YELLOW);
-    ee_draw_ellipse(xo, yo, j, j / 2, '#');
+    caca_set_color(EE_WHITE);
+    caca_fill_ellipse(xo, yo, j, j / 2, '#');
+    caca_set_color(EE_YELLOW);
+    caca_draw_ellipse(xo, yo, j, j / 2, '#');
 
     /* Draw the pyramid */
-    xo = ee_get_width() * 5 / 8;
+    xo = caca_get_width() * 5 / 8;
     yo = 2;
 
-    xa = ee_get_width() / 8 + sin(0.03*i) * 5;
-    ya = ee_get_height() / 2 + cos(0.03*i) * 5;
-
-    xb = ee_get_width() - 10 - cos(0.02*i) * 10;
-    yb = ee_get_height() * 3 / 4 - 5 + sin(0.02*i) * 5;
-
-    xc = ee_get_width() / 4 - sin(0.02*i) * 5;
-    yc = ee_get_height() * 3 / 4 + cos(0.02*i) * 5;
-
-    ee_set_color(EE_GREEN);
-    ee_fill_triangle(xo, yo, xb, yb, xa, ya, '%');
-    ee_set_color(EE_YELLOW);
-    ee_draw_thin_triangle(xo, yo, xb, yb, xa, ya);
-
-    ee_set_color(EE_RED);
-    ee_fill_triangle(xa, ya, xb, yb, xc, yc, '#');
-    ee_set_color(EE_YELLOW);
-    ee_draw_thin_triangle(xa, ya, xb, yb, xc, yc);
-
-    ee_set_color(EE_BLUE);
-    ee_fill_triangle(xo, yo, xb, yb, xc, yc, '%');
-    ee_set_color(EE_YELLOW);
-    ee_draw_thin_triangle(xo, yo, xb, yb, xc, yc);
+    xa = caca_get_width() / 8 + sin(0.03*i) * 5;
+    ya = caca_get_height() / 2 + cos(0.03*i) * 5;
+
+    xb = caca_get_width() - 10 - cos(0.02*i) * 10;
+    yb = caca_get_height() * 3 / 4 - 5 + sin(0.02*i) * 5;
+
+    xc = caca_get_width() / 4 - sin(0.02*i) * 5;
+    yc = caca_get_height() * 3 / 4 + cos(0.02*i) * 5;
+
+    caca_set_color(EE_GREEN);
+    caca_fill_triangle(xo, yo, xb, yb, xa, ya, '%');
+    caca_set_color(EE_YELLOW);
+    caca_draw_thin_triangle(xo, yo, xb, yb, xa, ya);
+
+    caca_set_color(EE_RED);
+    caca_fill_triangle(xa, ya, xb, yb, xc, yc, '#');
+    caca_set_color(EE_YELLOW);
+    caca_draw_thin_triangle(xa, ya, xb, yb, xc, yc);
+
+    caca_set_color(EE_BLUE);
+    caca_fill_triangle(xo, yo, xb, yb, xc, yc, '%');
+    caca_set_color(EE_YELLOW);
+    caca_draw_thin_triangle(xo, yo, xb, yb, xc, yc);
 
     /* Draw a background triangle */
@@ -270 +270 @@
     ya = 2;
 
-    xb = ee_get_width() - 3;
-    yb = ee_get_height() / 2;
-
-    xc = ee_get_width() / 3;
-    yc = ee_get_height() - 3;
-
-    ee_set_color(EE_CYAN);
-    ee_draw_thin_triangle(xa, ya, xb, yb, xc, yc);
-
-    xo = ee_get_width() / 2 + cos(0.027*i) * ee_get_width() / 3;
-    yo = ee_get_height() / 2 - sin(0.027*i) * ee_get_height() / 2;
-
-    ee_draw_thin_line(xa, ya, xo, yo);
-    ee_draw_thin_line(xb, yb, xo, yo);
-    ee_draw_thin_line(xc, yc, xo, yo);
+    xb = caca_get_width() - 3;
+    yb = caca_get_height() / 2;
+
+    xc = caca_get_width() / 3;
+    yc = caca_get_height() - 3;
+
+    caca_set_color(EE_CYAN);
+    caca_draw_thin_triangle(xa, ya, xb, yb, xc, yc);
+
+    xo = caca_get_width() / 2 + cos(0.027*i) * caca_get_width() / 3;
+    yo = caca_get_height() / 2 - sin(0.027*i) * caca_get_height() / 2;
+
+    caca_draw_thin_line(xa, ya, xo, yo);
+    caca_draw_thin_line(xb, yb, xo, yo);
+    caca_draw_thin_line(xc, yc, xo, yo);
 
     /* Draw a sprite on the pyramid */
-    ee_draw_sprite(xo, yo, sprite, 0);
+    caca_draw_sprite(xo, yo, sprite, 0);
 
     /* Draw a trail behind the foreground sprite */
     for(j = i - 60; j < i; j++)
     {
-        int delta = ee_rand(-5, 5);
-        ee_set_color(ee_rand(0, 15));
-        ee_putchar(ee_get_width() / 2
-                    + cos(0.02*j) * (delta + ee_get_width() / 4),
-                   ee_get_height() / 2
-                    + sin(0.02*j) * (delta + ee_get_height() / 3),
+        int delta = caca_rand(-5, 5);
+        caca_set_color(caca_rand(0, 15));
+        caca_putchar(caca_get_width() / 2
+                    + cos(0.02*j) * (delta + caca_get_width() / 4),
+                   caca_get_height() / 2
+                    + sin(0.02*j) * (delta + caca_get_height() / 3),
                    '#');
     }
 
     /* Draw foreground sprite */
-    ee_draw_sprite(ee_get_width() / 2 + cos(0.02*i) * ee_get_width() / 4,
-                   ee_get_height() / 2 + sin(0.02*i) * ee_get_height() / 3,
+    caca_draw_sprite(caca_get_width() / 2 + cos(0.02*i) * caca_get_width() / 4,
+                   caca_get_height() / 2 + sin(0.02*i) * caca_get_height() / 3,
                    sprite, 0);
 }
@@ -309 +309 @@
 static void demo_dots(void)
 {
-    int xmax = ee_get_width() - 1;
-    int ymax = ee_get_height() - 1;
+    int xmax = caca_get_width() - 1;
+    int ymax = caca_get_height() - 1;
     int i;
 
@@ -316 +316 @@
     {
         /* Putpixel */
-        ee_set_color(ee_rand(0, 15));
-        ee_putchar(ee_rand(0, xmax), ee_rand(0, ymax), '#');
+        caca_set_color(caca_rand(0, 15));
+        caca_putchar(caca_rand(0, xmax), caca_rand(0, ymax), '#');
     }
 }
@@ -326 +326 @@
     char buf[BUFSIZ];
 
-    ee_clear();
+    caca_clear();
     for(i = 0; i < 16; i++)
     {
-        sprintf(buf, "'%c': %i (%s)", 'a' + i, i, ee_get_color_name(i));
-        ee_set_color(EE_WHITE);
-        ee_putstr(4, i + 3, buf);
-        ee_set_color(i);
-        ee_putstr(40, i + 3, "XXXXXXXXXX-XX--X----------");
+        sprintf(buf, "'%c': %i (%s)", 'a' + i, i, caca_get_color_name(i));
+        caca_set_color(EE_WHITE);
+        caca_putstr(4, i + 3, buf);
+        caca_set_color(i);
+        caca_putstr(40, i + 3, "XXXXXXXXXX-XX--X----------");
     }
 }
@@ -339 +339 @@
 static void demo_lines(void)
 {
-    int w = ee_get_width();
-    int h = ee_get_height();
+    int w = caca_get_width();
+    int h = caca_get_height();
     int xa, ya, xb, yb;
 
     if(bounds)
     {
-        xa = ee_rand(- w, 2 * w); ya = ee_rand(- h, 2 * h);
-        xb = ee_rand(- w, 2 * w); yb = ee_rand(- h, 2 * h);
+        xa = caca_rand(- w, 2 * w); ya = caca_rand(- h, 2 * h);
+        xb = caca_rand(- w, 2 * w); yb = caca_rand(- h, 2 * h);
     }
     else
     {
-        xa = ee_rand(0, w - 1); ya = ee_rand(0, h - 1);
-        xb = ee_rand(0, w - 1); yb = ee_rand(0, h - 1);
-    }
-
-    ee_set_color(ee_rand(0, 15));
+        xa = caca_rand(0, w - 1); ya = caca_rand(0, h - 1);
+        xb = caca_rand(0, w - 1); yb = caca_rand(0, h - 1);
+    }
+
+    caca_set_color(caca_rand(0, 15));
     if(outline > 1)
-        ee_draw_thin_line(xa, ya, xb, yb);
+        caca_draw_thin_line(xa, ya, xb, yb);
     else
-        ee_draw_line(xa, ya, xb, yb, '#');
+        caca_draw_line(xa, ya, xb, yb, '#');
 }
 
 static void demo_boxes(void)
 {
-    int w = ee_get_width();
-    int h = ee_get_height();
+    int w = caca_get_width();
+    int h = caca_get_height();
     int xa, ya, xb, yb;
 
     if(bounds)
     {
-        xa = ee_rand(- w, 2 * w); ya = ee_rand(- h, 2 * h);
-        xb = ee_rand(- w, 2 * w); yb = ee_rand(- h, 2 * h);
+        xa = caca_rand(- w, 2 * w); ya = caca_rand(- h, 2 * h);
+        xb = caca_rand(- w, 2 * w); yb = caca_rand(- h, 2 * h);
     }
     else
     {
-        xa = ee_rand(0, w - 1); ya = ee_rand(0, h - 1);
-        xb = ee_rand(0, w - 1); yb = ee_rand(0, h - 1);
-    }
-
-    ee_set_color(ee_rand(0, 15));
-    ee_fill_box(xa, ya, xb, yb, '#');
-
-    ee_set_color(ee_rand(0, 15));
+        xa = caca_rand(0, w - 1); ya = caca_rand(0, h - 1);
+        xb = caca_rand(0, w - 1); yb = caca_rand(0, h - 1);
+    }
+
+    caca_set_color(caca_rand(0, 15));
+    caca_fill_box(xa, ya, xb, yb, '#');
+
+    caca_set_color(caca_rand(0, 15));
     if(outline == 2)
-        ee_draw_thin_box(xa, ya, xb, yb);
+        caca_draw_thin_box(xa, ya, xb, yb);
     else if(outline == 1)
-        ee_draw_box(xa, ya, xb, yb, '#');
+        caca_draw_box(xa, ya, xb, yb, '#');
 }
 
 static void demo_ellipses(void)
 {
-    int w = ee_get_width();
-    int h = ee_get_height();
+    int w = caca_get_width();
+    int h = caca_get_height();
     int x, y, a, b;
 
     if(bounds)
     {
-        x = ee_rand(- w, 2 * w); y = ee_rand(- h, 2 * h);
-        a = ee_rand(0, w); b = ee_rand(0, h);
+        x = caca_rand(- w, 2 * w); y = caca_rand(- h, 2 * h);
+        a = caca_rand(0, w); b = caca_rand(0, h);
     }
     else
@@ -403 +403 @@
         do
         {
-            x = ee_rand(0, w); y = ee_rand(0, h);
-            a = ee_rand(0, w); b = ee_rand(0, h);
+            x = caca_rand(0, w); y = caca_rand(0, h);
+            a = caca_rand(0, w); b = caca_rand(0, h);
 
         } while(x - a < 0 || x + a >= w || y - b < 0 || y + b >= h);
     }
 
-    ee_set_color(ee_rand(0, 15));
-    ee_fill_ellipse(x, y, a, b, '#');
-
-    ee_set_color(ee_rand(0, 15));
+    caca_set_color(caca_rand(0, 15));
+    caca_fill_ellipse(x, y, a, b, '#');
+
+    caca_set_color(caca_rand(0, 15));
     if(outline == 2)
-        ee_draw_thin_ellipse(x, y, a, b);
+        caca_draw_thin_ellipse(x, y, a, b);
     else if(outline == 1)
-        ee_draw_ellipse(x, y, a, b, '#');
+        caca_draw_ellipse(x, y, a, b, '#');
 }
 
 static void demo_triangles(void)
 {
-    int w = ee_get_width();
-    int h = ee_get_height();
+    int w = caca_get_width();
+    int h = caca_get_height();
     int xa, ya, xb, yb, xc, yc;
 
     if(bounds)
     {
-        xa = ee_rand(- w, 2 * w); ya = ee_rand(- h, 2 * h);
-        xb = ee_rand(- w, 2 * w); yb = ee_rand(- h, 2 * h);
-        xc = ee_rand(- w, 2 * w); yc = ee_rand(- h, 2 * h);
+        xa = caca_rand(- w, 2 * w); ya = caca_rand(- h, 2 * h);
+        xb = caca_rand(- w, 2 * w); yb = caca_rand(- h, 2 * h);
+        xc = caca_rand(- w, 2 * w); yc = caca_rand(- h, 2 * h);
     }
     else
     {
 
-        xa = ee_rand(0, w - 1); ya = ee_rand(0, h - 1);
-        xb = ee_rand(0, w - 1); yb = ee_rand(0, h - 1);
-        xc = ee_rand(0, w - 1); yc = ee_rand(0, h - 1);
-    }
-
-    ee_set_color(ee_rand(0, 15));
-    ee_fill_triangle(xa, ya, xb, yb, xc, yc, '#');
-
-    ee_set_color(ee_rand(0, 15));
+        xa = caca_rand(0, w - 1); ya = caca_rand(0, h - 1);
+        xb = caca_rand(0, w - 1); yb = caca_rand(0, h - 1);
+        xc = caca_rand(0, w - 1); yc = caca_rand(0, h - 1);
+    }
+
+    caca_set_color(caca_rand(0, 15));
+    caca_fill_triangle(xa, ya, xb, yb, xc, yc, '#');
+
+    caca_set_color(caca_rand(0, 15));
     if(outline == 2)
-        ee_draw_thin_triangle(xa, ya, xb, yb, xc, yc);
+        caca_draw_thin_triangle(xa, ya, xb, yb, xc, yc);
     else if(outline == 1)
-        ee_draw_triangle(xa, ya, xb, yb, xc, yc, '#');
+        caca_draw_triangle(xa, ya, xb, yb, xc, yc, '#');
 }
 
 static void demo_sprites(void)
 {
-    ee_draw_sprite(ee_rand(0, ee_get_width() - 1),
-                   ee_rand(0, ee_get_height() - 1), sprite, 0);
+    caca_draw_sprite(caca_rand(0, caca_get_width() - 1),
+                   caca_rand(0, caca_get_height() - 1), sprite, 0);
 }
 
 static void demo_blit(void)
 {
-ee_set_color(EE_LIGHTGRAY);
-    ee_blit(6, 4, ee_get_width() - 6, ee_get_height() - 4, pixels, bufx, bufy);
-}
-
+caca_set_color(EE_LIGHTGRAY);
+    caca_blit(6, 4, caca_get_width() - 6, caca_get_height() - 4, pixels, bufx, bufy);
+}
+

libcaca/trunk/test/spritedit.c

@@ -1 +1 @@
 /*
- *   spritedit     sprite editor using libee
+ *   spritedit     sprite editor using libcaca
  *   Copyright (c) 2003 Sam Hocevar <sam@zoy.org>
  *                 All Rights Reserved
@@ -25 +25 @@
 #include <stdio.h>
 
-#include "ee.h"
+#include "caca.h"
 
 int main(int argc, char **argv)
 {
     int quit = 0;
-    struct ee_sprite *sprite;
+    struct caca_sprite *sprite;
     int frame = 0;
 
@@ -39 +39 @@
     }
 
-    if(ee_init())
+    if(caca_init())
         return 1;
 
-    sprite = ee_load_sprite(argv[1]);
+    sprite = caca_load_sprite(argv[1]);
 
     if(!sprite)
     {
-        ee_end();
+        caca_end();
         fprintf(stderr, "%s: could not open `%s'.\n", argv[0], argv[1]);
         return 1;
@@ -57 +57 @@
         char buf[BUFSIZ];
 
-        switch(ee_get_key())
+        switch(caca_get_key())
         {
         case 0:
@@ -69 +69 @@
             break;
         case '+':
-            if(frame < ee_get_sprite_frames(sprite) - 1)
+            if(frame < caca_get_sprite_frames(sprite) - 1)
                 frame++;
             break;
         }
 
-        ee_clear();
+        caca_clear();
 
-        ee_set_color(EE_WHITE);
-        ee_draw_thin_box(0, 0, ee_get_width() - 1, ee_get_height() - 1);
+        caca_set_color(EE_WHITE);
+        caca_draw_thin_box(0, 0, caca_get_width() - 1, caca_get_height() - 1);
 
-        ee_putstr(3, 0, "[ Sprite editor for libee ]");
+        caca_putstr(3, 0, "[ Sprite editor for libcaca ]");
 
         sprintf(buf, "sprite `%s'", argv[1]);
-        ee_putstr(3, 2, buf);
-        sprintf(buf, "frame %i/%i", frame, ee_get_sprite_frames(sprite) - 1);
-        ee_putstr(3, 3, buf);
+        caca_putstr(3, 2, buf);
+        sprintf(buf, "frame %i/%i", frame, caca_get_sprite_frames(sprite) - 1);
+        caca_putstr(3, 3, buf);
 
         /* Crosshair */
-        ee_draw_thin_line(57, 2, 57, 18);
-        ee_draw_thin_line(37, 10, 77, 10);
-        ee_putchar(57, 10, '+');
+        caca_draw_thin_line(57, 2, 57, 18);
+        caca_draw_thin_line(37, 10, 77, 10);
+        caca_putchar(57, 10, '+');
 
         /* Boxed sprite */
-        xa = -1 - ee_get_sprite_dx(sprite, frame);
-        ya = -1 - ee_get_sprite_dy(sprite, frame);
-        xb = xa + 1 + ee_get_sprite_width(sprite, frame);
-        yb = ya + 1 + ee_get_sprite_height(sprite, frame);
-        ee_set_color(EE_BLACK);
-        ee_fill_box(57 + xa, 10 + ya, 57 + xb, 10 + yb, ' ');
-        ee_set_color(EE_WHITE);
-        ee_draw_thin_box(57 + xa, 10 + ya, 57 + xb, 10 + yb);
-        ee_draw_sprite(57, 10, sprite, frame);
+        xa = -1 - caca_get_sprite_dx(sprite, frame);
+        ya = -1 - caca_get_sprite_dy(sprite, frame);
+        xb = xa + 1 + caca_get_sprite_width(sprite, frame);
+        yb = ya + 1 + caca_get_sprite_height(sprite, frame);
+        caca_set_color(EE_BLACK);
+        caca_fill_box(57 + xa, 10 + ya, 57 + xb, 10 + yb, ' ');
+        caca_set_color(EE_WHITE);
+        caca_draw_thin_box(57 + xa, 10 + ya, 57 + xb, 10 + yb);
+        caca_draw_sprite(57, 10, sprite, frame);
 
         /* Free sprite */
-        ee_draw_sprite(20, 10, sprite, frame);
+        caca_draw_sprite(20, 10, sprite, frame);
 
-        ee_refresh();
+        caca_refresh();
     }
 
     /* Clean up */
-    ee_end();
+    caca_end();
 
     return 0;