X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=gfx%2Ftext_format.c;h=c59a3af9141cd81442d05f6773319e2ca5ac4bc4;hb=02119aca75e842d92288d5a0ce02558b42267c7f;hp=36dfec37a1698945d59a6a739d96d74e46426e21;hpb=41ee2287b2f2d7ec3e73e998b06076888608ed72;p=bertos.git

diff --git a/gfx/text_format.c b/gfx/text_format.c
index 36dfec37..c59a3af9 100755
--- a/gfx/text_format.c
+++ b/gfx/text_format.c
@@ -15,6 +15,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.4  2006/02/10 12:31:33  bernie
+ *#* Add multiple font support in bitmaps.
+ *#*
+ *#* Revision 1.3  2005/11/27 23:31:58  bernie
+ *#* Reorder includes.
+ *#*
+ *#* Revision 1.2  2005/11/04 18:17:45  bernie
+ *#* Fix header guards and includes for new location of gfx module.
+ *#*
  *#* Revision 1.1  2005/11/04 18:11:35  bernie
  *#* Move graphics stuff from mware/ to gfx/.
  *#*
@@ -57,9 +66,11 @@
  *#*/
 
 #include "text.h"
-#include "formatwr.h" /* _formatted_write() */
-#include "font.h"
-#include "gfx.h"
+
+#include <mware/formatwr.h> /* _formatted_write() */
+#include <gfx/font.h>
+#include <gfx/gfx.h>
+
 #include <stdio.h> /* vsprintf() */
 #include <stdarg.h>
 #include <string.h> /* strlen() */
@@ -159,17 +170,17 @@ int PGM_FUNC(text_xprintf)(struct Bitmap *bm,
 			pad /= 2;
 
 		if (style & TEXT_FILL)
-			gfx_rectFillC(bm, 0, row * FONT_HEIGHT, pad, (row + 1) * FONT_HEIGHT,
+			gfx_rectFillC(bm, 0, row * bm->font->height, pad, (row + 1) * bm->font->height,
 				(style & STYLEF_INVERT) ? 0xFF : 0x00);
 
-		text_setcoord(bm, pad, row * FONT_HEIGHT);
+		text_setcoord(bm, pad, row * bm->font->height);
 	}
 
 	len = PGM_FUNC(text_vprintf)(bm, fmt, ap);
 	va_end(ap);
 
 	if (style & TEXT_FILL)
-		gfx_rectFillC(bm, bm->penX, row * FONT_HEIGHT, bm->width, (row + 1) * FONT_HEIGHT,
+		gfx_rectFillC(bm, bm->penX, row * bm->font->height, bm->width, (row + 1) * bm->font->height,
 			(style & STYLEF_INVERT) ? 0xFF : 0x00);
 
 	/* Restore old style */
@@ -188,7 +199,7 @@ int PGM_FUNC(text_vwidthf)(
 	const char * PGM_ATTR fmt,
 	va_list ap)
 {
-	return PGM_FUNC(vsprintf)(NULL, fmt, ap) * FONT_WIDTH;
+	return PGM_FUNC(vsprintf)(NULL, fmt, ap) * bm->font->width;
 }