NxWM update

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

1 files changed, 32 insertions, 27 deletions

diff --git a/NxWidgets/nxwm/src/glyph_stop.cxx b/NxWidgets/nxwm/src/glyph_stop.cxx
index fdb08fa51..bd11d88e8 100644
--- a/NxWidgets/nxwm/src/glyph_stop.cxx
+++ b/NxWidgets/nxwm/src/glyph_stop.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,15 +72,16 @@ using namespace NxWM;
 
 static const uint32_t g_stopLut[BITMAP_NLUTCODES] =
 {
-  0xffffff, 0xdbdbdb, 0xdbb6db, 0xdbb6b6, 0xdb9292, 0xdb926d, 0xdb6d6d, 0xb66d6d,  /* Codes 0-7 */
-  0xb64949, 0xb62449, 0xdb246d, 0xdb4949, 0xff496d, 0xffb6b6, 0xffdbff, 0xffdbdb,  /* Codes 8-15 */
-  0xff9292, 0xff6d6d, 0xdb6d49, 0xff2449, 0xff246d, 0xdb2449, 0xdbdbb6, 0xff4949,  /* Codes 16-23 */
-  0xff2424, 0xffffdb, 0xdbb692, 0xdb2424, 0xff4924, 0xffb6db, 0xffdbb6, 0xff6d49,  /* Codes 24-31 */
-  0xffb692, 0xdb4924, 0xb64924, 0xdbdb92, 0xb69292, 0xb62424, 0xdb496d, 0xb6926d,  /* Codes 32-39 */
-  0xdbffff, 0xdbffdb, 0xb6496d, 0xdb0024, 0xdb6d92, 0xff2400, 0xb66d49, 0xdb2400,  /* Codes 40-47 */
-  0xb62400, 0x922424, 0xb60000, 0x922449, 0xff92b6, 0x920000, 0xdb0049, 0xb60024,  /* Codes 48-55 */
-  0xdb0000, 0x922400, 0x924949, 0x924924, 0x920024, 0xff6d92, 0x6d4924, 0x6d2400,  /* Codes 56-63 */
-  0x6d2424, 0x6d0000                                                               /* Codes 64-65 */
+  CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR,                                             /* Code 0 */
+  0xdbdbdb, 0xdbb6db, 0xdbb6b6, 0xdb9292, 0xdb926d, 0xdb6d6d, 0xb66d6d, 0xb64949,  /* Codes 1-8 */
+  0xb62449, 0xdb246d, 0xdb4949, 0xff496d, 0xffb6b6, 0xffdbff, 0xffdbdb, 0xff9292,  /* Codes 9-16 */
+  0xff6d6d, 0xdb6d49, 0xff2449, 0xff246d, 0xdb2449, 0xdbdbb6, 0xff4949, 0xff2424,  /* Codes 17-24 */
+  0xffffdb, 0xdbb692, 0xdb2424, 0xff4924, 0xffb6db, 0xffdbb6, 0xff6d49, 0xffb692,  /* Codes 25-32 */
+  0xdb4924, 0xb64924, 0xdbdb92, 0xb69292, 0xb62424, 0xdb496d, 0xb6926d, 0xdbffff,  /* Codes 33-40 */
+  0xdbffdb, 0xb6496d, 0xdb0024, 0xdb6d92, 0xff2400, 0xb66d49, 0xdb2400, 0xb62400,  /* Codes 41-48 */
+  0x922424, 0xb60000, 0x922449, 0xff92b6, 0x920000, 0xdb0049, 0xb60024, 0xdb0000,  /* Codes 49-56 */
+  0x922400, 0x924949, 0x924924, 0x920024, 0xff6d92, 0x6d4924, 0x6d2400, 0x6d2424,  /* Codes 57-64 */
+  0x6d0000                                                                         /* Code 65 */
 };
 
 /* RGB16 (565) Colors (four of the colors in this map are duplicates) */
@@ -89,13 +90,14 @@ static const uint32_t g_stopLut[BITMAP_NLUTCODES] =
 
 static const uint16_t g_stopLut[BITMAP_NLUTCODES] =
 {
-  0xffff, 0xdedb, 0xddbb, 0xddb6, 0xdc92, 0xdc8d, 0xdb6d, 0xb36d, 0xb249, 0xb129,  /* Codes 0-9 */
-  0xd92d, 0xda49, 0xfa4d, 0xfdb6, 0xfedf, 0xfedb, 0xfc92, 0xfb6d, 0xdb69, 0xf929,  /* Codes 10-19 */
-  0xf92d, 0xd929, 0xded6, 0xfa49, 0xf924, 0xfffb, 0xddb2, 0xd924, 0xfa44, 0xfdbb,  /* Codes 20-29 */
-  0xfed6, 0xfb69, 0xfdb2, 0xda44, 0xb244, 0xded2, 0xb492, 0xb124, 0xda4d, 0xb48d,  /* Codes 30-39 */
-  0xdfff, 0xdffb, 0xb24d, 0xd804, 0xdb72, 0xf920, 0xb369, 0xd920, 0xb120, 0x9124,  /* Codes 40-49 */
-  0xb000, 0x9129, 0xfc96, 0x9000, 0xd809, 0xb004, 0xd800, 0x9120, 0x9249, 0x9244,  /* Codes 50-59 */
-  0x9004, 0xfb72, 0x6a44, 0x6920, 0x6924, 0x6800                                   /* Codes 60-65 */
+  CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR,                                             /* Code 0 */
+  0xdedb, 0xddbb, 0xddb6, 0xdc92, 0xdc8d, 0xdb6d, 0xb36d, 0xb249, 0xb129, 0xd92d,  /* Codes 1-10 */
+  0xda49, 0xfa4d, 0xfdb6, 0xfedf, 0xfedb, 0xfc92, 0xfb6d, 0xdb69, 0xf929, 0xf92d,  /* Codes 11-20 */
+  0xd929, 0xded6, 0xfa49, 0xf924, 0xfffb, 0xddb2, 0xd924, 0xfa44, 0xfdbb, 0xfed6,  /* Codes 21-30 */
+  0xfb69, 0xfdb2, 0xda44, 0xb244, 0xded2, 0xb492, 0xb124, 0xda4d, 0xb48d, 0xdfff,  /* Codes 31-40 */
+  0xdffb, 0xb24d, 0xd804, 0xdb72, 0xf920, 0xb369, 0xd920, 0xb120, 0x9124, 0xb000,  /* Codes 41-50 */
+  0x9129, 0xfc96, 0x9000, 0xd809, 0xb004, 0xd800, 0x9120, 0x9249, 0x9244, 0x9004,  /* Codes 51-60 */
+  0xfb72, 0x6a44, 0x6920, 0x6924, 0x6800                                           /* Codes 61-65 */
 };
 
 /* 8-bit color lookups.  NOTE:  This is really dumb!  The lookup index is 8-bits and it used
@@ -112,11 +114,13 @@ static const uint16_t g_stopLut[BITMAP_NLUTCODES] =
 
 static const uint8_t g_stopLut[BITMAP_NLUTCODES] =
 {
-  0xff, 0xdb, 0xc5, 0xc1, 0xa7, 0xa3, 0x8d, 0x82, 0x69, 0x53, 0x63, 0x74, 0x83, 0xcb, 0xe9, 0xe5,  /* Codes 0-15 */
-  0xb2, 0x98, 0x89, 0x69, 0x6d, 0x5e, 0xd6, 0x7f, 0x65, 0xfa, 0xbc, 0x5a, 0x7b, 0xd0, 0xe1, 0x94,  /* Codes 16-31 */
-  0xc7, 0x70, 0x65, 0xd2, 0x9c, 0x4f, 0x78, 0x98, 0xf4, 0xf0, 0x6d, 0x45, 0x92, 0x61, 0x7e, 0x56,  /* Codes 32-47 */
-  0x4b, 0x44, 0x36, 0x49, 0xb6, 0x2b, 0x49, 0x3a, 0x41, 0x40, 0x5e, 0x5a, 0x2f, 0x9c, 0x4f, 0x35,  /* Codes 48-63 */
-  0x39, 0x20                                                                                       /* Codes 64-65 */
+  CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR,                                             /* Code 0 */
+  0xdb, 0xc5, 0xc1, 0xa7, 0xa3, 0x8d, 0x82, 0x69, 0x53, 0x63, 0x74, 0x83, 0xcb,    /* Codes 1-13 */
+  0xe9, 0xe5, 0xb2, 0x98, 0x89, 0x69, 0x6d, 0x5e, 0xd6, 0x7f, 0x65, 0xfa, 0xbc,    /* Codes 14-26 */
+  0x5a, 0x7b, 0xd0, 0xe1, 0x94, 0xc7, 0x70, 0x65, 0xd2, 0x9c, 0x4f, 0x78, 0x98,    /* Codes 27-39 */
+  0xf4, 0xf0, 0x6d, 0x45, 0x92, 0x61, 0x7e, 0x56, 0x4b, 0x44, 0x36, 0x49, 0xb6,    /* Codes 40-52 */
+  0x2b, 0x49, 0x3a, 0x41, 0x40, 0x5e, 0x5a, 0x2f, 0x9c, 0x4f, 0x35, 0x39, 0x20     /* Codes 53-65 */
+
 };
 
 #  else /* CONFIG_NXWIDGETS_GREYSCALE */
@@ -125,11 +129,12 @@ static const uint8_t g_stopLut[BITMAP_NLUTCODES] =
 
 static const nxgl_mxpixel_t g_stopLut[BITMAP_NLUTCODES] =
 {
-  0xff, 0xdb, 0xd7, 0xd6, 0xd2, 0xd1, 0xcd, 0xad, 0xa9, 0xa5, 0xc5, 0xc9, 0xe9, 0xf6, 0xfb, 0xfb,  /* Codes 0-15 */
-  0xf2, 0xed, 0xcd, 0xe5, 0xe5, 0xc5, 0xda, 0xe9, 0xe4, 0xff, 0xd6, 0xc4, 0xe8, 0xf7, 0xfa, 0xed,  /* Codes 16-31 */
-  0xf6, 0xc8, 0xa8, 0xda, 0xb2, 0xa4, 0xc9, 0xb1, 0xdf, 0xdf, 0xa9, 0xc0, 0xce, 0xe4, 0xad, 0xc4,  /* Codes 32-47 */
-  0xa4, 0x84, 0xa0, 0x85, 0xf2, 0x80, 0xc1, 0xa0, 0xc0, 0x84, 0x89, 0x88, 0x80, 0xee, 0x68, 0x64,  /* Codes 48-63 */
-  0x64, 0x60                                                                                       /* Codes 64-65 */
+  CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR,                                             /* Code 0 */
+  0xdb, 0xd7, 0xd6, 0xd2, 0xd1, 0xcd, 0xad, 0xa9, 0xa5, 0xc5, 0xc9, 0xe9, 0xf6,    /* Codes 1-13 */
+  0xfb, 0xfb, 0xf2, 0xed, 0xcd, 0xe5, 0xe5, 0xc5, 0xda, 0xe9, 0xe4, 0xff, 0xd6,    /* Codes 14-26 */
+  0xc4, 0xe8, 0xf7, 0xfa, 0xed, 0xf6, 0xc8, 0xa8, 0xda, 0xb2, 0xa4, 0xc9, 0xb1,    /* Codes 27-39 */
+  0xdf, 0xdf, 0xa9, 0xc0, 0xce, 0xe4, 0xad, 0xc4, 0xa4, 0x84, 0xa0, 0x85, 0xf2,    /* Codes 40-52 */
+  0x80, 0xc1, 0xa0, 0xc0, 0x84, 0x89, 0x88, 0x80, 0xee, 0x68, 0x64, 0x64, 0x60     /* Codes 53-65 */
 };
 
 #  endif