Changeset 2821 for libcaca/trunk/caca/figfont.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/caca/figfont.c (copied) (copied from libcaca/trunk/cucul/figfont.c) (30 diffs)

libcaca/trunk/caca/figfont.c

@@ -1 +1 @@
 /*
- *  libcucul      Canvas for ultrafast compositing of Unicode letters
+ *  libcaca       Colour ASCII-Art library
  *  Copyright (c) 2006-2007 Sam Hocevar <sam@zoy.org>
  *                All Rights Reserved
@@ -29 +29 @@
 #endif
 
-#include "cucul.h"
-#include "cucul_internals.h"
-
-struct cucul_figfont
+#include "caca.h"
+#include "caca_internals.h"
+
+struct caca_figfont
 {
     int term_width;
@@ -44 +44 @@
     int print_direction, full_layout, codetag_count;
     int glyphs;
-    cucul_canvas_t *fontcv, *charcv;
+    caca_canvas_t *fontcv, *charcv;
     int *left, *right; /* Unused yet */
     uint32_t *lookup;
@@ -50 +50 @@
 
 static uint32_t hsmush(uint32_t ch1, uint32_t ch2, int rule);
-static cucul_figfont_t * open_figfont(char const *);
-static int free_figfont(cucul_figfont_t *);
-
-int cucul_canvas_set_figfont(cucul_canvas_t *cv, char const *path)
-{
-    cucul_figfont_t *ff = NULL;
+static caca_figfont_t * open_figfont(char const *);
+static int free_figfont(caca_figfont_t *);
+
+int caca_canvas_set_figfont(caca_canvas_t *cv, char const *path)
+{
+    caca_figfont_t *ff = NULL;
 
     if(path)
@@ -66 +66 @@
     if(cv->ff)
     {
-        cucul_free_canvas(cv->ff->charcv);
+        caca_free_canvas(cv->ff->charcv);
         free(cv->ff->left);
         free(cv->ff->right);
@@ -85 +85 @@
     ff->w = ff->h = 0;
     ff->lines = 0;
-    cucul_set_canvas_size(cv, 0, 0); /* XXX */
+    caca_set_canvas_size(cv, 0, 0); /* XXX */
 
     /* from TOIlet’s figlet.c */
@@ -118 +118 @@
     }
 
-    ff->charcv = cucul_create_canvas(ff->max_length - 2, ff->height);
+    ff->charcv = caca_create_canvas(ff->max_length - 2, ff->height);
 
     ff->left = malloc(ff->height * sizeof(int));
@@ -128 +128 @@
 }
 
-int cucul_put_figchar(cucul_canvas_t *cv, uint32_t ch)
-{
-    cucul_figfont_t *ff = cv->ff;
+int caca_put_figchar(caca_canvas_t *cv, uint32_t ch)
+{
+    caca_figfont_t *ff = cv->ff;
     int c, w, h, x, y, overlap, extra, xleft, xright;
 
@@ -155 +155 @@
     h = ff->height;
 
-    cucul_set_canvas_handle(ff->fontcv, 0, c * ff->height);
-    cucul_blit(ff->charcv, 0, 0, ff->fontcv, NULL);
+    caca_set_canvas_handle(ff->fontcv, 0, c * ff->height);
+    caca_blit(ff->charcv, 0, 0, ff->fontcv, NULL);
 
     /* Check whether we reached the end of the screen */
@@ -177 +177 @@
             /* Compute how much spaces we can eat from the new glyph */
             for(xright = 0; xright < overlap; xright++)
-                if(cucul_get_char(ff->charcv, xright, y) != ' ')
+                if(caca_get_char(ff->charcv, xright, y) != ' ')
                     break;
 
             /* Compute how much spaces we can eat from the previous glyph */
             for(xleft = 0; xright + xleft < overlap && xleft < ff->x; xleft++)
-                if(cucul_get_char(cv, ff->x - 1 - xleft, ff->y + y) != ' ')
+                if(caca_get_char(cv, ff->x - 1 - xleft, ff->y + y) != ' ')
                     break;
 
@@ -193 +193 @@
             {
                 if(xleft < ff->x &&
-                    hsmush(cucul_get_char(cv, ff->x - 1 - xleft, ff->y + y),
-                          cucul_get_char(ff->charcv, xright, y),
+                    hsmush(caca_get_char(cv, ff->x - 1 - xleft, ff->y + y),
+                          caca_get_char(ff->charcv, xright, y),
                           ff->hsmushrule))
                     xleft++;
@@ -220 +220 @@
 #if 0 /* deactivated for libcaca insertion */
     if(attr)
-        cucul_set_attr(cv, attr);
+        caca_set_attr(cv, attr);
 #endif
-    cucul_set_canvas_size(cv, ff->w, ff->h);
-
-    /* Render our char (FIXME: create a rect-aware cucul_blit_canvas?) */
+    caca_set_canvas_size(cv, ff->w, ff->h);
+
+    /* Render our char (FIXME: create a rect-aware caca_blit_canvas?) */
     for(y = 0; y < h; y++)
         for(x = 0; x < w; x++)
     {
         uint32_t ch1, ch2;
-        //uint32_t tmpat = cucul_get_attr(ff->fontcv, x, y + c * ff->height);
-        ch2 = cucul_get_char(ff->charcv, x, y);
+        //uint32_t tmpat = caca_get_attr(ff->fontcv, x, y + c * ff->height);
+        ch2 = caca_get_char(ff->charcv, x, y);
         if(ch2 == ' ')
             continue;
-        ch1 = cucul_get_char(cv, ff->x + x - overlap, ff->y + y);
-        /* FIXME: this could be changed to cucul_put_attr() when the
-         * function is fixed in libcucul */
-        //cucul_set_attr(cv, tmpat);
+        ch1 = caca_get_char(cv, ff->x + x - overlap, ff->y + y);
+        /* FIXME: this could be changed to caca_put_attr() when the
+         * function is fixed in libcaca */
+        //caca_set_attr(cv, tmpat);
         if(ch1 == ' ' || ff->hmode != H_SMUSH)
-            cucul_put_char(cv, ff->x + x - overlap, ff->y + y, ch2);
+            caca_put_char(cv, ff->x + x - overlap, ff->y + y, ch2);
         else
-            cucul_put_char(cv, ff->x + x - overlap, ff->y + y,
+            caca_put_char(cv, ff->x + x - overlap, ff->y + y,
                            hsmush(ch1, ch2, ff->hsmushrule));
-        //cucul_put_attr(cv, ff->x + x, ff->y + y, tmpat);
+        //caca_put_attr(cv, ff->x + x, ff->y + y, tmpat);
     }
 
@@ -251 +251 @@
 }
 
-int cucul_flush_figlet(cucul_canvas_t *cv)
-{
-    cucul_figfont_t *ff = cv->ff;
+int caca_flush_figlet(caca_canvas_t *cv)
+{
+    caca_figfont_t *ff = cv->ff;
     int x, y;
 
     //ff->torender = cv;
-    //cucul_set_canvas_size(ff->torender, ff->w, ff->h);
-    cucul_set_canvas_size(cv, ff->w, ff->h);
+    //caca_set_canvas_size(ff->torender, ff->w, ff->h);
+    caca_set_canvas_size(cv, ff->w, ff->h);
 
     /* FIXME: do this somewhere else, or record hardblank positions */
     for(y = 0; y < ff->h; y++)
         for(x = 0; x < ff->w; x++)
-            if(cucul_get_char(cv, x, y) == 0xa0)
-            {
-                uint32_t attr = cucul_get_attr(cv, x, y);
-                cucul_put_char(cv, x, y, ' ');
-                cucul_put_attr(cv, x, y, attr);
+            if(caca_get_char(cv, x, y) == 0xa0)
+            {
+                uint32_t attr = caca_get_attr(cv, x, y);
+                caca_put_char(cv, x, y, ' ');
+                caca_put_attr(cv, x, y, attr);
             }
 
@@ -273 +273 @@
     ff->w = ff->h = 0;
 
-    //cv = cucul_create_canvas(1, 1); /* XXX */
+    //cv = caca_create_canvas(1, 1); /* XXX */
 
     /* from render.c */
-    ff->lines += cucul_get_canvas_height(cv);
+    ff->lines += caca_get_canvas_height(cv);
 
     return 0;
@@ -284 +284 @@
 #define EXT_GLYPHS (STD_GLYPHS + 7)
 
-static cucul_figfont_t * open_figfont(char const *path)
+static caca_figfont_t * open_figfont(char const *path)
 {
     char altpath[2048];
     char buf[2048];
     char hardblank[10];
-    cucul_figfont_t *ff;
+    caca_figfont_t *ff;
     char *data = NULL;
-    cucul_file_t *f;
+    caca_file_t *f;
     int i, j, size, comment_lines;
 
-    ff = malloc(sizeof(cucul_figfont_t));
+    ff = malloc(sizeof(caca_figfont_t));
     if(!ff)
     {
@@ -302 +302 @@
 
     /* Open font: if not found, try .tlf, then .flf */
-    f = cucul_file_open(path, "r");
+    f = caca_file_open(path, "r");
 #if !defined __KERNEL__ && defined HAVE_SNPRINTF
 
@@ -313 +313 @@
         snprintf(altpath, 2047, "%s.tlf", path);
         altpath[2047] = '\0';
-        f = cucul_file_open(altpath, "r");
+        f = caca_file_open(altpath, "r");
     }
     if(!f)
@@ -319 +319 @@
         snprintf(altpath, 2047, "%s.flf", path);
         altpath[2047] = '\0';
-        f = cucul_file_open(altpath, "r");
+        f = caca_file_open(altpath, "r");
     }
 #endif
@@ -333 +333 @@
     ff->full_layout = 0;
     ff->codetag_count = 0;
-    cucul_file_gets(f, buf, 2048);
+    caca_file_gets(f, buf, 2048);
     if(sscanf(buf, "%*[ft]lf2a%6s %u %u %u %i %u %u %u %u\n", hardblank,
               &ff->height, &ff->baseline, &ff->max_length,
@@ -340 +340 @@
     {
         debug("figfont error: `%s' has invalid header: %s", path, buf);
-        cucul_file_close(f);
+        caca_file_close(f);
         free(ff);
         seterrno(EINVAL);
@@ -352 +352 @@
         debug("figfont error: `%s' has invalid layout %i/%u",
                 path, ff->old_layout, ff->full_layout);
-        cucul_file_close(f);
+        caca_file_close(f);
         free(ff);
         seterrno(EINVAL);
@@ -358 +358 @@
     }
 
-    ff->hardblank = cucul_utf8_to_utf32(hardblank, NULL);
+    ff->hardblank = caca_utf8_to_utf32(hardblank, NULL);
 
     /* Skip comment lines */
     for(i = 0; i < comment_lines; i++)
-        cucul_file_gets(f, buf, 2048);
+        caca_file_gets(f, buf, 2048);
 
     /* Read mandatory characters (32-127, 196, 214, 220, 228, 246, 252, 223)
@@ -369 +369 @@
     ff->lookup = NULL;
 
-    for(i = 0, size = 0; !cucul_file_eof(f); ff->glyphs++)
+    for(i = 0, size = 0; !caca_file_eof(f); ff->glyphs++)
     {
         if((ff->glyphs % 2048) == 0)
@@ -386 +386 @@
         else
         {
-            if(cucul_file_gets(f, buf, 2048) == NULL)
+            if(caca_file_gets(f, buf, 2048) == NULL)
                 break;
 
@@ -397 +397 @@
             {
                 for(j = 0; j < ff->height; j++)
-                    cucul_file_gets(f, buf, 2048);
+                    caca_file_gets(f, buf, 2048);
                 continue;
             }
@@ -424 +424 @@
                 data = realloc(data, size += 2048);
 
-            cucul_file_gets(f, data + i, 2048);
+            caca_file_gets(f, data + i, 2048);
             i = (uintptr_t)strchr(data + i, 0) - (uintptr_t)data;
         }
     }
 
-    cucul_file_close(f);
+    caca_file_close(f);
 
     if(ff->glyphs < EXT_GLYPHS)
@@ -443 +443 @@
 
     /* Import buffer into canvas */
-    ff->fontcv = cucul_create_canvas(0, 0);
-    cucul_import_memory(ff->fontcv, data, i, "utf8");
+    ff->fontcv = caca_create_canvas(0, 0);
+    caca_import_memory(ff->fontcv, data, i, "utf8");
     free(data);
 
@@ -455 +455 @@
         for(i = ff->max_length; i--;)
         {
-            ch = cucul_get_char(ff->fontcv, i, j);
+            ch = caca_get_char(ff->fontcv, i, j);
 
             /* Replace hardblanks with U+00A0 NO-BREAK SPACE */
             if(ch == ff->hardblank)
-                cucul_put_char(ff->fontcv, i, j, ch = 0xa0);
+                caca_put_char(ff->fontcv, i, j, ch = 0xa0);
 
             if(oldch && ch != oldch)
@@ -467 +467 @@
             }
             else if(oldch && ch == oldch)
-                cucul_put_char(ff->fontcv, i, j, ' ');
+                caca_put_char(ff->fontcv, i, j, ' ');
             else if(ch != ' ')
             {
                 oldch = ch;
-                cucul_put_char(ff->fontcv, i, j, ' ');
+                caca_put_char(ff->fontcv, i, j, ' ');
             }
         }
@@ -479 +479 @@
 }
 
-int free_figfont(cucul_figfont_t *ff)
-{
-    cucul_free_canvas(ff->fontcv);
+int free_figfont(caca_figfont_t *ff)
+{
+    caca_free_canvas(ff->fontcv);
     free(ff->lookup);
     free(ff);