* Got rid of the mono9.c renderer. We now have a .tlf font instead.

src/Makefile.am

@@ -5,7 +5,7 @@ toilet_SOURCES = main.c toilet.h \
 	io.c io.h \
 	render.c render.h \
 	filter.c filter.h \
-	term.c mono9.c figlet.c
+	term.c figlet.c
 toilet_CFLAGS = `pkg-config --cflags cucul`
 toilet_LDFLAGS = `pkg-config --libs cucul` @GETOPT_LIBS@ @ZLIB_LIBS@
 

src/main.c

@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
     int infocode = -1;
 
     cx->export = "utf8";
-    cx->font = "mono9";
+    cx->font = "smblock";
     cx->dir = "/usr/share/figlet/";
 
     cx->term_width = 80;

src/mono9.c

@@ -1,131 +0,0 @@
-/*
- *  TOIlet        The Other Implementation’s letters
- *  Copyright (c) 2006 Sam Hocevar <sam@zoy.org>
- *                All Rights Reserved
- *
- *  $Id$
- *
- *  This program is free software; you can redistribute it and/or
- *  modify it under the terms of the Do What The Fuck You Want To
- *  Public License, Version 2, as published by Sam Hocevar. See
- *  http://sam.zoy.org/wtfpl/COPYING for more details.
- */
-
-/*
- * This file contains text to canvas rendering functions.
- */
-
-#include "config.h"
-
-#if defined(HAVE_INTTYPES_H)
-#   include <inttypes.h>
-#endif
-#include <stdlib.h>
-#include <cucul.h>
-
-#include "toilet.h"
-#include "render.h"
-
-static int feed_big(context_t *, uint32_t);
-static int flush_big(context_t *);
-static int end_big(context_t *);
-
-int init_big(context_t *cx)
-{
-    char const * const * fonts;
-
-    fonts = cucul_get_font_list();
-    cx->f = cucul_load_font(fonts[0], 0);
-    cx->buf = malloc(4 * cucul_get_font_width(cx->f)
-                       * cucul_get_font_height(cx->f));
-    cx->onechar = cucul_create_canvas(1, 1);
-    cucul_set_color(cx->onechar, CUCUL_COLOR_WHITE, CUCUL_COLOR_BLACK);
-
-    cx->feed = feed_big;
-    cx->flush = flush_big;
-    cx->end = end_big;
-
-    return 0;
-}
-
-static int feed_big(context_t *cx, uint32_t ch)
-{
-    unsigned int w = cucul_get_font_width(cx->f);
-    unsigned int h = cucul_get_font_height(cx->f);
-    unsigned int x, y;
-
-    switch(ch)
-    {
-        case (uint32_t)'\r':
-            return 0;
-        case (uint32_t)'\n':
-            cx->x = 0;
-            cx->y += h;
-            return 0;
-        case (uint32_t)'\t':
-            cx->x = (((cx->x / w) & ~7) + 8) * w;
-            return 0;
-    }
-
-    /* Check whether we reached the end of the screen */
-    if(cx->x && cx->x + w > cx->term_width)
-    {
-        cx->x = 0;
-        cx->y += h;
-    }
-
-    /* Check whether the current canvas is large enough */
-    if(cx->x + w > cx->w)
-        cx->w = cx->x + w < cx->term_width ? cx->x + w : cx->term_width;
-
-    if(cx->y + h > cx->h)
-        cx->h = cx->y + h;
-
-    cucul_set_canvas_size(cx->cv, cx->w, cx->h);
-
-    /* Render our char */
-    cucul_putchar(cx->onechar, 0, 0, ch);
-    cucul_render_canvas(cx->onechar, cx->f, cx->buf, w, h, 4 * w);
-
-    for(y = 0; y < h; y++)
-       for(x = 0; x < w; x++)
-    {
-        unsigned char c = cx->buf[4 * (x + y * w) + 2];
-
-        if(c >= 0xa0)
-            cucul_putstr(cx->cv, cx->x + x, cx->y + y, "█");
-        else if(c >= 0x80)
-            cucul_putstr(cx->cv, cx->x + x, cx->y + y, "▓");
-        else if(c >= 0x40)
-            cucul_putstr(cx->cv, cx->x + x, cx->y + y, "▒");
-        else if(c >= 0x20)
-            cucul_putstr(cx->cv, cx->x + x, cx->y + y, "░");
-    }
-
-    /* Advance cursor */
-    cx->x += w;
-
-    return 0;
-}
-
-static int flush_big(context_t *cx)
-{
-    cx->torender = cx->cv;
-    cucul_set_canvas_size(cx->torender, cx->w, cx->h);
-
-    cx->x = cx->y = 0;
-    cx->w = cx->h = 0;
-    cx->cv = cucul_create_canvas(1, 1);
-
-    return 0;
-}
-
-static int end_big(context_t *cx)
-{
-    cucul_free_canvas(cx->onechar);
-    free(cx->buf);
-    cucul_free_font(cx->f);
-
-    return 0;
-}
-

src/render.c

@@ -38,9 +38,6 @@ int render_init(context_t *cx)
     cx->lines = 0;
     cx->cv = cucul_create_canvas(0, 0);
 
-    if(!strcasecmp(cx->font, "mono9"))
-        return init_big(cx);
-
     if(!strcasecmp(cx->font, "term"))
         return init_tiny(cx);
 

src/render.h

@@ -16,7 +16,6 @@
  */
 
 extern int init_tiny(context_t *);
-extern int init_big(context_t *);
 extern int init_figlet(context_t *);
 
 extern int render_init(context_t *);