Part 10 of adding two new ctk configuration macros:
- CTK_CONF_ICON_BITMAPS
- CTK_CONF_ICON_TEXTMAPS
These macros control if icon bitmaps resp. textmaps are used at all. For all platfroms only needing one or the other this saves memory as the application description files don't define the unused stuff anymore. Especially for the conio based platforms this is a significant benefit.
Note: For all platforms (apart for Apple2 and Atari) I initially defined both macros as 1 which should lead to an unchanged bevaviour. I leave it up to the platform maintainers to make use of the new macros by optionally setting one to 0.
diff --git a/contiki-c64/apps/blueround-dsc.c b/contiki-c64/apps/blueround-dsc.c
index f6621ce..cfcebee 100644
--- a/contiki-c64/apps/blueround-dsc.c
+++ b/contiki-c64/apps/blueround-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: blueround-dsc.c,v 1.2 2003/04/24 17:02:52 adamdunkels Exp $
+ * $Id: blueround-dsc.c,v 1.3 2004/06/27 12:43:33 oliverschmidt Exp $
*
*/
@@ -43,6 +43,7 @@
blueround_init,
&blueround_icon);
/*-----------------------------------------------------------------------------------*/
+#if CTK_CONF_ICON_BITMAPS
static unsigned char blueroundicon_bitmap[3*3*8] = {
0xfe,0xf8,0xe0,0xc0,0xc0,0x80,0x80,0x00,
0x00,0x55,0xaa,0x00,0xaa,0x00,0x00,0x00,
@@ -56,13 +57,15 @@
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x01,0x01,0x03,0x03,0x07,0x1f,0x7f
};
+#endif /* CTK_CONF_ICON_BITMAPS */
-
+#if CTK_CONF_ICON_TEXTMAPS
static char blueroundicon_textmap[9] = {
'(', '=', ')',
'|', 'o', '|',
'(', '-', ')'
};
+#endif /* CTK_CONF_ICON_TEXTMAPS */
static struct ctk_icon blueround_icon =
{CTK_ICON("Blueround", blueroundicon_bitmap, blueroundicon_textmap)};
diff --git a/contiki-c64/apps/configedit-dsc.c b/contiki-c64/apps/configedit-dsc.c
index 5dd7f0c..4e6406a 100644
--- a/contiki-c64/apps/configedit-dsc.c
+++ b/contiki-c64/apps/configedit-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: configedit-dsc.c,v 1.3 2003/08/09 13:15:01 adamdunkels Exp $
+ * $Id: configedit-dsc.c,v 1.4 2004/06/27 12:43:33 oliverschmidt Exp $
*
*/
@@ -43,6 +43,7 @@
configedit_init,
&configedit_icon);
/*-----------------------------------------------------------------------------------*/
+#if CTK_CONF_ICON_BITMAPS
static unsigned char tcpipconficon_bitmap[3*3*8] = {
0x00, 0x79, 0x43, 0x73, 0x47, 0x77, 0x47, 0x6f,
0x00, 0xfe, 0xfe, 0xfc, 0xfc, 0xfc, 0xf8, 0xfb,
@@ -56,13 +57,15 @@
0xfc, 0xff, 0xfe, 0xff, 0xff, 0xff, 0xf7, 0x00,
0x00, 0x80, 0x00, 0x00, 0x00, 0x84, 0xf0, 0x00
};
+#endif /* CTK_CONF_ICON_BITMAPS */
+#if CTK_CONF_ICON_TEXTMAPS
static char tcpipconficon_textmap[9] = {
'C', 'F', 'G',
' ', ' ', ' ',
'C', 'F', 'G'
};
-
+#endif /* CTK_CONF_ICON_TEXTMAPS */
static struct ctk_icon configedit_icon =
{CTK_ICON("Configuration", tcpipconficon_bitmap, tcpipconficon_textmap)};
diff --git a/contiki-c64/apps/default-dsc.c b/contiki-c64/apps/default-dsc.c
index a248d8e..954eb86 100644
--- a/contiki-c64/apps/default-dsc.c
+++ b/contiki-c64/apps/default-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: default-dsc.c,v 1.2 2003/04/24 17:02:52 adamdunkels Exp $
+ * $Id: default-dsc.c,v 1.3 2004/06/27 12:43:33 oliverschmidt Exp $
*
*/
@@ -43,6 +43,7 @@
default_init,
&default_icon);
/*-----------------------------------------------------------------------------------*/
+#if CTK_CONF_ICON_BITMAPS
static unsigned char defaulticon_bitmap[3*3*8] = {
0xff,0xff,0xc0,0xcf,0xc0,0xc3,0xc0,0xc0,
0xff,0xff,0x00,0xff,0x00,0xff,0x00,0x00,
@@ -54,12 +55,15 @@
0x00,0x00,0x00,0x00,0xff,0x00,0xff,0xff,
0x0b,0x0b,0x0b,0x0b,0xfb,0x03,0xff,0xff
};
+#endif /* CTK_CONF_ICON_BITMAPS */
+#if CTK_CONF_ICON_TEXTMAPS
static char defaulticon_textmap[9] = {
'+', '=', '+',
'|', 'D', '|',
'+', '-', '+'
};
+#endif /* CTK_CONF_ICON_TEXTMAPS */
static struct ctk_icon default_icon =
{CTK_ICON("Default", defaulticon_bitmap, defaulticon_textmap)};
diff --git a/contiki-c64/apps/enabler-dsc.c b/contiki-c64/apps/enabler-dsc.c
index b0344e1..bbfe932 100644
--- a/contiki-c64/apps/enabler-dsc.c
+++ b/contiki-c64/apps/enabler-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: enabler-dsc.c,v 1.1 2003/04/24 17:07:41 adamdunkels Exp $
+ * $Id: enabler-dsc.c,v 1.2 2004/06/27 12:43:33 oliverschmidt Exp $
*
*/
@@ -43,6 +43,7 @@
enabler_init,
&enabler_icon);
/*-----------------------------------------------------------------------------------*/
+#if CTK_CONF_ICON_BITMAPS
static unsigned char enablericon_bitmap[3*3*8] = {
0xff,0xff,0xff,0xfc,0xf0,0xf0,0xe0,0xe0,
0xff,0xff,0xff,0x00,0x00,0x00,0x00,0x00,
@@ -56,13 +57,15 @@
0x00,0x00,0x00,0x00,0x00,0xff,0xff,0xff,
0x07,0x07,0x0f,0x0f,0x3f,0xff,0xff,0xff
};
+#endif /* CTK_CONF_ICON_BITMAPS */
-
+#if CTK_CONF_ICON_TEXTMAPS
static char enablericon_textmap[9] = {
'(', '=', ')',
'|', 'o', '|',
'(', '-', ')'
};
+#endif /* CTK_CONF_ICON_TEXTMAPS */
static struct ctk_icon enabler_icon =
{CTK_ICON("Enabler", enablericon_bitmap, enablericon_textmap)};
diff --git a/contiki-c64/apps/memstat-dsc.c b/contiki-c64/apps/memstat-dsc.c
index d8d3d09..17dc291 100644
--- a/contiki-c64/apps/memstat-dsc.c
+++ b/contiki-c64/apps/memstat-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: memstat-dsc.c,v 1.2 2003/08/20 19:53:07 adamdunkels Exp $
+ * $Id: memstat-dsc.c,v 1.3 2004/06/27 12:43:33 oliverschmidt Exp $
*
*/
@@ -43,6 +43,7 @@
memstat_init,
&memstat_icon);
/*-----------------------------------------------------------------------------------*/
+#if CTK_CONF_ICON_BITMAPS
static unsigned char memstaticon_bitmap[3*3*8] = {
0x00, 0x7f, 0x43, 0x4c, 0x58, 0x53, 0x60, 0x6f,
0x00, 0xff, 0x00, 0x7e, 0x00, 0xff, 0x00, 0xff,
@@ -56,12 +57,15 @@
0x07, 0xe7, 0x0f, 0xef, 0x0f, 0x0f, 0xff, 0x00,
0x8e, 0x06, 0x06, 0x06, 0x8e, 0xfe, 0xfe, 0x00
};
+#endif /* CTK_CONF_ICON_BITMAPS */
+#if CTK_CONF_ICON_TEXTMAPS
static char memstaticon_textmap[9] = {
'0', '0', '1',
'0', '1', '0',
'1', '0', '1'
};
+#endif /* CTK_CONF_ICON_TEXTMAPS */
static struct ctk_icon memstat_icon =
{CTK_ICON("Memory stats", memstaticon_bitmap, memstaticon_textmap)};
diff --git a/contiki-c64/apps/plasma-dsc.c b/contiki-c64/apps/plasma-dsc.c
index f52f7c9..a826c5e 100644
--- a/contiki-c64/apps/plasma-dsc.c
+++ b/contiki-c64/apps/plasma-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: plasma-dsc.c,v 1.1 2003/08/20 19:49:44 adamdunkels Exp $
+ * $Id: plasma-dsc.c,v 1.2 2004/06/27 12:43:33 oliverschmidt Exp $
*
*/
@@ -43,6 +43,7 @@
plasma_init,
&plasma_icon);
/*-----------------------------------------------------------------------------------*/
+#if CTK_CONF_ICON_BITMAPS
static unsigned char plasmaicon_bitmap[3*3*8] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -56,12 +57,15 @@
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
};
+#endif /* CTK_CONF_ICON_BITMAPS */
+#if CTK_CONF_ICON_TEXTMAPS
static char plasmaicon_textmap[9] = {
'.', ' ', '.',
'o', ' ', 'o',
'O', ' ', 'O'
};
+#endif /* CTK_CONF_ICON_TEXTMAPS */
static struct ctk_icon plasma_icon =
{CTK_ICON("Plasma", plasmaicon_bitmap, plasmaicon_textmap)};
diff --git a/contiki-c64/apps/ravenpine-dsc.c b/contiki-c64/apps/ravenpine-dsc.c
index 19772b4..97aa639 100644
--- a/contiki-c64/apps/ravenpine-dsc.c
+++ b/contiki-c64/apps/ravenpine-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: ravenpine-dsc.c,v 1.1 2003/08/12 20:13:51 adamdunkels Exp $
+ * $Id: ravenpine-dsc.c,v 1.2 2004/06/27 12:43:33 oliverschmidt Exp $
*
*/
@@ -43,6 +43,7 @@
ravenpine_init,
&ravenpine_icon);
/*-----------------------------------------------------------------------------------*/
+#if CTK_CONF_ICON_BITMAPS
static unsigned char ravenpineicon_bitmap[3*3*8] = {
0x00,0x3f,0x6a,0x40,0x60,0x40,0x60,0x40,
0x00,0xff,0xaa,0x00,0x00,0x00,0x00,0x00,
@@ -56,13 +57,15 @@
0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x00,
0x02,0x02,0x02,0x02,0x02,0x06,0xfc,0x00
};
+#endif /* CTK_CONF_ICON_BITMAPS */
-
+#if CTK_CONF_ICON_TEXTMAPS
static char ravenpineicon_textmap[9] = {
'(', '=', ')',
'|', 'o', '|',
'(', '-', ')'
};
+#endif /* CTK_CONF_ICON_TEXTMAPS */
static struct ctk_icon ravenpine_icon =
{CTK_ICON("Ravenpine", ravenpineicon_bitmap, ravenpineicon_textmap)};
diff --git a/contiki-c64/apps/springlight-dsc.c b/contiki-c64/apps/springlight-dsc.c
index 0dd0f34..9580a51 100644
--- a/contiki-c64/apps/springlight-dsc.c
+++ b/contiki-c64/apps/springlight-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: springlight-dsc.c,v 1.1 2003/04/24 17:07:41 adamdunkels Exp $
+ * $Id: springlight-dsc.c,v 1.2 2004/06/27 12:43:33 oliverschmidt Exp $
*
*/
@@ -43,6 +43,7 @@
springlight_init,
&springlight_icon);
/*-----------------------------------------------------------------------------------*/
+#if CTK_CONF_ICON_BITMAPS
static unsigned char springlighticon_bitmap[3*3*8] = {
0x00,0x3f,0x6a,0x40,0x60,0x40,0x60,0x40,
0x00,0xff,0xaa,0x00,0x00,0x00,0x00,0x00,
@@ -56,13 +57,15 @@
0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x00,
0x02,0x02,0x02,0x02,0x02,0x06,0xfc,0x00
};
+#endif /* CTK_CONF_ICON_BITMAPS */
-
+#if CTK_CONF_ICON_TEXTMAPS
static char springlighticon_textmap[9] = {
'(', '=', ')',
'|', 'o', '|',
'(', '-', ')'
};
+#endif /* CTK_CONF_ICON_TEXTMAPS */
static struct ctk_icon springlight_icon =
{CTK_ICON("Springlight", springlighticon_bitmap, springlighticon_textmap)};
diff --git a/contiki-c64/apps/ssconfig-dsc.c b/contiki-c64/apps/ssconfig-dsc.c
index cb35078..f034d9c 100644
--- a/contiki-c64/apps/ssconfig-dsc.c
+++ b/contiki-c64/apps/ssconfig-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: ssconfig-dsc.c,v 1.1 2003/07/31 23:36:29 adamdunkels Exp $
+ * $Id: ssconfig-dsc.c,v 1.2 2004/06/27 12:43:33 oliverschmidt Exp $
*
*/
@@ -43,6 +43,7 @@
ssconfig_init,
&ssconfig_icon);
/*-----------------------------------------------------------------------------------*/
+#if CTK_CONF_ICON_BITMAPS
static unsigned char ssconfigicon_bitmap[3*3*8] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -56,12 +57,15 @@
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
};
+#endif /* CTK_CONF_ICON_BITMAPS */
+#if CTK_CONF_ICON_TEXTMAPS
static char ssconfigicon_textmap[9] = {
' ', 'Z', 'z',
' ', 'z', ' ',
'|', '-', 'o'
};
+#endif /* CTK_CONF_ICON_TEXTMAPS */
static struct ctk_icon ssconfig_icon =
{CTK_ICON("Screensavers", ssconfigicon_bitmap, ssconfigicon_textmap)};
diff --git a/contiki-c64/apps/ssfire-dsc.c b/contiki-c64/apps/ssfire-dsc.c
index 352ca2d..23d862e 100644
--- a/contiki-c64/apps/ssfire-dsc.c
+++ b/contiki-c64/apps/ssfire-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: ssfire-dsc.c,v 1.2 2003/08/20 19:53:29 adamdunkels Exp $
+ * $Id: ssfire-dsc.c,v 1.3 2004/06/27 12:43:33 oliverschmidt Exp $
*
*/
@@ -43,6 +43,7 @@
ssfire_init,
&ssfire_icon);
/*-----------------------------------------------------------------------------------*/
+#if CTK_CONF_ICON_BITMAPS
static unsigned char ssfireicon_bitmap[3*3*8] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
@@ -56,12 +57,15 @@
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
};
+#endif /* CTK_CONF_ICON_BITMAPS */
+#if CTK_CONF_ICON_TEXTMAPS
static char ssfireicon_textmap[9] = {
'.', ' ', '.',
'o', ' ', 'o',
'O', ' ', 'O'
};
+#endif /* CTK_CONF_ICON_TEXTMAPS */
static struct ctk_icon ssfire_icon =
{CTK_ICON("Fire", ssfireicon_bitmap, ssfireicon_textmap)};
diff --git a/contiki-c64/apps/wget-dsc.c b/contiki-c64/apps/wget-dsc.c
index 76b9b91..c43b406 100644
--- a/contiki-c64/apps/wget-dsc.c
+++ b/contiki-c64/apps/wget-dsc.c
@@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
- * $Id: wget-dsc.c,v 1.1 2003/07/30 23:10:49 adamdunkels Exp $
+ * $Id: wget-dsc.c,v 1.2 2004/06/27 12:43:33 oliverschmidt Exp $
*
*/
@@ -43,6 +43,7 @@
wget_init,
&icon);
/*-----------------------------------------------------------------------------------*/
+#if CTK_CONF_ICON_BITMAPS
static unsigned char wgeticon_bitmap[3*3*8] = {
0x00, 0x7e, 0x40, 0x73, 0x46, 0x4c, 0x18, 0x13,
0x00, 0x00, 0xff, 0x81, 0x34, 0xc9, 0x00, 0xb6,
@@ -56,12 +57,15 @@
0x22, 0x91, 0x00, 0xc4, 0x81, 0xff, 0x00, 0x00,
0x08, 0x18, 0x32, 0x62, 0xc6, 0x02, 0x3e, 0x00
};
+#endif /* CTK_CONF_ICON_BITMAPS */
+#if CTK_CONF_ICON_TEXTMAPS
static char wgeticon_textmap[9] = {
'w', 'e', 'b',
'p', 'r', 'g',
'd', '6', '4'
};
+#endif /* CTK_CONF_ICON_TEXTMAPS */
static struct ctk_icon icon =
{CTK_ICON("Web downloader", wgeticon_bitmap, wgeticon_textmap)};