Merge pull request #19 from yangfasheng/master

点阵字体部分功能更新；

include/rtgui/font_fnt.h

@@ -62,6 +62,22 @@ extern const struct rtgui_font_engine fnt_font_engine;
 
 struct rtgui_font *fnt_font_create(const char* filename, const char* font_family);
 
+struct rtgui_fnt_header
+{
+    rt_uint32_t p;
+    rt_uint32_t len1;
+    rt_uint32_t len2;
+    rt_uint32_t asc_offset;
+    rt_uint32_t asc_length;
+    rt_uint8_t w;
+    rt_uint8_t h;
+    rt_uint16_t crc16;
+};
+
+struct rtgui_font *rtgui_fnt_font_create(const char* filename, const char* font_family);
+struct rtgui_font *rtgui_hz_fnt_font_create(const char* filename, const char* font_family, rt_uint8_t font_size);
+struct rtgui_font *rtgui_asc_fnt_font_create(const char* filename, const char* font_family, rt_uint8_t font_size);
+
 #ifdef __cplusplus
 }
 #endif

src/font.c

@@ -48,14 +48,28 @@ void rtgui_font_system_init(void)
 #ifdef GUIENGINE_USING_FONT16
     rtgui_font_system_add_font(&rtgui_font_asc16);
 #ifdef GUIENGINE_USING_FONTHZ
-    //rtgui_font_system_add_font(&rtgui_font_hz16);
+    rtgui_font_system_add_font(&rtgui_font_hz16);
+    {
+        struct rtgui_hz_file_font *hz16 = (struct rtgui_hz_file_font *)rtgui_font_hz16.data;
+        if (hz16->fd < 0)
+        {
+            rtgui_font_system_remove_font(&rtgui_font_hz16);
+        }
+    }
 #endif
 #endif
 
 #ifdef GUIENGINE_USING_FONT12
     rtgui_font_system_add_font(&rtgui_font_asc12);
 #ifdef GUIENGINE_USING_FONTHZ
-    //rtgui_font_system_add_font(&rtgui_font_hz12);
+    rtgui_font_system_add_font(&rtgui_font_hz12);
+    {
+        struct rtgui_hz_file_font *hz12 = (struct rtgui_hz_file_font *)rtgui_font_hz12.data;
+        if (hz12->fd < 0)
+        {
+            rtgui_font_system_remove_font(&rtgui_font_hz12);
+        }
+    }
 #endif
 #endif
 }

src/font_fnt.c

@@ -28,6 +28,20 @@
 #include <rtgui/font_fnt.h>
 #include <rtgui/rtgui_system.h>
 
+#ifdef _WIN32_NATIVE
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <io.h>
+#define open    _open
+#define close   _close
+#define read    _read
+#define write   _write
+#define unlink  _unlink
+#else
+#include <dfs_posix.h>
+#endif
+
 static void rtgui_fnt_font_draw_text(struct rtgui_font *font, struct rtgui_dc *dc, const char *text, rt_ubase_t len, struct rtgui_rect *rect);
 static void rtgui_fnt_font_get_metrics(struct rtgui_font *font, const char *text, rtgui_rect_t *rect);
 const struct rtgui_font_engine fnt_font_engine =
@@ -135,6 +149,248 @@ void rtgui_fnt_font_get_metrics(struct rtgui_font *font, const char *text, rtgui
     }
 }
 
+struct rtgui_font *rtgui_fnt_font_create(const char* filename, const char* font_family)
+{
+    int fd = -1, file_len = 0;
+    struct rtgui_font *font = RT_NULL;
+    struct rtgui_fnt_header *fnt_header = RT_NULL;
+
+    fd = open(filename, O_RDONLY, 0);
+    if (fd < 0)
+    {
+        return RT_NULL;
+    }
+
+    file_len = lseek(fd, 0, SEEK_END);
+    lseek(fd, (file_len - sizeof(struct rtgui_fnt_header)), SEEK_SET);
+
+    /* read fnt header */
+    fnt_header = (struct rtgui_fnt_header*) rtgui_malloc(sizeof(struct rtgui_fnt_header));
+    if (fnt_header)
+    {
+        if (read(fd, fnt_header, sizeof(struct rtgui_fnt_header)) != sizeof(struct rtgui_fnt_header))
+        {
+            rtgui_free(fnt_header);
+            close(fd);
+            return RT_NULL;
+        }
+    }
+
+    /* crc */
+    {
+        rt_uint8_t *data = (rt_uint8_t *)fnt_header;
+        rt_uint16_t crc_h = data[0];
+        rt_uint16_t crc_l = data[1];
+        rt_uint16_t crc;
+
+        for (int i = 2; i < 22; i += 2)
+        {
+            crc_h ^= data[i];
+            crc_l ^= data[i + 1];
+        }
+
+        crc = (crc_h << 8) + crc_l;
+
+        if (crc != fnt_header->crc16 || fnt_header->w == 0 || fnt_header->h == 0)
+        {
+            rtgui_free(fnt_header);
+            close(fd);
+            return RT_NULL;
+        }
+    }
+
+    /* load font */
+    {
+        struct rtgui_font_bitmap *asc = (struct rtgui_font_bitmap*)rtgui_malloc(sizeof(struct rtgui_font_bitmap));
+        struct rtgui_hz_file_font *hz = (struct rtgui_hz_file_font*)rtgui_malloc(sizeof(struct rtgui_hz_file_font));
+        struct rtgui_font *asc_font = (struct rtgui_font*)rtgui_malloc(sizeof(struct rtgui_font));
+        struct rtgui_font *hz_font = (struct rtgui_font*)rtgui_malloc(sizeof(struct rtgui_font));
+
+        /* load asc */
+        if (asc && asc_font)
+        {
+            asc->bmp = (const rt_uint8_t *)rtgui_malloc(fnt_header->asc_length);
+            if (asc->bmp)
+            {
+                asc->char_width = RT_NULL;
+                asc->offset = RT_NULL;
+                asc->width = fnt_header->w / 2;
+                asc->height = fnt_header->h;
+                asc->first_char = 0x00;
+                asc->last_char = 0xFF;
+
+                lseek(fd, fnt_header->asc_offset, SEEK_SET);
+                if (read(fd, (void*)asc->bmp, fnt_header->asc_length) != fnt_header->asc_length)
+                {
+                    rtgui_free((void*)asc->bmp);
+                    rtgui_free(asc);
+                    rtgui_free(asc_font);
+                }
+                else
+                {
+                    asc_font->family = rt_strdup("asc");
+                    asc_font->height = fnt_header->h;
+                    asc_font->refer_count = 1;
+                    asc_font->engine = &bmp_font_engine;
+                    asc_font->data = (void *)asc;
+
+                    rtgui_font_system_add_font(asc_font);
+                }
+            }
+        }
+#ifdef GUIENGINE_USING_HZ_FILE
+        /* load hz */
+        if (hz && hz_font && fnt_header->asc_offset != 0)
+        {
+            struct cache_tree _cache_root = { NULL };
+
+            hz->cache_root = _cache_root;
+            hz->cache_size = 0;
+            hz->font_size = fnt_header->h;
+            hz->font_data_size = (fnt_header->h + 7) / 8 * fnt_header->h;
+            hz->fd = -1;
+            hz->font_fn = rt_strdup(filename);
+
+            hz_font->family = rt_strdup(font_family);
+            hz_font->height = fnt_header->h;
+            hz_font->refer_count = 1;
+            hz_font->engine = &rtgui_hz_file_font_engine;
+            hz_font->data = (void *)hz;
+        }
+        else
+        {
+            rtgui_free(hz);
+            rtgui_free(hz_font);
+            hz_font = RT_NULL;
+        }
+#endif
+        close(fd);
+
+        if (hz_font)
+        {
+            rtgui_font_system_add_font(hz_font);
+            font = hz_font;
+        }
+        else if (asc_font)
+        {
+            font = asc_font;
+        }
+    }
+
+    return font;
+}
+
+struct rtgui_font *rtgui_hz_fnt_font_create(const char* filename, const char* font_family, rt_uint8_t font_size)
+{
+#ifdef GUIENGINE_USING_HZ_FILE
+    int fd = -1;
+    struct rtgui_font *font = RT_NULL;
+
+    fd = open(filename, O_RDONLY, 0);
+    if (fd < 0)
+    {
+        return RT_NULL;
+    }
+
+    close(fd);
+
+    /* load font */
+    {
+        struct rtgui_hz_file_font *hz = (struct rtgui_hz_file_font*)rtgui_malloc(sizeof(struct rtgui_hz_file_font));
+        struct rtgui_font *hz_font = (struct rtgui_font*)rtgui_malloc(sizeof(struct rtgui_font));
+
+        /* load hz */
+        if (hz && hz_font)
+        {
+            struct cache_tree _cache_root = { NULL };
+
+            hz->cache_root = _cache_root;
+            hz->cache_size = 0;
+            hz->font_size = font_size;
+            hz->font_data_size = (font_size + 7) / 8 * font_size;
+            hz->fd = -1;
+            hz->font_fn = rt_strdup(filename);
+
+            hz_font->family = rt_strdup(font_family);
+            hz_font->height = font_size;
+            hz_font->refer_count = 1;
+            hz_font->engine = &rtgui_hz_file_font_engine;
+            hz_font->data = (void *)hz;
+
+            rtgui_font_system_add_font(hz_font);
+            font = hz_font;
+        }
+        else
+        {
+            rtgui_free(hz);
+            rtgui_free(hz_font);
+        }
+
+    }
+
+    return font;
+#endif
+    return RT_NULL;
+}
+
+struct rtgui_font *rtgui_asc_fnt_font_create(const char* filename, const char* font_family, rt_uint8_t font_size)
+{
+    int fd = -1, file_len = 0;
+    struct rtgui_font *font = RT_NULL;
+
+    fd = open(filename, O_RDONLY, 0);
+    if (fd < 0)
+    {
+        return RT_NULL;
+    }
+
+    file_len = lseek(fd, 0, SEEK_END);
+    lseek(fd, 0, SEEK_SET);
+
+    /* load font */
+    {
+        struct rtgui_font_bitmap *asc = (struct rtgui_font_bitmap*)rtgui_malloc(sizeof(struct rtgui_font_bitmap));
+        struct rtgui_font *asc_font = (struct rtgui_font*)rtgui_malloc(sizeof(struct rtgui_font));
+
+        /* load asc */
+        if (asc && asc_font)
+        {
+            asc->bmp = (const rt_uint8_t *)rtgui_malloc(file_len);
+            if (asc->bmp)
+            {
+                asc->char_width = RT_NULL;
+                asc->offset = RT_NULL;
+                asc->width = font_size / 2;
+                asc->height = font_size;
+                asc->first_char = 0x00;
+                asc->last_char = 0xFF;
+
+                if (read(fd, (void*)asc->bmp, file_len) != file_len)
+                {
+                    rtgui_free((void*)asc->bmp);
+                    rtgui_free(asc);
+                    rtgui_free(asc_font);
+                }
+                else
+                {
+                    asc_font->family = rt_strdup("asc");
+                    asc_font->height = font_size;
+                    asc_font->refer_count = 1;
+                    asc_font->engine = &bmp_font_engine;
+                    asc_font->data = (void *)asc;
+
+                    rtgui_font_system_add_font(asc_font);
+                    font = asc_font;
+                }
+            }
+        }
+
+        close(fd);
+    }
+
+    return font;
+}
+
 #ifdef GUIENG_USING_FNT_FILE
 #include <dfs_posix.h>
 

src/font_hz_file.c

@@ -186,23 +186,25 @@ static void _rtgui_hz_file_font_draw_text(struct rtgui_hz_file_font *hz_file_fon
 
         /* get font pixel data */
         font_ptr = _font_cache_get(hz_file_font, *str | (*(str + 1) << 8));
-
-        /* draw word */
-        for (i = 0; i < h; i++)
+        if (font_ptr)
         {
-            for (j = 0; j < word_bytes; j++)
-                for (k = 0; k < 8; k++)
-                {
-                    if (((font_ptr[i * word_bytes + j] >> (7 - k)) & 0x01) != 0 &&
-                            (rect->x1 + 8 * j + k < rect->x2))
-                    {
-                        rtgui_dc_draw_point(dc, rect->x1 + 8 * j + k, rect->y1 + i);
-                    }
-                    else if (style & RTGUI_TEXTSTYLE_DRAW_BACKGROUND)
+            /* draw word */
+            for (i = 0; i < h; i++)
+            {
+                for (j = 0; j < word_bytes; j++)
+                    for (k = 0; k < 8; k++)
                     {
-                        rtgui_dc_draw_color_point(dc, rect->x1 + 8 * j + k, rect->y1 + i, bc);
+                        if (((font_ptr[i * word_bytes + j] >> (7 - k)) & 0x01) != 0 &&
+                                (rect->x1 + 8 * j + k < rect->x2))
+                        {
+                            rtgui_dc_draw_point(dc, rect->x1 + 8 * j + k, rect->y1 + i);
+                        }
+                        else if (style & RTGUI_TEXTSTYLE_DRAW_BACKGROUND)
+                        {
+                            rtgui_dc_draw_color_point(dc, rect->x1 + 8 * j + k, rect->y1 + i, bc);
+                        }
                     }
-                }
+            }
         }
 
         /* move x to next character */