From c82228089691a3619edb740ac85b487185812c07 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Sun, 13 Feb 2011 12:48:50 +0000
Subject: [PATCH] Rename figfont into charfont. We will support far more than
 figfonts in the future.

---
 caca/caca.h           | 17 ++++++++++++++---
 caca/caca_internals.h |  3 +--
 caca/figfont.c        | 24 ++++++++++++------------
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/caca/caca.h b/caca/caca.h
index 857297a..b2336eb 100644
--- a/caca/caca.h
+++ b/caca/caca.h
@@ -49,7 +49,9 @@ extern "C"
 typedef struct caca_canvas caca_canvas_t;
 /** dither structure */
 typedef struct caca_dither caca_dither_t;
-/** font structure */
+/** character font structure */
+typedef struct caca_charfont caca_charfont_t;
+/** bitmap font structure */
 typedef struct caca_font caca_font_t;
 /** file handle structure */
 typedef struct caca_file caca_file_t;
@@ -413,9 +415,18 @@ __extern int caca_dither_bitmap(caca_canvas_t *, int, int, int, int,
 __extern int caca_free_dither(caca_dither_t *);
 /*  @} */
 
-/** \defgroup caca_font libcaca font handling
+/** \defgroup caca_charfont libcaca character font handling
  *
- *  These functions provide font handling routines and high quality
+ *  These functions provide character font handling routines.
+ *
+ *  @{ */
+__extern caca_charfont_t *caca_load_charfont(void const *, size_t);
+__extern int caca_free_charfont(caca_charfont_t *);
+/*  @} */
+
+/** \defgroup caca_font libcaca bitmap font handling
+ *
+ *  These functions provide bitmap font handling routines and high quality
  *  canvas to bitmap rendering.
  *
  *  @{ */
diff --git a/caca/caca_internals.h b/caca/caca_internals.h
index 3abaf9d..4be5826 100644
--- a/caca/caca_internals.h
+++ b/caca/caca_internals.h
@@ -19,7 +19,6 @@
 
 typedef struct caca_timer caca_timer_t;
 typedef struct caca_privevent caca_privevent_t;
-typedef struct caca_figfont caca_figfont_t;
 
 #if !defined(_DOXYGEN_SKIP_ME)
 #   define STAT_VALUES 32
@@ -75,7 +74,7 @@ struct caca_canvas
     uint32_t curattr;
 
     /* FIGfont management */
-    caca_figfont_t *ff;
+    caca_charfont_t *ff;
 };
 
 /* Graphics driver */
diff --git a/caca/figfont.c b/caca/figfont.c
index e01129c..c128f51 100644
--- a/caca/figfont.c
+++ b/caca/figfont.c
@@ -29,7 +29,7 @@
 #include "caca.h"
 #include "caca_internals.h"
 
-struct caca_figfont
+struct caca_charfont
 {
     int term_width;
     int x, y, w, h, lines;
@@ -47,17 +47,17 @@ struct caca_figfont
 };
 
 static uint32_t hsmush(uint32_t ch1, uint32_t ch2, int rule);
-static caca_figfont_t * open_figfont(char const *);
-static int free_figfont(caca_figfont_t *);
+static caca_charfont_t * open_charfont(char const *);
+static int free_charfont(caca_charfont_t *);
 
 /** \brief load a figfont and attach it to a canvas */
 int caca_canvas_set_figfont(caca_canvas_t *cv, char const *path)
 {
-    caca_figfont_t *ff = NULL;
+    caca_charfont_t *ff = NULL;
 
     if(path)
     {
-        ff = open_figfont(path);
+        ff = open_charfont(path);
         if(!ff)
             return -1;
     }
@@ -67,7 +67,7 @@ int caca_canvas_set_figfont(caca_canvas_t *cv, char const *path)
         caca_free_canvas(cv->ff->charcv);
         free(cv->ff->left);
         free(cv->ff->right);
-        free_figfont(cv->ff);
+        free_charfont(cv->ff);
     }
 
     cv->ff = ff;
@@ -129,7 +129,7 @@ int caca_canvas_set_figfont(caca_canvas_t *cv, char const *path)
 /** \brief paste a character using the current figfont */
 int caca_put_figchar(caca_canvas_t *cv, uint32_t ch)
 {
-    caca_figfont_t *ff = cv->ff;
+    caca_charfont_t *ff = cv->ff;
     int c, w, h, x, y, overlap, extra, xleft, xright;
 
     if (!ff)
@@ -253,7 +253,7 @@ int caca_put_figchar(caca_canvas_t *cv, uint32_t ch)
 /** \brief flush the figlet context */
 int caca_flush_figlet(caca_canvas_t *cv)
 {
-    caca_figfont_t *ff = cv->ff;
+    caca_charfont_t *ff = cv->ff;
     int x, y;
 
     if (!ff)
@@ -287,19 +287,19 @@ int caca_flush_figlet(caca_canvas_t *cv)
 #define STD_GLYPHS (127 - 32)
 #define EXT_GLYPHS (STD_GLYPHS + 7)
 
-static caca_figfont_t * open_figfont(char const *path)
+static caca_charfont_t * open_charfont(char const *path)
 {
 #if !defined __KERNEL__ && defined HAVE_SNPRINTF
     char altpath[2048];
 #endif
     char buf[2048];
     char hardblank[10];
-    caca_figfont_t *ff;
+    caca_charfont_t *ff;
     char *data = NULL;
     caca_file_t *f;
     int i, j, size, comment_lines;
 
-    ff = malloc(sizeof(caca_figfont_t));
+    ff = malloc(sizeof(caca_charfont_t));
     if(!ff)
     {
         seterrno(ENOMEM);
@@ -484,7 +484,7 @@ static caca_figfont_t * open_figfont(char const *path)
     return ff;
 }
 
-int free_figfont(caca_figfont_t *ff)
+int free_charfont(caca_charfont_t *ff)
 {
     caca_free_canvas(ff->fontcv);
     free(ff->lookup);