add HDC image in project file

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

bsp/stm32_radio/project.Opt

@@ -11,7 +11,7 @@
  DaveTm { 0,0,0,0,0,0,0,0 }
 
 Target (RT-Thread STM32 Radio), 0x0004 // Tools: 'ARM-ADS'
-GRPOPT 1,(Startup),1,0,0
+GRPOPT 1,(Startup),0,0,0
 GRPOPT 2,(Kernel),0,0,0
 GRPOPT 3,(STM32),0,0,0
 GRPOPT 4,(StdPeriph_Driver),0,0,0
@@ -20,9 +20,7 @@ GRPOPT 6,(finsh),0,0,0
 GRPOPT 7,(Filesystem),0,0,0
 GRPOPT 8,(LwIP),0,0,0
 GRPOPT 9,(mp3),0,0,0
-GRPOPT 10,(RTGUI),0,0,0
-GRPOPT 11,(libpng),0,0,0
-GRPOPT 12,(libz),0,0,0
+GRPOPT 10,(RTGUI),1,0,0
 
 OPTFFF 1,1,5,0,0,0,0,0,<.\rtconfig.h><rtconfig.h> 
 OPTFFF 1,2,5,0,0,0,0,0,<.\board.h><board.h> 
@@ -179,59 +177,35 @@ OPTFFF 10,152,1,0,0,0,0,0,<..\..\rtgui\common\rtgui_object.c><rtgui_object.c>
 OPTFFF 10,153,1,385875968,0,0,0,0,<..\..\rtgui\common\rtgui_system.c><rtgui_system.c> 
 OPTFFF 10,154,1,0,0,0,0,0,<..\..\rtgui\common\rtgui_theme.c><rtgui_theme.c> 
 OPTFFF 10,155,1,0,0,0,0,0,<..\..\rtgui\common\asc12font.c><asc12font.c> 
-OPTFFF 10,156,1,0,0,0,0,0,<..\..\rtgui\common\color.c><color.c> 
-OPTFFF 10,157,1,0,0,0,0,0,<..\..\rtgui\common\dc.c><dc.c> 
-OPTFFF 10,158,1,0,0,0,0,0,<..\..\rtgui\common\dc_buffer.c><dc_buffer.c> 
-OPTFFF 10,159,1,0,0,0,0,0,<..\..\rtgui\common\dc_hw.c><dc_hw.c> 
-OPTFFF 10,160,1,16777216,0,0,0,0,<..\..\rtgui\common\filerw.c><filerw.c> 
-OPTFFF 10,161,1,83886080,0,0,0,0,<..\..\rtgui\common\font.c><font.c> 
-OPTFFF 10,162,1,0,0,0,0,0,<..\..\rtgui\common\image.c><image.c> 
-OPTFFF 10,163,1,0,0,0,0,0,<..\..\rtgui\common\image_xpm.c><image_xpm.c> 
-OPTFFF 10,164,1,0,0,0,0,0,<..\..\rtgui\common\region.c><region.c> 
-OPTFFF 10,165,1,0,0,0,0,0,<..\..\rtgui\server\server.c><server.c> 
-OPTFFF 10,166,1,0,0,0,0,0,<..\..\rtgui\server\driver.c><driver.c> 
-OPTFFF 10,167,1,335544320,0,0,0,0,<..\..\rtgui\server\panel.c><panel.c> 
-OPTFFF 10,168,1,0,0,0,0,0,<..\..\rtgui\widgets\widget.c><widget.c> 
-OPTFFF 10,169,1,0,0,0,0,0,<..\..\rtgui\widgets\window.c><window.c> 
-OPTFFF 10,170,1,0,0,0,0,0,<..\..\rtgui\widgets\workbench.c><workbench.c> 
-OPTFFF 10,171,1,0,0,0,0,0,<..\..\rtgui\widgets\view.c><view.c> 
-OPTFFF 10,172,1,0,0,0,0,0,<..\..\rtgui\widgets\box.c><box.c> 
-OPTFFF 10,173,1,0,0,0,0,0,<..\..\rtgui\widgets\button.c><button.c> 
-OPTFFF 10,174,1,0,0,0,0,0,<..\..\rtgui\widgets\container.c><container.c> 
-OPTFFF 10,175,1,0,0,0,0,0,<..\..\rtgui\widgets\iconbox.c><iconbox.c> 
-OPTFFF 10,176,1,0,0,0,0,0,<..\..\rtgui\widgets\label.c><label.c> 
-OPTFFF 10,177,1,0,0,0,0,0,<..\..\rtgui\widgets\textbox.c><textbox.c> 
-OPTFFF 10,178,1,0,0,0,0,0,<..\..\rtgui\widgets\title.c><title.c> 
-OPTFFF 10,179,1,67108864,0,0,0,0,<..\..\rtgui\widgets\toplevel.c><toplevel.c> 
-OPTFFF 10,180,1,0,0,0,0,0,<..\..\rtgui\server\mouse.c><mouse.c> 
-OPTFFF 10,181,1,0,0,0,0,0,<..\..\rtgui\server\topwin.c><topwin.c> 
-OPTFFF 10,182,1,0,0,0,0,0,<..\..\rtgui\common\caret.c><caret.c> 
-OPTFFF 10,183,1,0,0,0,0,0,<..\..\rtgui\common\image_png.c><image_png.c> 
-OPTFFF 11,184,1,0,0,0,0,0,<..\..\rtgui\common\libpng\pngwutil.c><pngwutil.c> 
-OPTFFF 11,185,1,0,0,0,0,0,<..\..\rtgui\common\libpng\png.c><png.c> 
-OPTFFF 11,186,1,100663296,0,0,0,0,<..\..\rtgui\common\libpng\pngerror.c><pngerror.c> 
-OPTFFF 11,187,1,0,0,0,0,0,<..\..\rtgui\common\libpng\pnggccrd.c><pnggccrd.c> 
-OPTFFF 11,188,1,0,0,0,0,0,<..\..\rtgui\common\libpng\pngget.c><pngget.c> 
-OPTFFF 11,189,1,1,0,0,0,0,<..\..\rtgui\common\libpng\pngmem.c><pngmem.c> 
-OPTFFF 11,190,1,0,0,0,0,0,<..\..\rtgui\common\libpng\pngpread.c><pngpread.c> 
-OPTFFF 11,191,1,268435456,0,0,0,0,<..\..\rtgui\common\libpng\pngread.c><pngread.c> 
-OPTFFF 11,192,1,0,0,0,0,0,<..\..\rtgui\common\libpng\pngrio.c><pngrio.c> 
-OPTFFF 11,193,1,0,0,0,0,0,<..\..\rtgui\common\libpng\pngrtran.c><pngrtran.c> 
-OPTFFF 11,194,1,0,0,0,0,0,<..\..\rtgui\common\libpng\pngrutil.c><pngrutil.c> 
-OPTFFF 11,195,1,0,0,0,0,0,<..\..\rtgui\common\libpng\pngset.c><pngset.c> 
-OPTFFF 11,196,1,0,0,0,0,0,<..\..\rtgui\common\libpng\pngtrans.c><pngtrans.c> 
-OPTFFF 11,197,1,0,0,0,0,0,<..\..\rtgui\common\libpng\pngvcrd.c><pngvcrd.c> 
-OPTFFF 11,198,1,0,0,0,0,0,<..\..\rtgui\common\libpng\pngwio.c><pngwio.c> 
-OPTFFF 11,199,1,0,0,0,0,0,<..\..\rtgui\common\libpng\pngwrite.c><pngwrite.c> 
-OPTFFF 11,200,1,0,0,0,0,0,<..\..\rtgui\common\libpng\pngwtran.c><pngwtran.c> 
-OPTFFF 12,201,1,0,0,0,0,0,<..\..\rtgui\common\libz\zutil.c><zutil.c> 
-OPTFFF 12,202,1,0,0,0,0,0,<..\..\rtgui\common\libz\adler32.c><adler32.c> 
-OPTFFF 12,203,1,0,0,0,0,0,<..\..\rtgui\common\libz\crc32.c><crc32.c> 
-OPTFFF 12,204,1,0,0,0,0,0,<..\..\rtgui\common\libz\infback.c><infback.c> 
-OPTFFF 12,205,1,50331648,0,0,0,0,<..\..\rtgui\common\libz\inffast.c><inffast.c> 
-OPTFFF 12,206,1,0,0,0,0,0,<..\..\rtgui\common\libz\inflate.c><inflate.c> 
-OPTFFF 12,207,1,0,0,0,0,0,<..\..\rtgui\common\libz\inftrees.c><inftrees.c> 
-OPTFFF 12,208,1,0,0,0,0,0,<..\..\rtgui\common\libz\uncompr.c><uncompr.c> 
+OPTFFF 10,156,1,402653184,0,0,0,0,<..\..\rtgui\common\asc16font.c><asc16font.c> 
+OPTFFF 10,157,1,0,0,0,0,0,<..\..\rtgui\common\color.c><color.c> 
+OPTFFF 10,158,1,0,0,0,0,0,<..\..\rtgui\common\dc.c><dc.c> 
+OPTFFF 10,159,1,0,0,0,0,0,<..\..\rtgui\common\dc_buffer.c><dc_buffer.c> 
+OPTFFF 10,160,1,0,0,0,0,0,<..\..\rtgui\common\dc_hw.c><dc_hw.c> 
+OPTFFF 10,161,1,16777216,0,0,0,0,<..\..\rtgui\common\filerw.c><filerw.c> 
+OPTFFF 10,162,1,83886080,0,0,0,0,<..\..\rtgui\common\font.c><font.c> 
+OPTFFF 10,163,1,469762048,0,0,0,0,<..\..\rtgui\common\image.c><image.c> 
+OPTFFF 10,164,1,0,0,0,0,0,<..\..\rtgui\common\image_xpm.c><image_xpm.c> 
+OPTFFF 10,165,1,0,0,0,0,0,<..\..\rtgui\common\image_hdc.c><image_hdc.c> 
+OPTFFF 10,166,1,0,0,0,0,0,<..\..\rtgui\common\region.c><region.c> 
+OPTFFF 10,167,1,0,0,0,0,0,<..\..\rtgui\server\server.c><server.c> 
+OPTFFF 10,168,1,0,0,0,0,0,<..\..\rtgui\server\driver.c><driver.c> 
+OPTFFF 10,169,1,335544320,0,0,0,0,<..\..\rtgui\server\panel.c><panel.c> 
+OPTFFF 10,170,1,0,0,0,0,0,<..\..\rtgui\widgets\widget.c><widget.c> 
+OPTFFF 10,171,1,0,0,0,0,0,<..\..\rtgui\widgets\window.c><window.c> 
+OPTFFF 10,172,1,0,0,0,0,0,<..\..\rtgui\widgets\workbench.c><workbench.c> 
+OPTFFF 10,173,1,0,0,0,0,0,<..\..\rtgui\widgets\view.c><view.c> 
+OPTFFF 10,174,1,0,0,0,0,0,<..\..\rtgui\widgets\box.c><box.c> 
+OPTFFF 10,175,1,0,0,0,0,0,<..\..\rtgui\widgets\button.c><button.c> 
+OPTFFF 10,176,1,0,0,0,0,0,<..\..\rtgui\widgets\container.c><container.c> 
+OPTFFF 10,177,1,0,0,0,0,0,<..\..\rtgui\widgets\iconbox.c><iconbox.c> 
+OPTFFF 10,178,1,0,0,0,0,0,<..\..\rtgui\widgets\label.c><label.c> 
+OPTFFF 10,179,1,0,0,0,0,0,<..\..\rtgui\widgets\textbox.c><textbox.c> 
+OPTFFF 10,180,1,0,0,0,0,0,<..\..\rtgui\widgets\title.c><title.c> 
+OPTFFF 10,181,1,67108864,0,0,0,0,<..\..\rtgui\widgets\toplevel.c><toplevel.c> 
+OPTFFF 10,182,1,0,0,0,0,0,<..\..\rtgui\server\mouse.c><mouse.c> 
+OPTFFF 10,183,1,0,0,0,0,0,<..\..\rtgui\server\topwin.c><topwin.c> 
+OPTFFF 10,184,1,0,0,0,0,0,<..\..\rtgui\common\caret.c><caret.c> 
 
 
 TARGOPT 1, (RT-Thread STM32 Radio)

bsp/stm32_radio/project.Uv2

@@ -13,8 +13,6 @@ Group (Filesystem)
 Group (LwIP)
 Group (mp3)
 Group (RTGUI)
-Group (libpng)
-Group (libz)
 
 File 1,5,<.\rtconfig.h><rtconfig.h>
 File 1,5,<.\board.h><board.h>
@@ -171,6 +169,7 @@ File 10,1,<..\..\rtgui\common\rtgui_object.c><rtgui_object.c>
 File 10,1,<..\..\rtgui\common\rtgui_system.c><rtgui_system.c>
 File 10,1,<..\..\rtgui\common\rtgui_theme.c><rtgui_theme.c>
 File 10,1,<..\..\rtgui\common\asc12font.c><asc12font.c>
+File 10,1,<..\..\rtgui\common\asc16font.c><asc16font.c>
 File 10,1,<..\..\rtgui\common\color.c><color.c>
 File 10,1,<..\..\rtgui\common\dc.c><dc.c>
 File 10,1,<..\..\rtgui\common\dc_buffer.c><dc_buffer.c>
@@ -179,6 +178,7 @@ File 10,1,<..\..\rtgui\common\filerw.c><filerw.c>
 File 10,1,<..\..\rtgui\common\font.c><font.c>
 File 10,1,<..\..\rtgui\common\image.c><image.c>
 File 10,1,<..\..\rtgui\common\image_xpm.c><image_xpm.c>
+File 10,1,<..\..\rtgui\common\image_hdc.c><image_hdc.c>
 File 10,1,<..\..\rtgui\common\region.c><region.c>
 File 10,1,<..\..\rtgui\server\server.c><server.c>
 File 10,1,<..\..\rtgui\server\driver.c><driver.c>
@@ -198,32 +198,6 @@ File 10,1,<..\..\rtgui\widgets\toplevel.c><toplevel.c>
 File 10,1,<..\..\rtgui\server\mouse.c><mouse.c>
 File 10,1,<..\..\rtgui\server\topwin.c><topwin.c>
 File 10,1,<..\..\rtgui\common\caret.c><caret.c>
-File 10,1,<..\..\rtgui\common\image_png.c><image_png.c>
-File 11,1,<..\..\rtgui\common\libpng\pngwutil.c><pngwutil.c>
-File 11,1,<..\..\rtgui\common\libpng\png.c><png.c>
-File 11,1,<..\..\rtgui\common\libpng\pngerror.c><pngerror.c>
-File 11,1,<..\..\rtgui\common\libpng\pnggccrd.c><pnggccrd.c>
-File 11,1,<..\..\rtgui\common\libpng\pngget.c><pngget.c>
-File 11,1,<..\..\rtgui\common\libpng\pngmem.c><pngmem.c>
-File 11,1,<..\..\rtgui\common\libpng\pngpread.c><pngpread.c>
-File 11,1,<..\..\rtgui\common\libpng\pngread.c><pngread.c>
-File 11,1,<..\..\rtgui\common\libpng\pngrio.c><pngrio.c>
-File 11,1,<..\..\rtgui\common\libpng\pngrtran.c><pngrtran.c>
-File 11,1,<..\..\rtgui\common\libpng\pngrutil.c><pngrutil.c>
-File 11,1,<..\..\rtgui\common\libpng\pngset.c><pngset.c>
-File 11,1,<..\..\rtgui\common\libpng\pngtrans.c><pngtrans.c>
-File 11,1,<..\..\rtgui\common\libpng\pngvcrd.c><pngvcrd.c>
-File 11,1,<..\..\rtgui\common\libpng\pngwio.c><pngwio.c>
-File 11,1,<..\..\rtgui\common\libpng\pngwrite.c><pngwrite.c>
-File 11,1,<..\..\rtgui\common\libpng\pngwtran.c><pngwtran.c>
-File 12,1,<..\..\rtgui\common\libz\zutil.c><zutil.c>
-File 12,1,<..\..\rtgui\common\libz\adler32.c><adler32.c>
-File 12,1,<..\..\rtgui\common\libz\crc32.c><crc32.c>
-File 12,1,<..\..\rtgui\common\libz\infback.c><infback.c>
-File 12,1,<..\..\rtgui\common\libz\inffast.c><inffast.c>
-File 12,1,<..\..\rtgui\common\libz\inflate.c><inflate.c>
-File 12,1,<..\..\rtgui\common\libz\inftrees.c><inftrees.c>
-File 12,1,<..\..\rtgui\common\libz\uncompr.c><uncompr.c>
 
 
 Options 1,0,0  // Target 'RT-Thread STM32 Radio'

rtgui/common/asc16font.c

@@ -12,8 +12,9 @@
  * 2009-10-16     Bernard      first version
  */
 #include <rtgui/font.h>
-
-unsigned char asc16_font[] = {
+
+#ifdef RTGUI_USING_FONT16
+const unsigned char asc16_font[] = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x7e, 0x81, 0xa5, 0x81, 0x81, 0xbd, 0x99, 0x81, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00,
 0x00, 0x00, 0x7e, 0xff, 0xdb, 0xff, 0xff, 0xc3, 0xe7, 0xff, 0xff, 0x7e, 0x00, 0x00, 0x00, 0x00,
@@ -291,3 +292,4 @@ struct rtgui_font rtgui_font_asc16 =
 };
 
 /* size = 4096 bytes */
+#endif

rtgui/common/image.c

@@ -14,7 +14,8 @@
 #include <rtthread.h>
 #include <rtgui/image.h>
 
-#include <rtgui/image_xpm.h>
+#include <rtgui/image_xpm.h>
+#include <rtgui/image_hdc.h>
 #include <rtgui/rtgui_system.h>
 
 #include <string.h>

rtgui/include/rtgui/image_hdc.h

+/*
+ * File      : image_xpm.h
+ * This file is part of RT-Thread RTOS
+ * COPYRIGHT (C) 2006 - 2009, RT-Thread Development Team
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rt-thread.org/license/LICENSE
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2009-10-16     Bernard      first version
+ */
+#ifndef __RTGUI_IMAGE_HDC_H__
+#define __RTGUI_IMAGE_HDC_H__
+
+#include <rtgui/image.h>
+
+void rtgui_image_hdc_init(void);
+
+#endif

rtgui/include/rtgui/rtgui_config.h

@@ -22,11 +22,12 @@
 
 /* #define RTGUI_USING_MOUSE_CURSOR */
 
-/* #define RTGUI_USING_FONT16 */
+#define RTGUI_USING_FONT16
 
 // #define RT_USING_STDIO_FILERW
 #define RT_USING_DFS_FILERW
 // #define RTGUI_IMAGE_PNG
+// #define RTGUI_IMAGE_JPG
 
 #define RTGUI_SVR_THREAD_PRIORITY		15
 #define RTGUI_SVR_THREAD_TIMESLICE		5
@@ -35,4 +36,3 @@
 #define RTGUI_APP_THREAD_TIMESLICE		8
 
 #endif
-

rtgui/include/rtgui/rtgui_theme.h

@@ -32,8 +32,8 @@ void rtgui_theme_draw_label(rtgui_label_t* label);
 void rtgui_theme_draw_textbox(rtgui_textbox_t* box);
 void rtgui_theme_draw_iconbox(rtgui_iconbox_t* iconbox);
 
-rtgui_color_t rtgui_theme_default_bc();
-rtgui_color_t rtgui_theme_default_fc();
+rtgui_color_t rtgui_theme_default_bc(void);
+rtgui_color_t rtgui_theme_default_fc(void);
 
 #ifdef __cplusplus
 }

rtgui/widgets/textbox.c

@@ -15,6 +15,8 @@
 #include <rtgui/widgets/textbox.h>
 #include <rtgui/rtgui_theme.h>
 
+#include <ctype.h>
+
 #define RTGUI_TEXTBOX_LINE_MAX		64
 #define RTGUI_TEXTBOX_MARGIN		3