Merge pull request #46 from yangfasheng/master

优化image功能等

include/rtgui/event.h

@@ -417,6 +417,10 @@ struct rtgui_event_touch
 #define RTGUI_TOUCH_MOTION              0x03
 #define RTGUI_EVENT_TOUCH_INIT(e)       RTGUI_EVENT_INIT(&((e)->parent), RTGUI_EVENT_TOUCH)
 
+#ifndef GUIENGINE_CMD_STRING_MAX
+#define GUIENGINE_CMD_STRING_MAX        16
+#endif
+
 struct rtgui_event_command
 {
     _RTGUI_EVENT_WIN_ELEMENTS
@@ -428,7 +432,7 @@ struct rtgui_event_command
     rt_int32_t command_id;
 
     /* command string */
-    char command_string[GUIENGINE_NAME_MAX];
+    char command_string[GUIENGINE_CMD_STRING_MAX];
 };
 #define RTGUI_EVENT_COMMAND_INIT(e) RTGUI_EVENT_INIT(&((e)->parent), RTGUI_EVENT_COMMAND)
 

include/rtgui/rtgui_config.h

@@ -67,6 +67,13 @@
 
 #define GUIENGIN_USING_VFRAMEBUFFER
 
+#ifndef PKG_USING_RGB888_PIXEL_BITS_32
+#ifndef PKG_USING_RGB888_PIXEL_BITS_24
+#define PKG_USING_RGB888_PIXEL_BITS_32
+#define PKG_USING_RGB888_PIXEL_BITS 32
+#endif
+#endif
+
 #ifdef DEBUG_MEMLEAK
 #define rtgui_malloc     rt_malloc
 #define rtgui_realloc    rt_realloc

src/font.c

@@ -156,8 +156,7 @@ struct rtgui_font *rtgui_font_refer(const char *family, rt_uint16_t height)
     rtgui_list_foreach(node, &_rtgui_font_list)
     {
         font = rtgui_list_entry(node, struct rtgui_font, list);
-        if ((rt_strncmp(font->family, family, GUIENGINE_NAME_MAX) == 0) &&
-                font->height == height)
+        if ((rt_strcasecmp(font->family, family) == 0) && font->height == height)
         {
             font->refer_count ++;
             return font;

src/image.c

@@ -55,9 +55,11 @@ static rtgui_list_t _rtgui_system_image_list = {RT_NULL};
 /* initialize rtgui image system */
 void rtgui_system_image_init(void)
 {
+#ifdef GUIENGINE_USING_HDC
     /* always support HDC image */
     rtgui_image_hdc_init();
-
+#endif
+    
 #ifdef GUIENGINE_IMAGE_XPM
     rtgui_image_xpm_init();
 #endif

src/image_hdc.c

@@ -28,6 +28,8 @@
 #include <rtgui/image_hdc.h>
 #include <rtgui/blit.h>
 
+#ifdef GUIENGINE_USING_HDC
+
 #define HDC_MAGIC_LEN       4
 
 #ifdef PKG_USING_FASTLZ
@@ -366,3 +368,4 @@ void rtgui_image_hdc_init()
     rtgui_image_register_engine(&rtgui_image_hdc_engine);
 }
 
+#endif