From 69db2f62c40645c523fc9bb35eb1ac9c796ead98 Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@almesberger.net>
Date: Thu, 13 Sep 2012 15:10:38 -0300
Subject: [PATCH] libtxt/font.c: draw_char returns maximum character width for
 space

---
 tools/libtxt/font.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/libtxt/font.c b/tools/libtxt/font.c
index e321e0c..4e69547 100644
--- a/tools/libtxt/font.c
+++ b/tools/libtxt/font.c
@@ -40,6 +40,7 @@ struct image {
 struct font {
 	struct image *img;
 	struct sym sym[CHARS];
+	int max_width;
 };
 
 
@@ -148,9 +149,13 @@ void free_image(struct image *img)
 static void set_block(struct font *font, int *n,
     int xlast, int x, int y0, int y1)
 {
+	int width = x-xlast-1;
+
+	if (width > font->max_width)
+		font->max_width = width;
 	font->sym[*n].x = xlast+1;
 	font->sym[*n].y = y0;
-	font->sym[*n].w = x-xlast-1;
+	font->sym[*n].w = width;
 	font->sym[*n].h = y1-y0+1;
 	(*n)++;
 }
@@ -269,6 +274,8 @@ int draw_char(void *canvas, int width, int height,
 	const char *cp;
 	const struct sym *sym;
 
+	if (c == ' ')
+		return font->max_width;
 	cp = strchr(charset, c);
 	if (!cp)
 		return 0;