Changeset 2821 for libcaca/trunk/src/aafire.cTweet

Timestamp:

Sep 27, 2008, 3:12:46 PM (12 years ago)

Author:

Sam Hocevar

Message:

Starting refactoring to get rid of libcucul. The initial reason for the
split is rendered moot by the plugin system: when enabled, binaries do
not link directly with libX11 or libGL. I hope this is a step towards
more consisteny and clarity.

File:

• libcaca/trunk/src/aafire.c (modified) (7 diffs)

libcaca/trunk/src/aafire.c

@@ -30 +30 @@
 #   include <string.h>
 #endif
-#include "cucul.h"
 #include "caca.h"
 #else
@@ -41 +40 @@
 #define MAXTABLE (256*5)
 #ifdef LIBCACA
-static cucul_canvas_t *cv;
+static caca_canvas_t *cv;
 static caca_display_t *dp;
 static int XSIZ, YSIZ;
-static cucul_dither_t *cucul_dither;
+static caca_dither_t *caca_dither;
 static char *bitmap;
 static int paused = 0;
@@ -102 +101 @@
 
 #ifdef LIBCACA
-  cv = cucul_create_canvas(80, 32);
+  cv = caca_create_canvas(80, 32);
   if (!cv)
     {
-      printf ("Failed to initialize libcucul\n");
+      printf ("Failed to initialize libcaca\n");
       exit (1);
     }
@@ -115 +114 @@
     }
   caca_set_display_time(dp, 10000);
-  XSIZ = cucul_get_canvas_width(cv) * 2;
-  YSIZ = cucul_get_canvas_height(cv) * 2 - 4;
+  XSIZ = caca_get_canvas_width(cv) * 2;
+  YSIZ = caca_get_canvas_height(cv) * 2 - 4;
 #else
   context = aa_autoinit (&aa_defparams);
@@ -142 +141 @@
 
 #ifdef LIBCACA
-  cucul_dither = cucul_create_dither(8, XSIZ, YSIZ - 2, XSIZ, 0, 0, 0, 0);
-  cucul_set_dither_palette(cucul_dither, r, g, b, a);
-  bitmap = malloc(4 * cucul_get_canvas_width(cv)
-                    * cucul_get_canvas_height(cv));
-  memset(bitmap, 0, 4 * cucul_get_canvas_width(cv)
-                      * cucul_get_canvas_height(cv));
+  caca_dither = caca_create_dither(8, XSIZ, YSIZ - 2, XSIZ, 0, 0, 0, 0);
+  caca_set_dither_palette(caca_dither, r, g, b, a);
+  bitmap = malloc(4 * caca_get_canvas_width(cv)
+                    * caca_get_canvas_height(cv));
+  memset(bitmap, 0, 4 * caca_get_canvas_width(cv)
+                      * caca_get_canvas_height(cv));
 #else
   aa_hidecursor (context);
@@ -157 +156 @@
 #ifdef LIBCACA
   caca_free_display(dp);
-  cucul_free_canvas(cv);
+  caca_free_canvas(cv);
 #else
   aa_close (context);
@@ -239 +238 @@
 #ifdef LIBCACA
 _paused:
-  cucul_dither_bitmap(cv, 0, 0, cucul_get_canvas_width(cv),
-                      cucul_get_canvas_height(cv), cucul_dither, bitmap);
-  cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLUE);
+  caca_dither_bitmap(cv, 0, 0, caca_get_canvas_width(cv),
+                      caca_get_canvas_height(cv), caca_dither, bitmap);
+  caca_set_color_ansi(cv, CACA_WHITE, CACA_BLUE);
   if (sloop < 100)
-    cucul_put_str(cv, cucul_get_canvas_width(cv) - 30,
-                  cucul_get_canvas_height(cv) - 2,
+    caca_put_str(cv, caca_get_canvas_width(cv) - 30,
+                  caca_get_canvas_height(cv) - 2,
                   " -=[ Powered by libcaca ]=- ");