add none-fixed font support.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@961 bbd45198-f89e-11dd-88c7-29a3b14d5316

1 files changed, 13 insertions, 13 deletions

diff --git a/components/rtgui/include/rtgui/font.h b/components/rtgui/include/rtgui/font.h
index 512290efde..a1ec7f644a 100644
--- a/components/rtgui/include/rtgui/font.h
+++ b/components/rtgui/include/rtgui/font.h
@@ -35,19 +35,19 @@ struct rtgui_font_engine
 /*

  * bitmap font engine

  */

-/* bitmap font private data */

-struct rtgui_font_bitmap

-{

-	/* bitmap data */

-	const rt_uint8_t* bmp;

-

-	rt_uint16_t width;

-	rt_uint16_t height;

-

-	rt_uint8_t first_char;

-	rt_uint8_t last_char;

+struct rtgui_font_bitmap
+{
+	const rt_uint8_t*  bmp;			/* bitmap font data */
+	const rt_uint8_t*  char_width;	/* each character width, NULL for fixed font */
+	const rt_uint32_t* offset;		/* offset for each character */
+
+	rt_uint16_t width;				/* font width  */
+	rt_uint16_t height;				/* font height */
+
+	rt_uint8_t first_char;
+	rt_uint8_t last_char;
 };

-extern struct rtgui_font_engine bmp_font_engine;

+extern const struct rtgui_font_engine bmp_font_engine;

 

 #include <rtgui/tree.h>

 SPLAY_HEAD(cache_tree, hz_cache);

@@ -87,7 +87,7 @@ struct rtgui_font
 	rt_uint32_t refer_count;

 

 	/* font engine */

-	struct rtgui_font_engine* engine;

+	const struct rtgui_font_engine* engine;

 

 	/* font private data */

 	void* data;