Applied patches from bug report #1276480, "GUI: Accented characters". This

changes quite a lot of things in the font renderer and the convbdf tools, so
there may be regressions, but we want this feature for 0.9.0.

svn-id: r23208

1 files changed, 9 insertions, 2 deletions

diff --git a/graphics/font.h b/graphics/font.h
index 5e8db40610..4c271903c5 100644
--- a/graphics/font.h
+++ b/graphics/font.h
@@ -87,22 +87,29 @@ public:
 	virtual void drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const;
 };
 
-
-
 typedef unsigned short bitmap_t; /* bitmap image unit size*/
 
+struct BBX {
+	int8 w;
+	int8 h;
+	int8 x;
+	int8 y;
+};
+
 /* builtin C-based proportional/fixed font structure */
 /* based on The Microwindows Project http://microwindows.org */
 struct FontDesc {
 	const char *	name;		/* font name*/
 	int		maxwidth;	/* max width in pixels*/
 	int 	height;		/* height in pixels*/
+	int	fbbw, fbbh, fbbx, fbby;	/* max bounding box */
 	int		ascent;		/* ascent (baseline) height*/
 	int		firstchar;	/* first character in bitmap*/
 	int		size;		/* font size in glyphs*/
 	const bitmap_t*	bits;		/* 16-bit right-padded bitmap data*/
 	const unsigned long* offset;	/* offsets into bitmap data*/
 	const unsigned char* width;	/* character widths or NULL if fixed*/
+	const BBX* bbx;			/* character bounding box or NULL if fixed */
 	int		defaultchar;	/* default char (not glyph index)*/
 	long	bits_size;	/* # words of bitmap_t bits*/
 };