Changeset 2821 for libcaca/trunk/toolsTweet

Timestamp:

Sep 27, 2008, 3:12:46 PM (14 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.

Location:

libcaca/trunk/tools

Files:

• Makefile.am (modified) (2 diffs)
• makefont.c (modified) (5 diffs)
• optipal.c (modified) (7 diffs)
• sortchars.c (modified) (9 diffs)

libcaca/trunk/tools/Makefile.am

@@ -1 +1 @@
 # $Id$
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul \
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca \
               -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
 
@@ -9 +9 @@
 
 sortchars_SOURCES = sortchars.c
-sortchars_LDADD = ../cucul/libcucul.la
+sortchars_LDADD = ../caca/libcaca.la
 
 makefont_SOURCES = makefont.c
-makefont_LDADD = ../cucul/libcucul.la
+makefont_LDADD = ../caca/libcaca.la
 makefont_CFLAGS = $(PANGOFT2_CFLAGS)
 makefont_LDFLAGS = $(PANGOFT2_LIBS)

libcaca/trunk/tools/makefont.c

@@ -31 +31 @@
 #include <pango/pangoft2.h>
 
-#include "cucul.h"
+#include "caca.h"
 
 /* Split our big strings into chunks of 480 characters, because it is
@@ -167 +167 @@
         glyphs += blocklist[b + 1] - blocklist[b];
         for(i = blocklist[b]; i < blocklist[b + 1]; i++)
-            if(cucul_utf32_is_fullwidth(i))
+            if(caca_utf32_is_fullwidth(i))
                 fullglyphs++;
     }
@@ -178 +178 @@
 
     /* Let's go! */
-    printf("/* libcucul font file\n");
+    printf("/* libcaca font file\n");
     printf(" * \"%s\": %i dpi, %i bpp, %ix%i/%ix%i glyphs\n",
            font, dpi, bpp, stdwidth, height, fullwidth, height);
@@ -232 +232 @@
             unsigned int k, current_size = stdsize;
 
-            if(cucul_utf32_is_fullwidth(i))
+            if(caca_utf32_is_fullwidth(i))
             {
                 current_width = fullwidth;
@@ -238 +238 @@
             }
             gtab[n].unicode = i;
-            bytes = cucul_utf32_to_utf8(gtab[n].buf, gtab[n].unicode);
+            bytes = caca_utf32_to_utf8(gtab[n].buf, gtab[n].unicode);
             gtab[n].buf[bytes] = '\0';
 

libcaca/trunk/tools/optipal.c

@@ -19 +19 @@
 #endif
 
-#include "cucul.h" /* Only necessary for CUCUL_* macros */
+#include "caca.h" /* Only necessary for CACA_* macros */
 
 static void base_colors(void);
@@ -30 +30 @@
 static unsigned int const hue_list[] =
 {
-    CUCUL_RED, CUCUL_BROWN, CUCUL_GREEN,
-    CUCUL_CYAN, CUCUL_BLUE, CUCUL_MAGENTA
+    CACA_RED, CACA_BROWN, CACA_GREEN,
+    CACA_CYAN, CACA_BLUE, CACA_MAGENTA
 };
 
@@ -168 +168 @@
     /* black background colour pairs that are needed for the old renderer */
     for(i = 1; i < 16; i++)
-        SETPAIR(i, CUCUL_BLACK, cur++);
+        SETPAIR(i, CACA_BLACK, cur++);
 
     /* gray combinations used for grayscale dithering */
-    SETPAIR(CUCUL_BLACK, CUCUL_DARKGRAY, cur++);
-    SETPAIR(CUCUL_DARKGRAY, CUCUL_LIGHTGRAY, cur++);
-    SETPAIR(CUCUL_LIGHTGRAY, CUCUL_DARKGRAY, cur++);
-    SETPAIR(CUCUL_WHITE, CUCUL_LIGHTGRAY, cur++);
-    SETPAIR(CUCUL_LIGHTGRAY, CUCUL_WHITE, cur++);
+    SETPAIR(CACA_BLACK, CACA_DARKGRAY, cur++);
+    SETPAIR(CACA_DARKGRAY, CACA_LIGHTGRAY, cur++);
+    SETPAIR(CACA_LIGHTGRAY, CACA_DARKGRAY, cur++);
+    SETPAIR(CACA_WHITE, CACA_LIGHTGRAY, cur++);
+    SETPAIR(CACA_LIGHTGRAY, CACA_WHITE, cur++);
 
     /* white/light, light/dark, lightgray/light, darkgray/dark, dark/black
@@ -183 +183 @@
     for(i = 1; i < 7; i++)
     {
-        SETPAIR(CUCUL_WHITE, i + 8, cur++);
-        SETPAIR(i + 8, CUCUL_WHITE, cur++);
+        SETPAIR(CACA_WHITE, i + 8, cur++);
+        SETPAIR(i + 8, CACA_WHITE, cur++);
         SETPAIR(i, i + 8, cur++);
         SETPAIR(i + 8, i, cur++);
-        SETPAIR(CUCUL_LIGHTGRAY, i + 8, cur++);
-        SETPAIR(i + 8, CUCUL_LIGHTGRAY, cur++);
-        SETPAIR(CUCUL_DARKGRAY, i, cur++);
-        SETPAIR(i, CUCUL_DARKGRAY, cur++);
-        SETPAIR(CUCUL_BLACK, i, cur++);
+        SETPAIR(CACA_LIGHTGRAY, i + 8, cur++);
+        SETPAIR(i + 8, CACA_LIGHTGRAY, cur++);
+        SETPAIR(CACA_DARKGRAY, i, cur++);
+        SETPAIR(i, CACA_DARKGRAY, cur++);
+        SETPAIR(CACA_BLACK, i, cur++);
     }
 
@@ -216 +216 @@
     /* black on light gray, black on white, white on dark gray, dark gray
      * on white, white on blue, light gray on blue (chosen arbitrarily) */
-    SETPAIR(CUCUL_BLACK, CUCUL_LIGHTGRAY, cur++);
-    SETPAIR(CUCUL_BLACK, CUCUL_WHITE, cur++);
-    SETPAIR(CUCUL_WHITE, CUCUL_DARKGRAY, cur++);
-    SETPAIR(CUCUL_DARKGRAY, CUCUL_WHITE, cur++);
-    SETPAIR(CUCUL_WHITE, CUCUL_BLUE, cur++);
-    SETPAIR(CUCUL_LIGHTGRAY, CUCUL_BLUE, cur++);
+    SETPAIR(CACA_BLACK, CACA_LIGHTGRAY, cur++);
+    SETPAIR(CACA_BLACK, CACA_WHITE, cur++);
+    SETPAIR(CACA_WHITE, CACA_DARKGRAY, cur++);
+    SETPAIR(CACA_DARKGRAY, CACA_WHITE, cur++);
+    SETPAIR(CACA_WHITE, CACA_BLUE, cur++);
+    SETPAIR(CACA_LIGHTGRAY, CACA_BLUE, cur++);
 }
 
@@ -237 +237 @@
     for(i = 1; i < 7; i++)
     {
-        if(i != CUCUL_BLUE)
+        if(i != CACA_BLUE)
         {
-            SETPAIR(CUCUL_LIGHTGRAY, i, 128 +
+            SETPAIR(CACA_LIGHTGRAY, i, 128 +
                     slang_assoc[i + 8 + 16 * i]);
-            SETPAIR(CUCUL_WHITE, i, 128 +
-                    slang_assoc[CUCUL_LIGHTGRAY + 16 * (i + 8)]);
+            SETPAIR(CACA_WHITE, i, 128 +
+                    slang_assoc[CACA_LIGHTGRAY + 16 * (i + 8)]);
         }
-        SETPAIR(CUCUL_BLACK, i + 8,
-                128 + slang_assoc[CUCUL_DARKGRAY + 16 * i]);
-        SETPAIR(CUCUL_DARKGRAY, i + 8,
+        SETPAIR(CACA_BLACK, i + 8,
+                128 + slang_assoc[CACA_DARKGRAY + 16 * i]);
+        SETPAIR(CACA_DARKGRAY, i + 8,
                 128 + slang_assoc[i + 16 * (i + 8)]);
-        SETPAIR(i + 8, CUCUL_DARKGRAY,
-                128 + slang_assoc[i + 16 * CUCUL_DARKGRAY]);
-        SETPAIR(i, CUCUL_LIGHTGRAY,
-                128 + slang_assoc[i + 8 + 16 * CUCUL_LIGHTGRAY]);
-        SETPAIR(i, CUCUL_WHITE,
-                128 + slang_assoc[i + 8 + 16 * CUCUL_WHITE]);
+        SETPAIR(i + 8, CACA_DARKGRAY,
+                128 + slang_assoc[i + 16 * CACA_DARKGRAY]);
+        SETPAIR(i, CACA_LIGHTGRAY,
+                128 + slang_assoc[i + 8 + 16 * CACA_LIGHTGRAY]);
+        SETPAIR(i, CACA_WHITE,
+                128 + slang_assoc[i + 8 + 16 * CACA_WHITE]);
     }
 
@@ -287 +287 @@
     {
         SETPAIR(hue_list[i], hue_list[(i + 3) % 6],
-                128 + slang_assoc[hue_list[i] + 16 * CUCUL_BLACK]);
+                128 + slang_assoc[hue_list[i] + 16 * CACA_BLACK]);
         SETPAIR(hue_list[i] + 8, hue_list[(i + 3) % 6],
-                128 + slang_assoc[hue_list[i] + 8 + 16 * CUCUL_BLACK]);
+                128 + slang_assoc[hue_list[i] + 8 + 16 * CACA_BLACK]);
         SETPAIR(hue_list[(i + 3) % 6], hue_list[i] + 8,
-                128 + slang_assoc[CUCUL_BLACK + 16 * hue_list[i]]);
+                128 + slang_assoc[CACA_BLACK + 16 * hue_list[i]]);
         SETPAIR(hue_list[(i + 3) % 6] + 8, hue_list[i] + 8,
-                128 + slang_assoc[CUCUL_WHITE + 16 * (hue_list[i] + 8)]);
+                128 + slang_assoc[CACA_WHITE + 16 * (hue_list[i] + 8)]);
     }
 }

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);