Changeset 2821 for libcaca/trunk/tools/sortchars.cTweet

Timestamp:

Sep 27, 2008, 3:12:46 PM (11 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/tools/sortchars.c (modified) (9 diffs)

libcaca/trunk/tools/sortchars.c

@@ -21 +21 @@
 #endif
 
-#include "cucul.h"
+#include "caca.h"
 
 #define GLYPHS 0x7f
@@ -49 +49 @@
     int count[DX][DY];
     char utf8[7];
-    cucul_canvas_t *cv;
-    cucul_font_t *f;
+    caca_canvas_t *cv;
+    caca_font_t *f;
     char const * const * fonts;
     uint8_t *img;
@@ -56 +56 @@
     int ret, i, max;
 
-    /* Load a libcucul internal font */
-    fonts = cucul_get_font_list();
+    /* Load a libcaca internal font */
+    fonts = caca_get_font_list();
     if(fonts[FONT] == NULL)
     {
-        fprintf(stderr, "error: libcucul was compiled without any fonts\n");
+        fprintf(stderr, "error: libcaca was compiled without any fonts\n");
         return -1;
     }
-    f = cucul_load_font(fonts[FONT], 0);
+    f = caca_load_font(fonts[FONT], 0);
     if(f == NULL)
     {
@@ -70 +70 @@
     }
 
-    cv = cucul_create_canvas(1, 1);
-    cucul_set_color_ansi(cv, CUCUL_WHITE, CUCUL_BLACK);
+    cv = caca_create_canvas(1, 1);
+    caca_set_color_ansi(cv, CACA_WHITE, CACA_BLACK);
 
     /* Create our bitmap buffer (32-bit ARGB) */
-    w = cucul_get_font_width(f);
-    h = cucul_get_font_height(f);
+    w = caca_get_font_width(f);
+    h = caca_get_font_height(f);
     img = malloc(4 * w * h);
 
@@ -95 +95 @@
     for(i = 0x20; i < GLYPHS; i++)
     {
-        cucul_put_char(cv, 0, 0, i);
+        caca_put_char(cv, 0, 0, i);
 
         /* Render the canvas onto our image buffer */
-        cucul_render_canvas(cv, f, img, w, h, 4 * w);
+        caca_render_canvas(cv, f, img, w, h, 4 * w);
 
         for(y = 0; y < h * DY; y++)
@@ -166 +166 @@
     for(i = 0; i < FULLRANGE; i++)
     {
-        ret = cucul_utf32_to_utf8(utf8, bestchar[i]);
+        ret = caca_utf32_to_utf8(utf8, bestchar[i]);
         utf8[ret] = '\0';
         printf("%i, ", bestchar[i]);
@@ -176 +176 @@
     for(i = 0; i < GLYPHS; i++)
     {
-        ret = cucul_utf32_to_utf8(utf8, bestchar[i]);
+        ret = caca_utf32_to_utf8(utf8, bestchar[i]);
         utf8[ret] = '\0';
         printf("0x%03x, ", allbits[i]);
@@ -184 +184 @@
     printf("\n};\n");
 
-    cucul_free_canvas(cv);
+    caca_free_canvas(cv);
 
     testcircle();
@@ -253 +253 @@
                 }
 
-            ret = cucul_utf32_to_utf8(utf8, bestchar[bits]);
+            ret = caca_utf32_to_utf8(utf8, bestchar[bits]);
             utf8[ret] = '\0';
             printf("%s", utf8);