diff options
Diffstat (limited to 'NxWidgets/nxwm/src/glyph_start.cxx')
| -rw-r--r-- | NxWidgets/nxwm/src/glyph_start.cxx | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/NxWidgets/nxwm/src/glyph_start.cxx b/NxWidgets/nxwm/src/glyph_start.cxx index 85457799d..e7937faea 100644 --- a/NxWidgets/nxwm/src/glyph_start.cxx +++ b/NxWidgets/nxwm/src/glyph_start.cxx @@ -47,9 +47,9 @@ #include <nuttx/fb.h> #include <nuttx/rgbcolors.h> -#include "nxconfig.hxx" #include "crlepalettebitmap.hxx" +#include "nxwmconfig.hxx" #include "nxwmglyphs.hxx" /******************************************************************************************** @@ -72,11 +72,12 @@ using namespace NxWM; static const uint32_t g_startLut[BITMAP_NLUTCODES] = { - 0xdbdbdb, 0x6db66d, 0x006d00, 0x246d00, 0x6d9249, 0xdbffb6, 0xb6b692, 0x246d24, /* Codes 0-7 */ - 0x249224, 0x49b649, 0x6db649, 0x499249, 0xdbffdb, 0x92b692, 0xb6dbb6, 0x6ddb6d, /* Codes 8-15 */ - 0x92b66d, 0x6d926d, 0x92db92, 0x49926d, 0x49b624, 0x92db6d, 0xb6ffb6, 0xffffff, /* Codes 16-23 */ - 0x496d49, 0x92ff92, 0x24b624, 0x496d24, 0xb6db92, 0x499224, 0x249200, 0x92dbb6, /* Codes 24-31 */ - 0x004900, 0x009200 /* Codes 32-33 */ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0x6db66d, 0x006d00, 0x246d00, 0x6d9249, 0xdbffb6, 0xb6b692, 0x246d24, 0x249224, /* Codes 1-8 */ + 0x49b649, 0x6db649, 0x499249, 0xdbffdb, 0x92b692, 0xb6dbb6, 0x6ddb6d, 0x92b66d, /* Codes 9-16 */ + 0x6d926d, 0x92db92, 0x49926d, 0x49b624, 0x92db6d, 0xb6ffb6, 0xffffff, 0x496d49, /* Codes 17-24 */ + 0x92ff92, 0x24b624, 0x496d24, 0xb6db92, 0x499224, 0x249200, 0x92dbb6, 0x004900, /* Codes 25-32 */ + 0x009200 /* Code 33 */ }; /* RGB16 (565) Colors (four of the colors in this map are duplicates) */ @@ -85,10 +86,11 @@ static const uint32_t g_startLut[BITMAP_NLUTCODES] = static const uint16_t g_startLut[BITMAP_NLUTCODES] = { - 0xdedb, 0x6dad, 0x0360, 0x2360, 0x6c89, 0xdff6, 0xb5b2, 0x2364, 0x2484, 0x4da9, /* Codes 0-9 */ - 0x6da9, 0x4c89, 0xdffb, 0x95b2, 0xb6d6, 0x6ecd, 0x95ad, 0x6c8d, 0x96d2, 0x4c8d, /* Codes 10-19 */ - 0x4da4, 0x96cd, 0xb7f6, 0xffff, 0x4b69, 0x97f2, 0x25a4, 0x4b64, 0xb6d2, 0x4c84, /* Codes 20-29 */ - 0x2480, 0x96d6, 0x0240, 0x0480 /* Codes 30-33 */ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0x6dad, 0x0360, 0x2360, 0x6c89, 0xdff6, 0xb5b2, 0x2364, 0x2484, 0x4da9, 0x6da9, /* Codes 0-10 */ + 0x4c89, 0xdffb, 0x95b2, 0xb6d6, 0x6ecd, 0x95ad, 0x6c8d, 0x96d2, 0x4c8d, 0x4da4, /* Codes 11-20 */ + 0x96cd, 0xb7f6, 0xffff, 0x4b69, 0x97f2, 0x25a4, 0x4b64, 0xb6d2, 0x4c84, 0x2480, /* Codes 21-30 */ + 0x96d6, 0x0240, 0x0480 /* Codes 31-33 */ }; /* 8-bit color lookups. NOTE: This is really dumb! The lookup index is 8-bits and it used @@ -105,9 +107,10 @@ static const uint16_t g_startLut[BITMAP_NLUTCODES] = static const uint8_t g_startLut[BITMAP_NLUTCODES] = { - 0xdb, 0x97, 0x3f, 0x4a, 0x7e, 0xeb, 0xb1, 0x4e, 0x64, 0x88, 0x93, 0x73, 0xf0, 0xa7, 0xcb, 0xad, /* Codes 0-15 */ - 0xa2, 0x82, 0xbc, 0x77, 0x84, 0xb8, 0xe0, 0xff, 0x5e, 0xd1, 0x79, 0x59, 0xc7, 0x6f, 0x60, 0xc0, /* Codes 16-31 */ - 0x2a, 0x55 /* Codes 32-33 */ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0x97, 0x3f, 0x4a, 0x7e, 0xeb, 0xb1, 0x4e, 0x64, 0x88, 0x93, 0x73, 0xf0, 0xa7, /* Codes 1-13 */ + 0xcb, 0xad, 0xa2, 0x82, 0xbc, 0x77, 0x84, 0xb8, 0xe0, 0xff, 0x5e, 0xd1, 0x79, /* Codes 14-26 */ + 0x59, 0xc7, 0x6f, 0x60, 0xc0, 0x2a, 0x55 /* Codes 27-33 */ }; # else /* CONFIG_NXWIDGETS_GREYSCALE */ @@ -116,9 +119,10 @@ static const uint8_t g_startLut[BITMAP_NLUTCODES] = static const nxgl_mxpixel_t g_startLut[BITMAP_NLUTCODES] = { - 0xdb, 0x75, 0x0c, 0x2c, 0x71, 0xde, 0xb6, 0x2c, 0x30, 0x55, 0x75, 0x51, 0xdf, 0x96, 0xba, 0x79, /* Codes 0-15 */ - 0x95, 0x71, 0x9a, 0x51, 0x54, 0x99, 0xbe, 0xff, 0x4d, 0x9e, 0x34, 0x4c, 0xba, 0x50, 0x30, 0x9a, /* Codes 16-31 */ - 0x08, 0x10 /* Codes 32-33 */ + CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + 0x75, 0x0c, 0x2c, 0x71, 0xde, 0xb6, 0x2c, 0x30, 0x55, 0x75, 0x51, 0xdf, 0x96, /* Codes 1-13 */ + 0xba, 0x79, 0x95, 0x71, 0x9a, 0x51, 0x54, 0x99, 0xbe, 0xff, 0x4d, 0x9e, 0x34, /* Codes 14-26 */ + 0x4c, 0xba, 0x50, 0x30, 0x9a, 0x08, 0x10 /* Codes 27-33 */ }; # endif |