add rt_memory_info function in kernel; cleanup code in dfs_posix.c; add Chinese Font(file cached) support in RTGUI;

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

3 files changed, 31 insertions, 0 deletions

diff --git a/rtgui/include/rtgui/font.h b/rtgui/include/rtgui/font.h
index db5b6857fc..43af8fd6a3 100644
--- a/rtgui/include/rtgui/font.h
+++ b/rtgui/include/rtgui/font.h
@@ -49,6 +49,32 @@ struct rtgui_font_bitmap
 };

 extern struct rtgui_font_engine bmp_font_engine;

 

+#include <rtgui/tree.h>

+SPLAY_HEAD(cache_tree, hz_cache);

+struct hz_cache

+{

+    SPLAY_ENTRY(hz_cache) hz_node;

+

+    rt_uint16_t hz_id;

+};

+

+struct rtgui_hz_file_font

+{

+    struct cache_tree cache_root;

+    rt_uint16_t cache_size;

+

+    /* font size */

+    rt_uint16_t font_size;

+	rt_uint16_t font_data_size;

+

+    /* file descriptor */

+    int fd;

+

+    /* font file name */

+    const char* font_fn;

+};

+extern struct rtgui_font_engine rtgui_hz_file_font_engine;

+

 struct rtgui_font

 {

 	/* font name */

diff --git a/rtgui/include/rtgui/rtgui_config.h b/rtgui/include/rtgui/rtgui_config.h
index 7ae7f633a5..4cce06fab4 100644
--- a/rtgui/include/rtgui/rtgui_config.h
+++ b/rtgui/include/rtgui/rtgui_config.h
@@ -23,6 +23,9 @@
 /* #define RTGUI_USING_MOUSE_CURSOR */

 

 #define RTGUI_USING_FONT16

+#define RTGUI_USING_FONTHZ

+

+#define RTGUI_USING_HZ_FILE

 

 // #define RT_USING_STDIO_FILERW

 #define RT_USING_DFS_FILERW

diff --git a/rtgui/include/rtgui/widgets/view.h b/rtgui/include/rtgui/widgets/view.h
index 3dd6c43e63..c4033c603e 100644
--- a/rtgui/include/rtgui/widgets/view.h
+++ b/rtgui/include/rtgui/widgets/view.h
@@ -41,6 +41,8 @@ struct rtgui_view
 };

 typedef struct rtgui_view rtgui_view_t;

 

+rtgui_type_t *rtgui_view_type_get(void);

+

 rtgui_view_t* rtgui_view_create(const char* title);

 void rtgui_view_destroy(rtgui_view_t* view);