# HG changeset patch # User Mychaela Falconia # Date 1616970889 0 # Node ID 86375353219d63829a98f5e898ccf68a1bd97c5c # Parent 4d9f24c501f39afb392858d96f55f010e4a11257 bmi for smallbw: new FC splash screen integrated diff -r 4d9f24c501f3 -r 86375353219d src/ui/bmi/mmiIcons.c --- a/src/ui/bmi/mmiIcons.c Sun Mar 28 21:36:48 2021 +0000 +++ b/src/ui/bmi/mmiIcons.c Sun Mar 28 22:34:49 2021 +0000 @@ -1323,6 +1323,45 @@ 0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00 }; +#ifndef COLOURDISPLAY + +#if FC_SPLASH_SCREEN_SMALLBW + +static const unsigned char fc_splash_screen_smallbw[] = { + 0xFE,0x00,0x00,0x07,0xE0,0x06,0x00,0x00,0x00,0x00, + 0xFE,0x00,0x00,0x07,0x70,0x06,0x00,0x00,0x00,0x00, + 0xC0,0xD1,0x81,0x8C,0x31,0xC6,0xC3,0x6C,0x38,0x38, + 0xC0,0xF7,0xE7,0xEC,0x03,0xF6,0x66,0x7E,0x7E,0xFC, + 0xFE,0xC6,0x66,0x6C,0x03,0x36,0x66,0x63,0x66,0xC6, + 0xFE,0xCC,0x6C,0x6C,0x00,0x76,0x64,0x63,0x78,0xC6, + 0xC0,0xCF,0xEF,0xEC,0x1B,0xF6,0x3C,0x63,0x3E,0xC6, + 0xC0,0xCC,0x0C,0x0C,0x36,0x36,0x3C,0x63,0x06,0xC6, + 0xC0,0xC6,0x66,0x67,0x77,0x76,0x38,0x77,0x66,0xCE, + 0xC0,0xC7,0xC7,0xC3,0xE3,0xF6,0x18,0x7E,0x7E,0x7C, + 0x00,0x00,0x00,0x00,0x00,0x00,0x18,0x60,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x60,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x70,0x60,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x18,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x18,0x0C,0x60,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x18,0x00,0x60,0xC0,0x00,0x00,0x00, + 0x00,0x00,0x00,0x18,0x0C,0xF3,0xF0,0x00,0x00,0x00, + 0x00,0x00,0x00,0x18,0x0C,0x63,0x30,0x00,0x00,0x00, + 0x00,0x00,0x00,0x18,0x0C,0x66,0x30,0x00,0x00,0x00, + 0x00,0x00,0x00,0x18,0x0C,0x67,0xF0,0x00,0x00,0x00, + 0x00,0x00,0x00,0x18,0x0C,0x66,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x1F,0xCC,0x63,0x30,0x00,0x00,0x00, + 0x00,0x00,0x00,0x1F,0xCC,0x73,0xE0,0x00,0x00,0x00, +}; + +#else + static const unsigned char TILogo_bw[] = { 0x00,0x00,0x3F,0xE0,0x00,0x00,0x00, 0x00,0x00,0x3F,0xE0,0x00,0x00,0x00, 0x00,0x00,0x3F,0xE0,0x00,0x00,0x00, 0x00,0x00,0x3F,0xE0,0x00,0x00,0x00, 0x00,0x00,0x3F,0xE0,0xE0,0x00,0x00, 0x00,0x00,0x3F,0xE0,0xE0,0x00,0x00, 0x00,0x00,0x3F,0xF0,0xE0,0x00,0x00, 0x00,0x00,0x3F,0xF8,0xE0,0x00,0x00, @@ -1335,17 +1374,8 @@ 0x00,0x00,0x00,0x3F,0xE0,0x00,0x00, 0x00,0x00,0x00,0x1F,0xE0,0x00,0x00, 0x00,0x00,0x00,0x0F,0xE0,0x00,0x00, 0x00,0x00,0x00,0x0F,0xE0,0x00,0x00, 0x00,0x00,0x00,0x03,0xE0,0x00,0x00, 0x00,0x00,0x00,0x03,0xE0,0x00,0x00}; -/* -0x00,0x3F,0xE0,0x00,0x00, 0x00,0x3F,0xE0,0x00,0x00, 0x00,0x3F,0xE0,0x00,0x00, 0x00,0x3F,0xE0,0x00,0x00, -0x00,0x3F,0xE0,0xE0,0x00, 0x00,0x3F,0xE0,0xE0,0x00, 0x00,0x3F,0xF0,0xE0,0x00, 0x00,0x3F,0xF8,0xE0,0x00, -0x00,0x3F,0xF8,0x07,0xF0, 0x00,0x3F,0xF8,0x07,0xF0, 0x00,0x3F,0xF1,0xC7,0xF0, 0x00,0x3F,0xF3,0xCF,0xF0, -0x00,0x3F,0x83,0xC1,0xF0, 0x00,0x3F,0x83,0x81,0xF0, 0x00,0x3F,0x83,0x81,0xF8, 0xFF,0xFF,0x03,0x81,0xF8, -0xFF,0xFF,0x03,0x81,0xFC, 0xFF,0xFF,0xE7,0x9F,0xFE, 0x7F,0xFF,0xE7,0x9F,0xFE, 0x3F,0xFF,0xE7,0x1F,0xFE, -0x1F,0xFF,0xEF,0x3F,0xFC, 0x0F,0xFF,0xCF,0x3F,0xFC, 0x07,0xFF,0xCF,0x7F,0xFC, 0x07,0xFF,0xC0,0x27,0xFC, -0x07,0xF3,0xC0,0x0F,0xF0, 0x03,0xC3,0xC0,0x0F,0xE0, 0x01,0xC1,0xE0,0x1F,0x00, 0x00,0x00,0xE0,0x3E,0x00, -0x00,0x00,0xF8,0xFC,0x00, 0x00,0x00,0x7F,0xF8,0x00, 0x00,0x00,0x7F,0xF0,0x00, 0x00,0x00,0x3F,0xE0,0x00, -0x00,0x00,0x3F,0xE0,0x00, 0x00,0x00,0x1F,0xE0,0x00, 0x00,0x00,0x0F,0xE0,0x00, 0x00,0x00,0x0F,0xE0,0x00, -0x00,0x00,0x03,0xE0,0x00, 0x00,0x00,0x03,0xE0,0x00 };*/ +#endif +#endif /* May 30, 2006 REF:OMAPS00079650 a0393213 (R.Prabakar) Description : CPHS Roaming indication feature implementation @@ -1638,6 +1668,28 @@ #ifndef COLOURDISPLAY const MfwIcnAttr goodbye_Attr [animGoodbye] = /* all goodby icon attributes */ { +#if FC_SPLASH_SCREEN_SMALLBW + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_GOODBYE, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_GOODBYE, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_GOODBYE, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_GOODBYE, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_GOODBYE, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_GOODBYE, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_GOODBYE, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_GOODBYE, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_GOODBYE, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_GOODBYE, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw} +#else #if 0 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe8 }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+1, 56, 42 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *) animframe7 }, @@ -1661,10 +1713,33 @@ { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_GOODBYE, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] } #endif +#endif }; const MfwIcnAttr welcome_Attr [animwelcome] = { +#if FC_SPLASH_SCREEN_SMALLBW + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_WELCOME, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_WELCOME, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_WELCOME, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_WELCOME, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_WELCOME, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_WELCOME, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_WELCOME, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_WELCOME, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_WELCOME, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw}, + { {WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y, 80, 30}, 1, COLOUR_STATUS_WELCOME, + ICON_TYPE_1BIT_UNPACKED, (char *) fc_splash_screen_smallbw} +#else #if 0 { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+26, 56, 4 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe01 }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y+22, 56, 9 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *) animframe0 }, @@ -1688,13 +1763,14 @@ { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] } #endif +#endif }; #else const MfwIcnAttr welcome_Attr [animwelcome] = { - { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 176, 60 }, 1, COLOUR_ICON_XX, ICON_TYPE_256_COL, (char *)&TIlogColour[0] }, + { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 176, 60 }, 1, COLOUR_ICON_XX, ICON_TYPE_256_COL, (char *)&TIlogColour[0] }, { { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 176, 60 }, 1, COLOUR_ICON_XX, ICON_TYPE_256_COL, (char *)&TIlogColour[0] } }; @@ -1886,11 +1962,13 @@ #endif }; +#if 0 MfwIcnAttr mainIconGoodbye = { // { 13, 0, 56, 48 }, 1, COLOUR_ICON_XX, ICON_TYPE_1BIT_UNPACKED, (char *) animframe8 { WELCOME_ANI_POS_X, WELCOME_ANI_POS_Y , 56, 38 }, 1, COLOUR_STATUS_WELCOME, ICON_TYPE_1BIT_UNPACKED, (char *)&TILogo_bw[0] }; +#endif #ifdef EASY_TEXT_ENABLED diff -r 4d9f24c501f3 -r 86375353219d src/ui/bmi/mmiResources.h --- a/src/ui/bmi/mmiResources.h Sun Mar 28 21:36:48 2021 +0000 +++ b/src/ui/bmi/mmiResources.h Sun Mar 28 22:34:49 2021 +0000 @@ -332,17 +332,27 @@ #define GAME_WINPOSY1 (0) #define GAME_WINPOSY2 (0) +#endif -#endif +#define FC_SPLASH_SCREEN_SMALLBW 1 #ifndef COLOURDISPLAY +#if FC_SPLASH_SCREEN_SMALLBW +#define WELCOME_ANI_POS_X 8 +#define WELCOME_ANI_POS_Y 14 +#else #define WELCOME_ANI_POS_X (SCREEN_SIZE_X - 56 )/2 #define WELCOME_ANI_POS_Y (SCREEN_SIZE_Y - (42+4))/2 +#endif + #else + #define WELCOME_ANI_POS_X ((SCREEN_SIZE_X - 176 )/2) #define WELCOME_ANI_POS_Y ((SCREEN_SIZE_Y - 60)/3) //top 1/3 of screen + #endif + //Definitions for 'pop-up' windows with 1/2 lines of text #define DLG_WINDOW1_LINE 10,20,60,30, 0 #define DLG_WINDOW2_LINE 10,20,60,45, 0