NxWM update

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4686 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 20 insertions, 16 deletions

diff --git a/NxWidgets/nxwm/src/glyph_nsh.cxx b/NxWidgets/nxwm/src/glyph_nsh.cxx
index 5ddeb9008..69bccd344 100644
--- a/NxWidgets/nxwm/src/glyph_nsh.cxx
+++ b/NxWidgets/nxwm/src/glyph_nsh.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_nshLut[BITMAP_NLUTCODES] =
 {
-  0xdbdbdb, 0xffffdb, 0x4949db, 0x2424db, 0x4924db, 0xdbdbff, 0x6d6ddb, 0x6d92db,  /* Codes 0-7 */
-  0x2424b6, 0xffdbdb, 0xdbffff, 0x4992db, 0x24246d, 0xffffff, 0x6db6db, 0x242492,  /* Codes 8-15 */
-  0x4924ff, 0x49b6db, 0x6d6db6, 0x92b6db, 0xb6dbdb, 0xb6dbff, 0x2424ff, 0x9292db,  /* Codes 16-23 */
-  0x9292b6, 0x00006d, 0x9292ff, 0x240092, 0x24006d, 0x4949ff, 0x494992, 0x92b6ff,  /* Codes 24-31 */
-  0xb6b6db, 0x4924b6, 0x92dbdb, 0x926ddb                                           /* Codes 32-35 */
+  CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR,                                             /* Code 0 */
+  0xffffdb, 0x4949db, 0x2424db, 0x4924db, 0xdbdbff, 0x6d6ddb, 0x6d92db, 0x2424b6,  /* Codes 1-8 */
+  0xffdbdb, 0xdbffff, 0x4992db, 0x24246d, 0xffffff, 0x6db6db, 0x242492, 0x4924ff,  /* Codes 9-16 */
+  0x49b6db, 0x6d6db6, 0x92b6db, 0xb6dbdb, 0xb6dbff, 0x2424ff, 0x9292db, 0x9292b6,  /* Codes 17-24 */
+  0x00006d, 0x9292ff, 0x240092, 0x24006d, 0x4949ff, 0x494992, 0x92b6ff, 0xb6b6db,  /* Codes 25-32 */
+  0x4924b6, 0x92dbdb, 0x926ddb                                                     /* Codes 33-35 */
 };
 
 /* RGB16 (565) Colors (four of the colors in this map are duplicates) */
@@ -85,10 +86,11 @@ static const uint32_t g_nshLut[BITMAP_NLUTCODES] =
 
 static const uint16_t g_nshLut[BITMAP_NLUTCODES] =
 {
-  0xdedb, 0xfffb, 0x4a5b, 0x213b, 0x493b, 0xdedf, 0x6b7b, 0x6c9b, 0x2136, 0xfedb,  /* Codes 0-9 */
-  0xdfff, 0x4c9b, 0x212d, 0xffff, 0x6dbb, 0x2132, 0x493f, 0x4dbb, 0x6b76, 0x95bb,  /* Codes 10-19 */
-  0xb6db, 0xb6df, 0x213f, 0x949b, 0x9496, 0x000d, 0x949f, 0x2012, 0x200d, 0x4a5f,  /* Codes 20-29 */
-  0x4a52, 0x95bf, 0xb5bb, 0x4936, 0x96db, 0x937b                                   /* Codes 30-35 */
+  CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR,                                             /* Code 0 */
+  0xfffb, 0x4a5b, 0x213b, 0x493b, 0xdedf, 0x6b7b, 0x6c9b, 0x2136, 0xfedb, 0xdfff,  /* Codes 1-10 */
+  0x4c9b, 0x212d, 0xffff, 0x6dbb, 0x2132, 0x493f, 0x4dbb, 0x6b76, 0x95bb, 0xb6db,  /* Codes 11-20 */
+  0xb6df, 0x213f, 0x949b, 0x9496, 0x000d, 0x949f, 0x2012, 0x200d, 0x4a5f, 0x4a52,  /* Codes 21-30 */
+  0x95bf, 0xb5bb, 0x4936, 0x96db, 0x937b                                           /* Codes 31-35 */
 };
 
 /* 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_nshLut[BITMAP_NLUTCODES] =
 
 static const uint8_t g_nshLut[BITMAP_NLUTCODES] =
 {
-  0xdb, 0xfa, 0x59, 0x38, 0x43, 0xdf, 0x79, 0x8f, 0x34, 0xe5, 0xf4, 0x84, 0x2c, 0xff, 0xa4, 0x30,  /* Codes 0-15 */
-  0x48, 0x99, 0x75, 0xaf, 0xcf, 0xd4, 0x3c, 0x9a, 0x96, 0x0c, 0x9e, 0x1b, 0x17, 0x5d, 0x51, 0xb3,  /* Codes 16-31 */
-  0xba, 0x3f, 0xc5, 0x84                                                                           /* Codes 32-35 */
+  CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR,                                             /* Code 0 */
+  0xfa, 0x59, 0x38, 0x43, 0xdf, 0x79, 0x8f, 0x34, 0xe5, 0xf4, 0x84, 0x2c, 0xff,    /* Codes 1-13 */
+  0xa4, 0x30, 0x48, 0x99, 0x75, 0xaf, 0xcf, 0xd4, 0x3c, 0x9a, 0x96, 0x0c, 0x9e,    /* Codes 14-16 */
+  0x1b, 0x17, 0x5d, 0x51, 0xb3, 0xba, 0x3f, 0xc5, 0x84                             /* Codes 27-35 */
 };
 
 #  else /* CONFIG_NXWIDGETS_GREYSCALE */
@@ -116,9 +119,10 @@ static const uint8_t g_nshLut[BITMAP_NLUTCODES] =
 
 static const nxgl_mxpixel_t g_nshLut[BITMAP_NLUTCODES] =
 {
-  0xdb, 0xff, 0x4b, 0x27, 0x47, 0xdb, 0x6f, 0x73, 0x26, 0xfb, 0xdf, 0x53, 0x25, 0xff, 0x77, 0x26,  /* Codes 0-15 */
-  0x47, 0x57, 0x6e, 0x97, 0xbb, 0xbb, 0x27, 0x93, 0x92, 0x01, 0x93, 0x22, 0x21, 0x4b, 0x4a, 0x97,  /* Codes 16-31 */
-  0xb7, 0x46, 0x9b, 0x8f                                                                           /* Codes 32-35 */
+  CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR,                                             /* Code 0 */
+  0xff, 0x4b, 0x27, 0x47, 0xdb, 0x6f, 0x73, 0x26, 0xfb, 0xdf, 0x53, 0x25, 0xff,    /* Codes 1-13 */
+  0x77, 0x26, 0x47, 0x57, 0x6e, 0x97, 0xbb, 0xbb, 0x27, 0x93, 0x92, 0x01, 0x93,    /* Codes 14-16 */
+  0x22, 0x21, 0x4b, 0x4a, 0x97, 0xb7, 0x46, 0x9b, 0x8f                             /* Codes 27-35 */
 };
 
 #  endif