zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

NxWM update 

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4686 7fd9a85b-ad96-42d3-883c-3090e2eb8679
sbg
patacongo 13 years ago
parent
ea2402e9cc
commit
0bb02729f1
7 changed files with 94 additions and 77 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      NxWidgets/UnitTests/nxwm/main.cxx
  2. 4
      NxWidgets/nxwm/include/cstartwindow.hxx
  3. 4
      NxWidgets/nxwm/src/cstartwindow.cxx
  4. 28
      NxWidgets/nxwm/src/glyph_minimize.cxx
  5. 36
      NxWidgets/nxwm/src/glyph_nsh.cxx
  6. 36
      NxWidgets/nxwm/src/glyph_start.cxx
  7. 59
      NxWidgets/nxwm/src/glyph_stop.cxx

4
NxWidgets/UnitTests/nxwm/main.cxx
Unescape View File

@ -207,7 +207,7 @@ int MAIN_NAME(int argc, char *argv[]) @@ -207,7 +207,7 @@ int MAIN_NAME(int argc, char *argv[])
printf(MAIN_STRING "Adding the NxConsole application to the start window\n");
if (!g_nxwmtest.startwindow->addApplication(console))
{
printf(MAIN_STRING "ERROR: Failed to add CNxConsole to the start menu\n");
printf(MAIN_STRING "ERROR: Failed to add CNxConsole to the start window\n");
delete window;
}
@ -238,7 +238,7 @@ noconsole: @@ -238,7 +238,7 @@ noconsole:
printf(MAIN_STRING "Adding the calculator application to the start window\n");
if (!g_nxwmtest.startwindow->addApplication(calculator))
{
printf(MAIN_STRING "ERROR: Failed to add calculator to the start menu\n");
printf(MAIN_STRING "ERROR: Failed to add calculator to the start window\n");
delete window;
}

4
NxWidgets/nxwm/include/cstartwindow.hxx
Unescape View File

@ -192,8 +192,8 @@ namespace NxWM @@ -192,8 +192,8 @@ namespace NxWM
* setting up the start window is:
*
* 1. Call CTaskBar::openApplicationWindow to create a window for the start window,
* 2. Use the window to instantiate CStartMenu
* 3. Call CStartMenu::addApplication numerous times to install applications
* 2. Use the window to instantiate CStartWindow
* 3. Call CStartWindow::addApplication numerous times to install applications
* in the start window.
* 4. Call CTaskBar::startApplication (initially minimized) to start the start
* window application.

4
NxWidgets/nxwm/src/cstartwindow.cxx
Unescape View File

@ -279,8 +279,8 @@ void CStartWindow::redraw(void) @@ -279,8 +279,8 @@ void CStartWindow::redraw(void)
* setting up the start window is:
*
* 1. Call CTaskBar::openApplicationWindow to create a window for the start window,
* 2. Use the window to instantiate CStartMenu
* 3. Call CStartMenu::addApplication numerous times to install applications
* 2. Use the window to instantiate CStartWindow
* 3. Call CStartWindow::addApplication numerous times to install applications
* in the start window.
* 4. Call CTaskBar::startApplication (initially minimized) to start the start
* window application.

28
NxWidgets/nxwm/src/glyph_minimize.cxx
Unescape View File

@ -47,8 +47,9 @@ @@ -47,8 +47,9 @@
#include <nuttx/fb.h>
#include <nuttx/rgbcolors.h>
#include "nxconfig.hxx"
#include "crlepalettebitmap.hxx"
#include "nxwmconfig.hxx"
#include "nxwmglyphs.hxx"
/********************************************************************************************
@ -71,10 +72,10 @@ using namespace NxWM; @@ -71,10 +72,10 @@ using namespace NxWM;
static const uint32_t g_minimizeLut[BITMAP_NLUTCODES] =
{
0xffffff, 0x2449b6, 0x24496d, 0x244992, 0x242492, 0x496ddb, 0x0024db, 0x0024b6, /* Codes 0-7 */
0x002492, 0x0000b6, 0x2424b6, 0x0024ff, 0x0000db, 0x4949db, 0x496db6, 0x246db6, /* Codes 8-15 */
0x4949b6, 0x2449db, 0xb6dbff, 0xb6b6db, 0xdbdbff, 0xdbffff, 0x496dff, 0x246dff, /* Codes 16-23 */
0x4949ff /* Codes 24-24 */
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 9 */
0x2449b6, 0x24496d, 0x244992, 0x242492, 0x496ddb, 0x0024db, 0x0024b6, 0x002492, /* Codes 1-8 */
0x0000b6, 0x2424b6, 0x0024ff, 0x0000db, 0x4949db, 0x496db6, 0x246db6, 0x4949b6, /* Codes 9-17 */
0x2449db, 0xb6dbff, 0xb6b6db, 0xdbdbff, 0xdbffff, 0x496dff, 0x246dff, 0x4949ff /* Codes 17-24 */
};
/* RGB16 (565) Colors (four of the colors in this map are duplicates) */
@ -83,9 +84,10 @@ static const uint32_t g_minimizeLut[BITMAP_NLUTCODES] = @@ -83,9 +84,10 @@ static const uint32_t g_minimizeLut[BITMAP_NLUTCODES] =
static const uint16_t g_minimizeLut[BITMAP_NLUTCODES] =
{
0xffff, 0x2256, 0x224d, 0x2252, 0x2132, 0x4b7b, 0x013b, 0x0136, 0x0132, 0x0016, /* Codes 0-9 */
0x2136, 0x013f, 0x001b, 0x4a5b, 0x4b76, 0x2376, 0x4a56, 0x225b, 0xb6df, 0xb5bb, /* Codes 10-19 */
0xdedf, 0xdfff, 0x4b7f, 0x237f, 0x4a5f /* Codes 20-24 */
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0x2256, 0x224d, 0x2252, 0x2132, 0x4b7b, 0x013b, 0x0136, 0x0132, 0x0016, 0x2136, /* Codes 1-10 */
0x013f, 0x001b, 0x4a5b, 0x4b76, 0x2376, 0x4a56, 0x225b, 0xb6df, 0xb5bb, 0xdedf, /* Codes 11-20 */
0xdfff, 0x4b7f, 0x237f, 0x4a5f /* Codes 21-24 */
};
/* 8-bit color lookups. NOTE: This is really dumb! The lookup index is 8-bits and it used
@ -102,8 +104,9 @@ static const uint16_t g_minimizeLut[BITMAP_NLUTCODES] = @@ -102,8 +104,9 @@ static const uint16_t g_minimizeLut[BITMAP_NLUTCODES] =
static const uint8_t g_minimizeLut[BITMAP_NLUTCODES] =
{
0xff, 0x4a, 0x42, 0x46, 0x30, 0x6e, 0x2e, 0x29, 0x25, 0x14, 0x34, 0x32, 0x18, 0x59, 0x6a, 0x5f, /* Codes 0-15 */
0x55, 0x4e, 0xd4, 0xba, 0xdf, 0xf4, 0x72, 0x67, 0x5d /* Codes 16-24 */
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0x4a, 0x42, 0x46, 0x30, 0x6e, 0x2e, 0x29, 0x25, 0x14, 0x34, 0x32, 0x18, 0x59, /* Codes 1-13 */
0x6a, 0x5f, 0x55, 0x4e, 0xd4, 0xba, 0xdf, 0xf4, 0x72, 0x67, 0x5d /* Codes 14-24 */
};
# else /* CONFIG_NXWIDGETS_GREYSCALE */
@ -112,8 +115,9 @@ static const uint8_t g_minimizeLut[BITMAP_NLUTCODES] = @@ -112,8 +115,9 @@ static const uint8_t g_minimizeLut[BITMAP_NLUTCODES] =
static const nxgl_mxpixel_t g_minimizeLut[BITMAP_NLUTCODES] =
{
0xff, 0x2a, 0x29, 0x2a, 0x26, 0x4f, 0x07, 0x06, 0x06, 0x02, 0x26, 0x07, 0x03, 0x4b, 0x4e, 0x2e, /* Codes 0-15 */
0x4a, 0x2b, 0xbb, 0xb7, 0xdb, 0xdf, 0x4f, 0x2f, 0x4b /* Codes 16-24 */
CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */
0x2a, 0x29, 0x2a, 0x26, 0x4f, 0x07, 0x06, 0x06, 0x02, 0x26, 0x07, 0x03, 0x4b, /* Codes 1-13 */
0x4e, 0x2e, 0x4a, 0x2b, 0xbb, 0xb7, 0xdb, 0xdf, 0x4f, 0x2f, 0x4b /* Codes 14-24 */
};
# endif

36
NxWidgets/nxwm/src/glyph_nsh.cxx
Unescape View File

@ -47,9 +47,9 @@ @@ -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; @@ -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] = @@ -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] = @@ -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] = @@ -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

36
NxWidgets/nxwm/src/glyph_start.cxx
Unescape View File

@ -47,9 +47,9 @@ @@ -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; @@ -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] = @@ -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] = @@ -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] = @@ -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

59
NxWidgets/nxwm/src/glyph_stop.cxx
Unescape View File

@ -47,9 +47,9 @@ @@ -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; @@ -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] = @@ -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] = @@ -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] = @@ -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

Write Preview
Loading…
Cancel
Save