diff --git a/graphics/nxglyphs/Kconfig b/graphics/nxglyphs/Kconfig index 3a0679a5d..f52b4a2ce 100644 --- a/graphics/nxglyphs/Kconfig +++ b/graphics/nxglyphs/Kconfig @@ -3,6 +3,15 @@ # see the file kconfig-language.txt in the NuttX tools repository. # +ifdef CONFIG_NXWIDGETS + config NXGLPYHS_LARGE_ICONS bool default n + +config NXGLYPHS_BACKGROUNDCOLOR + hex "Background Color" + ---help--- + Normal background color. Default: RGB(148,189,215) + +endif # CONFIG_NXWIDGETS \ No newline at end of file diff --git a/graphics/nxglyphs/src/glyph_calculator24x25.cxx b/graphics/nxglyphs/src/glyph_calculator24x25.cxx index 779a2453e..ba96abed8 100644 --- a/graphics/nxglyphs/src/glyph_calculator24x25.cxx +++ b/graphics/nxglyphs/src/glyph_calculator24x25.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_calculator24x25.cxx + * apps/graphics/nxglyphs/src/glyph_calculator24x25.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" /******************************************************************************************** diff --git a/graphics/nxglyphs/src/glyph_calculator47x49.cxx b/graphics/nxglyphs/src/glyph_calculator47x49.cxx index 44f9240fd..a1a7f9f79 100644 --- a/graphics/nxglyphs/src/glyph_calculator47x49.cxx +++ b/graphics/nxglyphs/src/glyph_calculator47x49.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_calculator47x47.cxx + * apps/graphics/nxglyphs/src/glyph_calculator47x47.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" /******************************************************************************************** diff --git a/graphics/nxglyphs/src/glyph_calibration24x21.cxx b/graphics/nxglyphs/src/glyph_calibration24x21.cxx index 11ca0dd90..685d2dd5c 100644 --- a/graphics/nxglyphs/src/glyph_calibration24x21.cxx +++ b/graphics/nxglyphs/src/glyph_calibration24x21.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_calibration24x21.cxx + * apps/graphics/nxglyphs/src/glyph_calibration24x21.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" /******************************************************************************************** @@ -72,13 +71,13 @@ using namespace NXWidgets; static const uint32_t g_calibrationNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xfcfcfc, 0xacacac, 0xd8d8d8, 0xd8881c, 0x9c6014 /* Codes 1-5 */ }; static const uint32_t g_calibrationSelectedLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xffffff, 0xc0c0c0, 0xe1e1e1, 0xe1a554, 0xb4874e /* Codes 1-5 */ }; /* RGB16 (565) Colors (four of the colors in this map are duplicates) */ @@ -87,20 +86,20 @@ static const uint32_t g_calibrationSelectedLut[BITMAP_NLUTCODES] = static const uint16_t g_calibrationNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xffff, 0xad75, 0xdedb, 0xdc43, 0x9b02 /* Codes 1-5 */ }; static const uint16_t g_calibrationSelectedLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xffff, 0xc618, 0xe71c, 0xe52a, 0xb429 /* Codes 1-5 */ }; /* 8-bit color lookups. NOTE: This is really dumb! The lookup index is 8-bits and it used * to lookup an 8-bit value. There is no savings in that! It would be better to just put * the 8-bit color/greyscale value in the run-length encoded image and save the cost of these - * pointless lookups. But these p;ointless lookups do make the logic compatible with the + * pointless lookups. But these pointless lookups do make the logic compatible with the * 16- and 24-bit types. */ @@ -111,13 +110,13 @@ static const uint16_t g_calibrationSelectedLut[BITMAP_NLUTCODES] = static const uint8_t g_calibrationNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xfc, 0xac, 0xd8, 0x93, 0x69 /* Codes 1-5 */ }; static const uint8_t g_calibrationSelectedLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xff, 0xc0, 0xe1, 0xad, 0x8d /* Codes 1-5 */ }; @@ -127,13 +126,13 @@ static const uint8_t g_calibrationSelectedLut[BITMAP_NLUTCODES] = static const nxgl_mxpixel_t g_calibrationNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xff, 0xb6, 0xdb, 0xd0, 0x8c /* Codes 1-5 */ }; static const nxgl_mxpixel_t g_calibrationSelectedLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xff, 0xdb, 0xff, 0xf5, 0xb1 /* Codes 1-5 */ }; diff --git a/graphics/nxglyphs/src/glyph_calibration48x42.cxx b/graphics/nxglyphs/src/glyph_calibration48x42.cxx index 424aa5f00..14bddceb0 100644 --- a/graphics/nxglyphs/src/glyph_calibration48x42.cxx +++ b/graphics/nxglyphs/src/glyph_calibration48x42.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_calibration48x42.cxx + * apps/graphics/nxglyphs/src/glyph_calibration48x42.cxx * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" /******************************************************************************************** @@ -75,13 +74,13 @@ using namespace NXWidgets; static const uint32_t g_calibrationNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xbdbdbd, 0xababab, 0x818181, 0x3f3f3f, 0xab6c15, 0x813f15 /* Codes 1-6 */ }; static const uint32_t g_calibrationBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xfcfcfc, 0xe4e4e4, 0xacacac, 0x545454, 0xe4901c, 0xac541c /* Codes 1-6 */ }; @@ -89,13 +88,13 @@ static const uint32_t g_calibrationBrightLut[BITMAP_NLUTCODES] = static const uint32_t g_calibrationNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xfcfcfc, 0xe4e4e4, 0xacacac, 0x545454, 0xe4901c, 0xac541c /* Codes 1-6 */ }; static const uint32_t g_calibrationBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xffffff, 0xffffff, 0xd7d7d7, 0x696969, 0xffb423, 0xd76923 /* Codes 1-6 */ }; # endif /* DARK_CALIB_ICON */ @@ -107,13 +106,13 @@ static const uint32_t g_calibrationBrightLut[BITMAP_NLUTCODES] = static const uint16_t g_calibrationNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xbdf7, 0xad55, 0x8410, 0x39e7, 0xab62, 0x81e2 /* Codes 1-6 */ }; static const uint16_t g_calibrationBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xffff, 0xe73c, 0xad75, 0x52aa, 0xe483, 0xaaa3 /* Codes 1-6 */ }; @@ -121,13 +120,13 @@ static const uint16_t g_calibrationBrightLut[BITMAP_NLUTCODES] = static const uint16_t g_calibrationNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xffff, 0xe73c, 0xad75, 0x52aa, 0xe483, 0xaaa3 /* Codes 1-6 */ }; static const uint16_t g_calibrationBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xffff, 0xffff, 0xd6ba, 0x6b4d, 0xfda4, 0xd344 /* Codes 1-6 */ }; @@ -149,13 +148,13 @@ static const uint16_t g_calibrationBrightLut[BITMAP_NLUTCODES] = static const uint8_t g_calibrationNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xbd, 0xab, 0x81, 0x3f, 0x74, 0x4d /* Codes 1-6 */ }; static const uint8_t g_calibrationBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xfc, 0xe4, 0xac, 0x54, 0x9b, 0x67 /* Codes 1-6 */ }; @@ -163,13 +162,13 @@ static const uint8_t g_calibrationBrightLut[BITMAP_NLUTCODES] = static const uint8_t g_calibrationNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xfc, 0xe4, 0xac, 0x54, 0x9b, 0x67 /* Codes 1-6 */ }; static const uint8_t g_calibrationBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xff, 0xff, 0xd7, 0x69, 0xb9, 0x81 /* Codes 1-6 */ }; @@ -183,13 +182,13 @@ static const uint8_t g_calibrationBrightLut[BITMAP_NLUTCODES] = static const nxgl_mxpixel_t g_calibrationNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xb6, 0xb6, 0x92, 0x24, 0xac, 0x84 /* Codes 1-6 */ }; static const nxgl_mxpixel_t g_calibrationBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xff, 0xff, 0xb6, 0x49, 0xf0, 0xa8 /* Codes 1-6 */ }; @@ -197,13 +196,13 @@ static const nxgl_mxpixel_t g_calibrationBrightLut[BITMAP_NLUTCODES] = static const nxgl_mxpixel_t g_calibrationNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xff, 0xff, 0xb6, 0x49, 0xf0, 0xa8 /* Codes 1-6 */ }; static const nxgl_mxpixel_t g_calibrationBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0xff, 0xff, 0xdb, 0x6d, 0xf4, 0xcc /* Codes 1-6 */ }; diff --git a/graphics/nxglyphs/src/glyph_cmd25x22.cxx b/graphics/nxglyphs/src/glyph_cmd25x22.cxx index 30e9661f8..e2537fbae 100644 --- a/graphics/nxglyphs/src/glyph_cmd25x22.cxx +++ b/graphics/nxglyphs/src/glyph_cmd25x22.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_cmd24x22.cxx + * apps/graphics/nxglyphs/src/glyph_cmd24x22.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" /******************************************************************************************** diff --git a/graphics/nxglyphs/src/glyph_cmd49x43.cxx b/graphics/nxglyphs/src/glyph_cmd49x43.cxx index 19170f469..051da39b3 100644 --- a/graphics/nxglyphs/src/glyph_cmd49x43.cxx +++ b/graphics/nxglyphs/src/glyph_cmd49x43.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_cmd49x43.cxx + * apps/graphics/nxglyphs/src/glyph_cmd49x43.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" /******************************************************************************************** diff --git a/graphics/nxglyphs/src/glyph_mediagrip60x30.cxx b/graphics/nxglyphs/src/glyph_mediagrip60x30.cxx index 720317ca5..ee4450cf7 100644 --- a/graphics/nxglyphs/src/glyph_mediagrip60x30.cxx +++ b/graphics/nxglyphs/src/glyph_mediagrip60x30.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/mediagrip60x30.cxx + * apps/graphics/nxglyphs/src/mediagrip60x30.cxx * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" /******************************************************************************************** @@ -75,13 +74,13 @@ using namespace NXWidgets; static const uint32_t g_gripNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x3663ab, 0x002199, 0xbdbdbd /* Codes 0-3 */ }; static const uint32_t g_gripBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x4884e4, 0x002ccc, 0xfcfcfc /* Codes 0-3 */ }; @@ -89,13 +88,13 @@ static const uint32_t g_gripBrightLut[BITMAP_NLUTCODES] = static const uint32_t g_gripNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x4884e4, 0x002ccc, 0xfcfcfc /* Codes 0-3 */ }; static const uint32_t g_gripBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x5aa5ff, 0x0037ff, 0xffffff /* Codes 0-3 */ }; # endif /* MEDIA_GRIP_DARK_ICON */ @@ -107,13 +106,13 @@ static const uint32_t g_gripBrightLut[BITMAP_NLUTCODES] = static const uint16_t g_gripNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x3315, 0x0113, 0xbdf7 /* Codes 0-3 */ }; static const uint16_t g_gripBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x4c3c, 0x0179, 0xffff /* Codes 0-3 */ }; @@ -121,13 +120,13 @@ static const uint16_t g_gripBrightLut[BITMAP_NLUTCODES] = static const uint16_t g_gripNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x4c3c, 0x0179, 0xffff /* Codes 0-3 */ }; static const uint16_t g_gripBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x5d3f, 0x01bf, 0xffff /* Codes 0-3 */ }; @@ -149,13 +148,13 @@ static const uint16_t g_gripBrightLut[BITMAP_NLUTCODES] = static const uint8_t g_gripNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x5d, 0x24, 0xbd /* Codes 0-3 */ }; static const uint8_t g_gripBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x7d, 0x31, 0xfc /* Codes 0-3 */ }; @@ -163,13 +162,13 @@ static const uint8_t g_gripBrightLut[BITMAP_NLUTCODES] = static const uint8_t g_gripNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x7d, 0x31, 0xfc /* Codes 0-3 */ }; static const uint8_t g_gripBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x98, 0x3d, 0xff /* Codes 0-3 */ }; @@ -183,13 +182,13 @@ static const uint8_t g_gripBrightLut[BITMAP_NLUTCODES] = static const nxgl_mxpixel_t g_gripNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x2e, 0x06, 0xb6 /* Codes 0-3 */ }; static const nxgl_mxpixel_t g_gripBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x53, 0x07, 0xff /* Codes 0-3 */ }; @@ -197,13 +196,13 @@ static const nxgl_mxpixel_t g_gripBrightLut[BITMAP_NLUTCODES] = static const nxgl_mxpixel_t g_gripNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x53, 0x07, 0xff /* Codes 0-3 */ }; static const nxgl_mxpixel_t g_gripBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x57, 0x07, 0xff /* Codes 0-3 */ }; diff --git a/graphics/nxglyphs/src/glyph_mediaplayer24x24.cxx b/graphics/nxglyphs/src/glyph_mediaplayer24x24.cxx index 1a620d2f4..787ed3caa 100644 --- a/graphics/nxglyphs/src/glyph_mediaplayer24x24.cxx +++ b/graphics/nxglyphs/src/glyph_mediaplayer24x24.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_mediaplayer24x24.cxx + * apps/graphics/nxglyphs/src/glyph_mediaplayer24x24.cxx * * Copyright (C) 2013 Ken Pettit. All rights reserved. * Author: Ken Pettit @@ -49,7 +49,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" /******************************************************************************************** @@ -72,14 +71,14 @@ static const nxwidget_pixel_t palette[BITMAP_PALETTESIZE] = { MKRGB(248,252,251), MKRGB(120,198,241), MKRGB( 97,177,228), MKRGB( 31,104,177), MKRGB( 73,153,213), MKRGB( 46,122,193), MKRGB(140,196,230), MKRGB( 9, 77,154), - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR + CONFIG_NXGLYPHS_BACKGROUNDCOLOR }; static const nxwidget_pixel_t hilight_palette[BITMAP_PALETTESIZE] = { MKRGB(255,255,255), MKRGB(170,248,255), MKRGB(147,227,255), MKRGB( 81,154,227), MKRGB(123,203,255), MKRGB( 96,172,243), MKRGB(190,246,255), MKRGB( 59,127,204), - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR + CONFIG_NXGLYPHS_BACKGROUNDCOLOR }; static const SRlePaletteBitmapEntry bitmap[] = diff --git a/graphics/nxglyphs/src/glyph_mediaplayer44x50.cxx b/graphics/nxglyphs/src/glyph_mediaplayer44x50.cxx index 6b254df13..18b370be1 100644 --- a/graphics/nxglyphs/src/glyph_mediaplayer44x50.cxx +++ b/graphics/nxglyphs/src/glyph_mediaplayer44x50.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_mediaplayer44x50.cxx + * apps/graphics/nxglyphs/src/glyph_mediaplayer44x50.cxx * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" /******************************************************************************************** @@ -75,13 +74,13 @@ using namespace NXWidgets; static const uint32_t g_mediaplayerNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x002199, 0xbdbdbd, 0x4e8199, 0x276099 /* Codes 1-4 */ }; static const uint32_t g_mediaplayerBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x002ccc, 0xfcfcfc, 0x68accc, 0x3480cc /* Codes 1-4 */ }; @@ -89,13 +88,13 @@ static const uint32_t g_mediaplayerBrightLut[BITMAP_NLUTCODES] = static const uint32_t g_mediaplayerNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x002ccc, 0xfcfcfc, 0x68accc, 0x3480cc /* Codes 1-4 */ }; static const uint32_t g_mediaplayerBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x0037ff, 0xffffff, 0x82d7ff, 0x41a0ff /* Codes 1-4 */ }; # endif /* DARK_MEDIAPLAYER_ICON */ @@ -107,13 +106,13 @@ static const uint32_t g_mediaplayerBrightLut[BITMAP_NLUTCODES] = static const uint16_t g_mediaplayerNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x0113, 0xbdf7, 0x4c13, 0x2313 /* Codes 1-4 */ }; static const uint16_t g_mediaplayerBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x0179, 0xffff, 0x6d79, 0x3419 /* Codes 1-4 */ }; @@ -121,13 +120,13 @@ static const uint16_t g_mediaplayerBrightLut[BITMAP_NLUTCODES] = static const uint16_t g_mediaplayerNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x0179, 0xffff, 0x6d79, 0x3419 /* Codes 1-4 */ }; static const uint16_t g_mediaplayerBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x01bf, 0xffff, 0x86bf, 0x451f /* Codes 1-4 */ }; @@ -149,13 +148,13 @@ static const uint16_t g_mediaplayerBrightLut[BITMAP_NLUTCODES] = static const uint8_t g_mediaplayerNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x24, 0xbd, 0x74, 0x55 /* Codes 1-4 */ }; static const uint8_t g_mediaplayerBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x31, 0xfc, 0x9b, 0x71 /* Codes 1-4 */ }; @@ -163,13 +162,13 @@ static const uint8_t g_mediaplayerBrightLut[BITMAP_NLUTCODES] = static const uint8_t g_mediaplayerNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x31, 0xfc, 0x9b, 0x71 /* Codes 1-4 */ }; static const uint8_t g_mediaplayerBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x3d, 0xff, 0xc2, 0x8e /* Codes 1-4 */ }; @@ -183,13 +182,13 @@ static const uint8_t g_mediaplayerBrightLut[BITMAP_NLUTCODES] = static const nxgl_mxpixel_t g_mediaplayerNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x06, 0xb6, 0x52, 0x2e, /* Codes 1-4 */ }; static const nxgl_mxpixel_t g_mediaplayerBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x07, 0xff, 0x77, 0x33, /* Codes 1-4 */ }; @@ -197,13 +196,13 @@ static const nxgl_mxpixel_t g_mediaplayerBrightLut[BITMAP_NLUTCODES] = static const nxgl_mxpixel_t g_mediaplayerNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x07, 0xff, 0x77, 0x33, /* Codes 1-4 */ }; static const nxgl_mxpixel_t g_mediaplayerBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x07, 0xff, 0x9b, 0x57, /* Codes 1-4 */ }; diff --git a/graphics/nxglyphs/src/glyph_menu21x21.cxx b/graphics/nxglyphs/src/glyph_menu21x21.cxx index 4df453177..7b7f825e9 100644 --- a/graphics/nxglyphs/src/glyph_menu21x21.cxx +++ b/graphics/nxglyphs/src/glyph_menu21x21.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_menu21x21.cxx + * apps/graphics/nxglyphs/src/glyph_menu21x21.cxx * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/nxglyphs/src/glyph_menu42x42.cxx b/graphics/nxglyphs/src/glyph_menu42x42.cxx index fda701f43..ef7618343 100644 --- a/graphics/nxglyphs/src/glyph_menu42x42.cxx +++ b/graphics/nxglyphs/src/glyph_menu42x42.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_men42x42.cxx + * apps/graphics/nxglyphs/src/glyph_men42x42.cxx * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/nxglyphs/src/glyph_minimize21x21.cxx b/graphics/nxglyphs/src/glyph_minimize21x21.cxx index ba2820a64..50466b8cf 100644 --- a/graphics/nxglyphs/src/glyph_minimize21x21.cxx +++ b/graphics/nxglyphs/src/glyph_minimize21x21.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_minimize21x21.cxx + * apps/graphics/nxglyphs/src/glyph_minimize21x21.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" /******************************************************************************************** diff --git a/graphics/nxglyphs/src/glyph_minimize42x42.cxx b/graphics/nxglyphs/src/glyph_minimize42x42.cxx index 1021bd166..7a48b4c4b 100644 --- a/graphics/nxglyphs/src/glyph_minimize42x42.cxx +++ b/graphics/nxglyphs/src/glyph_minimize42x42.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_minimize42x42.cxx + * apps/graphics/nxglyphs/src/glyph_minimize42x42.cxx * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" /******************************************************************************************** diff --git a/graphics/nxglyphs/src/glyph_mplayer_controls32x32.cxx b/graphics/nxglyphs/src/glyph_mplayer_controls32x32.cxx index 96c7df3b3..005b401c5 100644 --- a/graphics/nxglyphs/src/glyph_mplayer_controls32x32.cxx +++ b/graphics/nxglyphs/src/glyph_mplayer_controls32x32.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_mediaplayer32x32.cxx + * apps/graphics/nxglyphs/src/glyph_mediaplayer32x32.cxx * * Copyright (C) 2013 Ken Pettit. All rights reserved. * Author: Ken Pettit @@ -52,7 +52,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" @@ -70,13 +69,13 @@ using namespace NXWidgets; static const nxwidget_pixel_t palette[BITMAP_PALETTESIZE] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, MKRGB( 11, 24,108), MKRGB( 63, 90,192), MKRGB(121,136,250), + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, MKRGB( 11, 24,108), MKRGB( 63, 90,192), MKRGB(121,136,250), MKRGB(224,234,244), MKRGB( 69, 80,149), MKRGB(127,169,239), MKRGB(152,174,207), }; static const nxwidget_pixel_t hilight_palette[BITMAP_PALETTESIZE] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, MKRGB( 61, 74,158), MKRGB(113,140,242), MKRGB(171,186,255), + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, MKRGB( 61, 74,158), MKRGB(113,140,242), MKRGB(171,186,255), MKRGB(255,255,255), MKRGB(119,130,199), MKRGB(177,219,255), MKRGB(202,224,255), }; diff --git a/graphics/nxglyphs/src/glyph_mplayer_controls43x41.cxx b/graphics/nxglyphs/src/glyph_mplayer_controls43x41.cxx index 4095c03f1..98d8643b5 100644 --- a/graphics/nxglyphs/src/glyph_mplayer_controls43x41.cxx +++ b/graphics/nxglyphs/src/glyph_mplayer_controls43x41.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_mediaplayer43x41.cxx + * apps/graphics/nxglyphs/src/glyph_mediaplayer43x41.cxx * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -52,7 +52,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" /******************************************************************************************** @@ -83,7 +82,7 @@ using namespace NXWidgets; static const nxwidget_pixel_t g_normalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ MKRGB(54,99,171), /* Code 1 */ MKRGB(0,33,153), /* Code 2 */ MKRGB(12,16,120) /* Code 3 */ @@ -91,7 +90,7 @@ static const nxwidget_pixel_t g_normalLut[BITMAP_NLUTCODES] = static const nxwidget_pixel_t g_brightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ #if 1 // Red MKRGB(228,132,72), /* Code 1 */ MKRGB(204,44,0), /* Code 2 */ diff --git a/graphics/nxglyphs/src/glyph_nxicon21x21.cxx b/graphics/nxglyphs/src/glyph_nxicon21x21.cxx index af39667bc..6fafe4e66 100644 --- a/graphics/nxglyphs/src/glyph_nxicon21x21.cxx +++ b/graphics/nxglyphs/src/glyph_nxicon21x21.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_nxicon21x21.cxx + * apps/graphics/nxglyphs/src/glyph_nxicon21x21.cxx * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/nxglyphs/src/glyph_nxicon42x42.cxx b/graphics/nxglyphs/src/glyph_nxicon42x42.cxx index 50a818984..32bb4902e 100644 --- a/graphics/nxglyphs/src/glyph_nxicon42x42.cxx +++ b/graphics/nxglyphs/src/glyph_nxicon42x42.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_nxicon42x42.cxx + * apps/graphics/nxglyphs/src/glyph_nxicon42x42.cxx * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/nxglyphs/src/glyph_play24x24.cxx b/graphics/nxglyphs/src/glyph_play24x24.cxx index a7b977039..d3ac2f530 100644 --- a/graphics/nxglyphs/src/glyph_play24x24.cxx +++ b/graphics/nxglyphs/src/glyph_play24x24.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_play24x24.cxx + * apps/graphics/nxglyphs/src/glyph_play24x24.cxx * * Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" /******************************************************************************************** @@ -75,13 +74,13 @@ using namespace NXWidgets; static const uint32_t g_playNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x00bd00, 0x008100, 0x006300, 0x003600 /* Codes 1-4 */ }; static const uint32_t g_playBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x00fc00, 0x00ac00, 0x008400, 0x004800 /* Codes 1-4 */ }; @@ -89,13 +88,13 @@ static const uint32_t g_playBrightLut[BITMAP_NLUTCODES] = static const uint32_t g_playNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x00fc00, 0x00ac00, 0x008400, 0x004800 /* Codes 1-4 */ }; static const uint32_t g_playBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x00fc00, 0x00c000, 0x00a200, 0x007500 /* Codes 1-4 */ }; # endif /* DARK_PLAY_ICON */ @@ -107,13 +106,13 @@ static const uint32_t g_playBrightLut[BITMAP_NLUTCODES] = static const uint16_t g_playNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x05e0, 0x0400, 0x0300, 0x01a0 /* Codes 1-4 */ }; static const uint16_t g_playBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x07e0, 0x0560, 0x0420, 0x0240 /* Codes 1-4 */ }; @@ -121,13 +120,13 @@ static const uint16_t g_playBrightLut[BITMAP_NLUTCODES] = static const uint16_t g_playNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x07e0, 0x0560, 0x0420, 0x0240 /* Codes 1-4 */ }; static const uint16_t g_playBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x07e0, 0x0600, 0x0500, 0x03a0 /* Codes 1-4 */ }; @@ -149,13 +148,13 @@ static const uint16_t g_playBrightLut[BITMAP_NLUTCODES] = static const uint8_t g_playNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x6e, 0x4b, 0x3a, 0x1f /* Codes 1-4 */ }; static const uint8_t g_playBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x93, 0x64, 0x4d, 0x2a /* Codes 1-4 */ }; @@ -163,13 +162,13 @@ static const uint8_t g_playBrightLut[BITMAP_NLUTCODES] = static const uint8_t g_playNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x93, 0x64, 0x4d, 0x2a /* Codes 1-4 */ }; static const uint8_t g_playBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x93, 0x70, 0x5f, 0x44 /* Codes 1-4 */ }; @@ -181,13 +180,13 @@ static const uint8_t g_playBrightLut[BITMAP_NLUTCODES] = # ifdef DARK_PLAY_ICON static const nxgl_mxpixel_t g_playNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x14, 0x10, 0x0c, 0x04 /* Codes 1-4 */ }; static const nxgl_mxpixel_t g_playBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x1c, 0x14, 0x10, 0x08 /* Codes 1-4 */ }; @@ -195,13 +194,13 @@ static const nxgl_mxpixel_t g_playBrightLut[BITMAP_NLUTCODES] = static const nxgl_mxpixel_t g_playNormalLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x1c, 0x14, 0x10, 0x08 /* Codes 1-4 */ }; static const nxgl_mxpixel_t g_playBrightLut[BITMAP_NLUTCODES] = { - CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Code 0 */ + CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Code 0 */ 0x1c, 0x18, 0x14, 0x0c /* Codes 1-4 */ }; diff --git a/graphics/nxglyphs/src/glyph_play48x48.cxx b/graphics/nxglyphs/src/glyph_play48x48.cxx index 5b6404b75..f8e457755 100644 --- a/graphics/nxglyphs/src/glyph_play48x48.cxx +++ b/graphics/nxglyphs/src/glyph_play48x48.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_play24x24.cxx + * apps/graphics/nxglyphs/src/glyph_play24x24.cxx * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" /******************************************************************************************** @@ -75,13 +74,13 @@ using namespace NXWidgets; static const uint32_t g_playNormalLut[BITMAP_NLUTCODES] = { - 0x00a200, 0x00bd00, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */ + 0x00a200, 0x00bd00, CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Codes 0-2 */ 0x008400, 0x006600, 0x004e00, 0x003600 /* Codes 3-6 */ }; static const uint32_t g_playBrightLut[BITMAP_NLUTCODES] = { - 0x00d800, 0x00fc00, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */ + 0x00d800, 0x00fc00, CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Codes 0-2 */ 0x00b000, 0x008800, 0x006800, 0x004800 /* Codes 3-6 */ }; @@ -89,13 +88,13 @@ static const uint32_t g_playBrightLut[BITMAP_NLUTCODES] = static const uint32_t g_playNormalLut[BITMAP_NLUTCODES] = { - 0x00d800, 0x00fc00, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */ + 0x00d800, 0x00fc00, CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Codes 0-2 */ 0x00b000, 0x008800, 0x006800, 0x004800 /* Codes 3-6 */ }; static const uint32_t g_playBrightLut[BITMAP_NLUTCODES] = { - 0x00ff00, 0x00ff00, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */ + 0x00ff00, 0x00ff00, CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Codes 0-2 */ 0x00dc00, 0x00aa00, 0x008200, 0x005a00 /* Codes 3-6 */ }; @@ -108,13 +107,13 @@ static const uint32_t g_playBrightLut[BITMAP_NLUTCODES] = static const uint16_t g_playNormalLut[BITMAP_NLUTCODES] = { - 0x0500, 0x05e0, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */ + 0x0500, 0x05e0, CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Codes 0-2 */ 0x0420, 0x0320, 0x0260, 0x01a0 /* Codes 3-6 */ }; static const uint16_t g_playBrightLut[BITMAP_NLUTCODES] = { - 0x06c0, 0x07e0, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */ + 0x06c0, 0x07e0, CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Codes 0-2 */ 0x0580, 0x0440, 0x0340, 0x0240 /* Codes 3-6 */ }; @@ -122,13 +121,13 @@ static const uint16_t g_playBrightLut[BITMAP_NLUTCODES] = static const uint16_t g_playNormalLut[BITMAP_NLUTCODES] = { - 0x06c0, 0x07e0, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */ + 0x06c0, 0x07e0, CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Codes 0-2 */ 0x0580, 0x0440, 0x0340, 0x0240 /* Codes 3-6 */ }; static const uint16_t g_playBrightLut[BITMAP_NLUTCODES] = { - 0x07e0, 0x07e0, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */ + 0x07e0, 0x07e0, CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Codes 0-2 */ 0x06e0, 0x0540, 0x0400, 0x02c0 /* Codes 3-6 */ }; @@ -150,13 +149,13 @@ static const uint16_t g_playBrightLut[BITMAP_NLUTCODES] = static const uint8_t g_playNormalLut[BITMAP_NLUTCODES] = { - 0x5f, 0x6e, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */ + 0x5f, 0x6e, CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Codes 0-2 */ 0x4d, 0x3b, 0x2d, 0x1f /* Codes 3-6 */ }; static const uint8_t g_playBrightLut[BITMAP_NLUTCODES] = { - 0x7e, 0x93, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */ + 0x7e, 0x93, CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Codes 0-2 */ 0x67, 0x4f, 0x3d, 0x2a /* Codes 3-6 */ }; @@ -164,13 +163,13 @@ static const uint8_t g_playBrightLut[BITMAP_NLUTCODES] = static const uint8_t g_playNormalLut[BITMAP_NLUTCODES] = { - 0x7e, 0x93, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */ + 0x7e, 0x93, CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Codes 0-2 */ 0x67, 0x4f, 0x3d, 0x2a /* Codes 3-6 */ }; static const uint8_t g_playBrightLut[BITMAP_NLUTCODES] = { - 0x95, 0x95, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */ + 0x95, 0x95, CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Codes 0-2 */ 0x81, 0x63, 0x4c, 0x34 /* Codes 3-6 */ }; @@ -183,13 +182,13 @@ static const uint8_t g_playBrightLut[BITMAP_NLUTCODES] = static const nxgl_mxpixel_t g_playNormalLut[BITMAP_NLUTCODES] = { - 0x14, 0x14, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */ + 0x14, 0x14, CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Codes 0-2 */ 0x10, 0x0c, 0x08, 0x04 /* Codes 3-6 */ }; static const nxgl_mxpixel_t g_playBrightLut[BITMAP_NLUTCODES] = { - 0x18, 0x1c, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */ + 0x18, 0x1c, CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Codes 0-2 */ 0x14, 0x10, 0x0c, 0x08 /* Codes 3-6 */ }; @@ -197,13 +196,13 @@ static const nxgl_mxpixel_t g_playBrightLut[BITMAP_NLUTCODES] = static const nxgl_mxpixel_t g_playNormalLut[BITMAP_NLUTCODES] = { - 0x18, 0x1c, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */ + 0x18, 0x1c, CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Codes 0-2 */ 0x14, 0x10, 0x0c, 0x08 /* Codes 3-6 */ }; static const nxgl_mxpixel_t g_playBrightLut[BITMAP_NLUTCODES] = { - 0x1c, 0x1c, CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR, /* Codes 0-2 */ + 0x1c, 0x1c, CONFIG_NXGLYPHS_BACKGROUNDCOLOR, /* Codes 0-2 */ 0x18, 0x14, 0x10, 0x08 /* Codes 3-6 */ }; diff --git a/graphics/nxglyphs/src/glyph_resize21x21.cxx b/graphics/nxglyphs/src/glyph_resize21x21.cxx index 79c0c3457..a2f36c04a 100644 --- a/graphics/nxglyphs/src/glyph_resize21x21.cxx +++ b/graphics/nxglyphs/src/glyph_resize21x21.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_resize21x21.cxx + * apps/graphics/nxglyphs/src/glyph_resize21x21.cxx * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/nxglyphs/src/glyph_resize42x42.cxx b/graphics/nxglyphs/src/glyph_resize42x42.cxx index 6c46a69f8..9cd7caad5 100644 --- a/graphics/nxglyphs/src/glyph_resize42x42.cxx +++ b/graphics/nxglyphs/src/glyph_resize42x42.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_resize42x42.cxx + * apps/graphics/nxglyphs/src/glyph_resize42x42.cxx * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/graphics/nxglyphs/src/glyph_stop21x21.cxx b/graphics/nxglyphs/src/glyph_stop21x21.cxx index 72fcd018a..b2b94f7d4 100644 --- a/graphics/nxglyphs/src/glyph_stop21x21.cxx +++ b/graphics/nxglyphs/src/glyph_stop21x21.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_stop21x21.cxx + * apps/graphics/nxglyphs/src/glyph_stop21x21.cxx * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" /******************************************************************************************** diff --git a/graphics/nxglyphs/src/glyph_stop42x42.cxx b/graphics/nxglyphs/src/glyph_stop42x42.cxx index 6115b4ed0..84a6e533c 100644 --- a/graphics/nxglyphs/src/glyph_stop42x42.cxx +++ b/graphics/nxglyphs/src/glyph_stop42x42.cxx @@ -1,5 +1,5 @@ /******************************************************************************************** - * apps/graphics/nxwm/src/glyph_stop42x42.cxx + * apps/graphics/nxglyphs/src/glyph_stop42x42.cxx * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -49,7 +49,6 @@ #include "graphics/nxwidgets/crlepalettebitmap.hxx" -#include "graphics/nxwm/nxwmconfig.hxx" #include "graphics/nxglyphs.hxx" /******************************************************************************************** diff --git a/graphics/nxglyphs/src/mksrle.c b/graphics/nxglyphs/src/mksrle.c index 6a9e7539e..1e61d876e 100644 --- a/graphics/nxglyphs/src/mksrle.c +++ b/graphics/nxglyphs/src/mksrle.c @@ -146,7 +146,7 @@ int main(int argc, char **argv, char **envp) int j; printf("/********************************************************************************************\n"); - printf(" * apps/graphics/nxwm/src/glyph_xxxxxx.cxx\n"); + printf(" * apps/graphics/nxglyphs/src/glyph_xxxxxx.cxx\n"); printf(" *\n"); printf(" * Copyright (C) 2019 Gregory Nutt. All rights reserved.\n"); printf(" * Author: Gregory Nutt \n"); diff --git a/graphics/twm4nx/Makefile b/graphics/twm4nx/Makefile index db1b43ab0..fad100217 100644 --- a/graphics/twm4nx/Makefile +++ b/graphics/twm4nx/Makefile @@ -54,7 +54,8 @@ STACKSIZE = $(CONFIG_TWM4NX_STACKSIZE) ASRCS = CSRCS = -CXXSRCS = cbackground.cxx cfonts.cxx ciconmgr.cxx ciconwidget.cxx +CXXSRCS = twm4nx_main.cxx +CXXSRCS += cbackground.cxx cfonts.cxx ciconmgr.cxx ciconwidget.cxx CXXSRCS += cmenus.cxx cmainmenu.cxx CXXSRCS += cwindow.cxx cwindowevent.cxx cresize.cxx cwindowfactory.cxx CXXSRCS += cinput.cxx twm4nx_cursor.cxx diff --git a/graphics/twm4nx/src/cfonts.cxx b/graphics/twm4nx/src/cfonts.cxx index ada145b6f..ba282ec18 100644 --- a/graphics/twm4nx/src/cfonts.cxx +++ b/graphics/twm4nx/src/cfonts.cxx @@ -11,6 +11,8 @@ // Copyright 1988 by Evans & Sutherland Computer Corporation, // // Please refer to apps/twm4nx/COPYING for detailed copyright information. +// Although not listed as a copyright holder, thanks and recognition need +// to go to Tom LaStrange, the original author of TWM. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/graphics/twm4nx/src/ciconmgr.cxx b/graphics/twm4nx/src/ciconmgr.cxx index 104b1a4ca..57cecbc28 100644 --- a/graphics/twm4nx/src/ciconmgr.cxx +++ b/graphics/twm4nx/src/ciconmgr.cxx @@ -10,6 +10,8 @@ // Copyright 1989,1998 The Open Group // // Please refer to apps/twm4nx/COPYING for detailed copyright information. +// Although not listed as a copyright holder, thanks and recognition need +// to go to Tom LaStrange, the original author of TWM. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/graphics/twm4nx/src/cmenus.cxx b/graphics/twm4nx/src/cmenus.cxx index 22174da8b..8a285f93a 100644 --- a/graphics/twm4nx/src/cmenus.cxx +++ b/graphics/twm4nx/src/cmenus.cxx @@ -11,6 +11,8 @@ // Copyright 1988 by Evans & Sutherland Computer Corporation, // // Please refer to apps/twm4nx/COPYING for detailed copyright information. +// Although not listed as a copyright holder, thanks and recognition need +// to go to Tom LaStrange, the original author of TWM. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/graphics/twm4nx/src/cresize.cxx b/graphics/twm4nx/src/cresize.cxx index 784b3785b..0d02b8e51 100644 --- a/graphics/twm4nx/src/cresize.cxx +++ b/graphics/twm4nx/src/cresize.cxx @@ -10,6 +10,8 @@ // Copyright 1988 by Evans & Sutherland Computer Corporation, // // Please refer to apps/twm4nx/COPYING for detailed copyright information. +// Although not listed as a copyright holder, thanks and recognition need +// to go to Tom LaStrange, the original author of TWM. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions @@ -521,6 +523,13 @@ bool CResize::startResize(FAR struct SEventMsg *eventmsg) m_sizeWindow->modal(true); m_resizing = true; m_resized = false; + +#ifdef CONFIG_TWM4NX_MOUSE + // Select the resize cursor + +# warning Missing logic +#endif + return true; } @@ -722,6 +731,12 @@ bool CResize::resumeResize(FAR struct SEventMsg *eventmsg) return false; } +#ifdef CONFIG_TWM4NX_MOUSE + // Restore the normal cursor + +# warning Missing logic +#endif + // Reset the the window position and size if (!m_resizeWindow->getFramePosition(&m_lastPos)) diff --git a/graphics/twm4nx/src/ctwm4nx.cxx b/graphics/twm4nx/src/ctwm4nx.cxx index 844be1b7f..3830e16e3 100644 --- a/graphics/twm4nx/src/ctwm4nx.cxx +++ b/graphics/twm4nx/src/ctwm4nx.cxx @@ -11,6 +11,8 @@ // Copyright 1988 by Evans & Sutherland Computer Corporation, // // Please refer to apps/twm4nx/COPYING for detailed copyright information. +// Although not listed as a copyright holder, thanks and recognition need +// to go to Tom LaStrange, the original author of TWM. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions @@ -55,16 +57,12 @@ #include #include -#include #include #include #include #include -#include "platform/cxxinitialize.h" -#include "netutils/netinit.h" - // Core Twm4Nx Definitions #include "graphics/twm4nx/twm4nx_config.hxx" @@ -86,25 +84,6 @@ #include "graphics/twm4nx/cnxterm.hxx" -///////////////////////////////////////////////////////////////////////////// -// Pre-processor Definitions -///////////////////////////////////////////////////////////////////////////// - -#define DEFAULT_NICE_FONT "variable" -#define DEFAULT_FAST_FONT "fixed" - -///////////////////////////////////////////////////////////////////////////// -// Public Function Prototypes -///////////////////////////////////////////////////////////////////////////// - -// Suppress name-mangling - -#ifdef BUILD_MODULE -extern "C" int main(int argc, FAR char *argv[]); -#else -extern "C" int twm4nx_main(int argc, char *argv[]); -#endif - ///////////////////////////////////////////////////////////////////////////// // Public Data ///////////////////////////////////////////////////////////////////////////// @@ -606,130 +585,3 @@ void CTwm4Nx::cleanup() CNxServer::disconnect(); } -///////////////////////////////////////////////////////////////////////////// -// Public Functions -///////////////////////////////////////////////////////////////////////////// - -///////////////////////////////////////////////////////////////////////////// -// Name: main/twm4nx_main -// -// Description: -// Start of TWM -// -///////////////////////////////////////////////////////////////////////////// - -#ifdef BUILD_MODULE -int main(int argc, FAR char *argv[]) -#else -int twm4nx_main(int argc, char *argv[]) -#endif -{ - int display = 0; - - for (int i = 1; i < argc; i++) - { - if (argv[i][0] == '-') - { - switch (argv[i][1]) - { - case 'd': // -display - if (std::strcmp(&argv[i][1], "display")) - { - goto usage; - } - - if (++i >= argc) - { - goto usage; - } - - display = atoi(argv[i]); - continue; - } - } - - usage: - twmerr("Usage: %s [-display ]\n", argv[0]); - return EXIT_FAILURE; - } - - int ret; - -#if defined(CONFIG_TWM4NX_ARCHINIT) && defined(CONFIG_LIB_BOARDCTL) && \ - !defined(CONFIG_BOARD_LATE_INITIALIZE) - // Should we perform board-specific initialization? There are two ways - // that board initialization can occur: 1) automatically via - // board_late_initialize() during bootup if CONFIG_BOARD_LATE_INITIALIZE, or - // 2) here via a call to boardctl() if the interface is enabled - // (CONFIG_LIB_BOARDCTL=y). board_early_initialize() is also possibility, - // although less likely. - - ret = boardctl(BOARDIOC_INIT, 0); - if (ret < 0) - { - twmerr("ERROR: boardctl(BOARDIOC_INIT) failed: %d\n", errno); - return EXIT_FAILURE; - } -#endif - -#ifdef CONFIG_TWM4NX_NETINIT - /* Bring up the network */ - - ret = netinit_bringup(); - if (ret < 0) - { - twmerr("ERROR: netinit_bringup() failed: %d\n", ret); - return EXIT_FAILURE; - } -#endif - - UNUSED(ret); - -#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) - // Call all C++ static constructors - - up_cxxinitialize(); -#endif - - /* Create an instance of CTwm4Nx and initialize it */ - - FAR CTwm4Nx *twm4nx = new CTwm4Nx(display); - if (twm4nx == (FAR CTwm4Nx *)0) - { - twmerr("ERROR: Failed to instantiate CTwm4Nx\n"); - return EXIT_FAILURE; - } - - bool success = twm4nx->initialize(); - if (!success) - { - twmerr(" ERROR: Failed to initialize CTwm4Nx\n"); - return EXIT_FAILURE; - } - - // Twm4Nx is fully initialized and we may now register applications - // Revisit. This is currently hardward coded here for testing. There - // needs to be a more flexible method if adding applications at run - // time. - -#ifdef CONFIG_TWM4NX_NXTERM - CNxTermFactory factory; - success = factory.initialize(twm4nx); - if (!success) - { - twmerr(" ERROR: Failed to initialize CNxTermFactory\n"); - return EXIT_FAILURE; - } -#endif - - // Start the Twm4Nx event loop - - success = twm4nx->eventLoop(); - if (!success) - { - twmerr(" ERROR: Event loop terminating due to failure\n"); - return EXIT_FAILURE; - } - - return EXIT_SUCCESS; -} diff --git a/graphics/twm4nx/src/cwindow.cxx b/graphics/twm4nx/src/cwindow.cxx index 3de69553b..01cf14e7c 100644 --- a/graphics/twm4nx/src/cwindow.cxx +++ b/graphics/twm4nx/src/cwindow.cxx @@ -11,6 +11,8 @@ // Copyright 1988 by Evans & Sutherland Computer Corporation, // // Please refer to apps/twm4nx/COPYING for detailed copyright information. +// Although not listed as a copyright holder, thanks and recognition need +// to go to Tom LaStrange, the original author of TWM. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/graphics/twm4nx/src/cwindowfactory.cxx b/graphics/twm4nx/src/cwindowfactory.cxx index fb3711419..640f8151b 100644 --- a/graphics/twm4nx/src/cwindowfactory.cxx +++ b/graphics/twm4nx/src/cwindowfactory.cxx @@ -12,6 +12,8 @@ // Copyright 1988 by Evans & Sutherland Computer Corporation, // // Please refer to apps/twm4nx/COPYING for detailed copyright information. +// Although not listed as a copyright holder, thanks and recognition need +// to go to Tom LaStrange, the original author of TWM. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/graphics/twm4nx/src/twm4nx_main.cxx b/graphics/twm4nx/src/twm4nx_main.cxx new file mode 100644 index 000000000..d872a3a41 --- /dev/null +++ b/graphics/twm4nx/src/twm4nx_main.cxx @@ -0,0 +1,196 @@ +///////////////////////////////////////////////////////////////////////////// +// apps/graphics/twm4nx/src/twm4nx_main.cxx +// Twm4Nx main entry point +// +// Copyright (C) 2019 Gregory Nutt. All rights reserved. +// Author: Gregory Nutt +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in +// the documentation and/or other materials provided with the +// distribution. +// 3. Neither the name NuttX nor the names of its contributors may be +// used to endorse or promote products derived from this software +// without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. +// +///////////////////////////////////////////////////////////////////////////// + +///////////////////////////////////////////////////////////////////////////// +// Included Files +///////////////////////////////////////////////////////////////////////////// + +#include + +#include +#include +#include + +#include + +#include "platform/cxxinitialize.h" +#include "netutils/netinit.h" + +#include "graphics/twm4nx/twm4nx_config.hxx" +#include "graphics/twm4nx/ctwm4nx.hxx" +#include "graphics/twm4nx/cnxterm.hxx" + +///////////////////////////////////////////////////////////////////////////// +// Public Function Prototypes +///////////////////////////////////////////////////////////////////////////// + +// Suppress name-mangling + +#ifdef BUILD_MODULE +extern "C" int main(int argc, FAR char *argv[]); +#else +extern "C" int twm4nx_main(int argc, char *argv[]); +#endif + +///////////////////////////////////////////////////////////////////////////// +// Public Functions +///////////////////////////////////////////////////////////////////////////// + +using namespace Twm4Nx; + +///////////////////////////////////////////////////////////////////////////// +// Name: main/twm4nx_main +// +// Description: +// Start of TWM +// +///////////////////////////////////////////////////////////////////////////// + +#ifdef BUILD_MODULE +int main(int argc, FAR char *argv[]) +#else +int twm4nx_main(int argc, char *argv[]) +#endif +{ + int display = 0; + + for (int i = 1; i < argc; i++) + { + if (argv[i][0] == '-') + { + switch (argv[i][1]) + { + case 'd': // -display + if (std::strcmp(&argv[i][1], "display")) + { + goto usage; + } + + if (++i >= argc) + { + goto usage; + } + + display = atoi(argv[i]); + continue; + } + } + + usage: + twmerr("Usage: %s [-display ]\n", argv[0]); + return EXIT_FAILURE; + } + + int ret; + +#if defined(CONFIG_TWM4NX_ARCHINIT) && defined(CONFIG_LIB_BOARDCTL) && \ + !defined(CONFIG_BOARD_LATE_INITIALIZE) + // Should we perform board-specific initialization? There are two ways + // that board initialization can occur: 1) automatically via + // board_late_initialize() during bootup if CONFIG_BOARD_LATE_INITIALIZE, or + // 2) here via a call to boardctl() if the interface is enabled + // (CONFIG_LIB_BOARDCTL=y). board_early_initialize() is also possibility, + // although less likely. + + ret = boardctl(BOARDIOC_INIT, 0); + if (ret < 0) + { + twmerr("ERROR: boardctl(BOARDIOC_INIT) failed: %d\n", errno); + return EXIT_FAILURE; + } +#endif + +#ifdef CONFIG_TWM4NX_NETINIT + /* Bring up the network */ + + ret = netinit_bringup(); + if (ret < 0) + { + twmerr("ERROR: netinit_bringup() failed: %d\n", ret); + return EXIT_FAILURE; + } +#endif + + UNUSED(ret); + +#if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) + // Call all C++ static constructors + + up_cxxinitialize(); +#endif + + /* Create an instance of CTwm4Nx and initialize it */ + + FAR CTwm4Nx *twm4nx = new CTwm4Nx(display); + if (twm4nx == (FAR CTwm4Nx *)0) + { + twmerr("ERROR: Failed to instantiate CTwm4Nx\n"); + return EXIT_FAILURE; + } + + bool success = twm4nx->initialize(); + if (!success) + { + twmerr(" ERROR: Failed to initialize CTwm4Nx\n"); + return EXIT_FAILURE; + } + + // Twm4Nx is fully initialized and we may now register applications + // Revisit. This is currently hardward coded here for testing. There + // needs to be a more flexible method if adding applications at run + // time. + +#ifdef CONFIG_TWM4NX_NXTERM + CNxTermFactory factory; + success = factory.initialize(twm4nx); + if (!success) + { + twmerr(" ERROR: Failed to initialize CNxTermFactory\n"); + return EXIT_FAILURE; + } +#endif + + // Start the Twm4Nx event loop + + success = twm4nx->eventLoop(); + if (!success) + { + twmerr(" ERROR: Event loop terminating due to failure\n"); + return EXIT_FAILURE; + } + + return EXIT_SUCCESS; +} diff --git a/include/graphics/nxglyphs.hxx b/include/graphics/nxglyphs.hxx index a028ab913..fbdb9353d 100644 --- a/include/graphics/nxglyphs.hxx +++ b/include/graphics/nxglyphs.hxx @@ -31,40 +31,6 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - **************************************************************************** - * - * Portions of this package derive from Woopsi (http://woopsi.org/) and - * portions are original efforts. It is difficult to determine at this - * point what parts are original efforts and which parts derive from Woopsi. - * However, in any event, the work of Antony Dzeryn will be acknowledged - * in most NxWidget files. Thanks Antony! - * - * Copyright (c) 2007-2011, Antony Dzeryn - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the names "Woopsi", "Simian Zombie" nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY Antony Dzeryn ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Antony Dzeryn BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * ****************************************************************************/ #ifndef __APPS_INCLUDE_GRAPHICS_NXGLYPHS_HXX @@ -87,6 +53,12 @@ * Pre-Processor Definitions ****************************************************************************/ +/* Default background color */ + +#ifndef CONFIG_NXGLYPHS_BACKGROUNDCOLOR +# define CONFIG_NXGLYPHS_BACKGROUNDCOLOR MKRGB(148,189,215) +#endif + /**************************************************************************** * Bitmap Glyph References ****************************************************************************/ diff --git a/include/graphics/twm4nx/cfonts.hxx b/include/graphics/twm4nx/cfonts.hxx index 916a59f1c..dfbd3f862 100644 --- a/include/graphics/twm4nx/cfonts.hxx +++ b/include/graphics/twm4nx/cfonts.hxx @@ -11,6 +11,8 @@ // Copyright 1988 by Evans & Sutherland Computer Corporation, // // Please refer to apps/twm4nx/COPYING for detailed copyright information. +// Although not listed as a copyright holder, thanks and recognition need +// to go to Tom LaStrange, the original author of TWM. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/include/graphics/twm4nx/ciconmgr.hxx b/include/graphics/twm4nx/ciconmgr.hxx index fbb2d93ac..1155b0366 100644 --- a/include/graphics/twm4nx/ciconmgr.hxx +++ b/include/graphics/twm4nx/ciconmgr.hxx @@ -10,6 +10,8 @@ // Copyright 1989,1998 The Open Group // // Please refer to apps/twm4nx/COPYING for detailed copyright information. +// Although not listed as a copyright holder, thanks and recognition need +// to go to Tom LaStrange, the original author of TWM. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/include/graphics/twm4nx/cmenus.hxx b/include/graphics/twm4nx/cmenus.hxx index 24e5a7b1c..bbaee1107 100644 --- a/include/graphics/twm4nx/cmenus.hxx +++ b/include/graphics/twm4nx/cmenus.hxx @@ -11,6 +11,8 @@ // Copyright 1988 by Evans & Sutherland Computer Corporation, // // Please refer to apps/twm4nx/COPYING for detailed copyright information. +// Although not listed as a copyright holder, thanks and recognition need +// to go to Tom LaStrange, the original author of TWM. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/include/graphics/twm4nx/cresize.hxx b/include/graphics/twm4nx/cresize.hxx index 8794427b5..35d462237 100644 --- a/include/graphics/twm4nx/cresize.hxx +++ b/include/graphics/twm4nx/cresize.hxx @@ -11,6 +11,8 @@ // Copyright 1988 by Evans & Sutherland Computer Corporation, // // Please refer to apps/twm4nx/COPYING for detailed copyright information. +// Although not listed as a copyright holder, thanks and recognition need +// to go to Tom LaStrange, the original author of TWM. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/include/graphics/twm4nx/ctwm4nx.hxx b/include/graphics/twm4nx/ctwm4nx.hxx index 7f7e8781a..fcacaecc8 100644 --- a/include/graphics/twm4nx/ctwm4nx.hxx +++ b/include/graphics/twm4nx/ctwm4nx.hxx @@ -11,6 +11,8 @@ // Copyright 1988 by Evans & Sutherland Computer Corporation, // // Please refer to apps/twm4nx/COPYING for detailed copyright information. +// Although not listed as a copyright holder, thanks and recognition need +// to go to Tom LaStrange, the original author of TWM. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/include/graphics/twm4nx/cwindow.hxx b/include/graphics/twm4nx/cwindow.hxx index f8b5f96ba..f2d0001b9 100644 --- a/include/graphics/twm4nx/cwindow.hxx +++ b/include/graphics/twm4nx/cwindow.hxx @@ -11,6 +11,8 @@ // Copyright 1988 by Evans & Sutherland Computer Corporation, // // Please refer to apps/twm4nx/COPYING for detailed copyright information. +// Although not listed as a copyright holder, thanks and recognition need +// to go to Tom LaStrange, the original author of TWM. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions diff --git a/include/graphics/twm4nx/cwindowfactory.hxx b/include/graphics/twm4nx/cwindowfactory.hxx index 51af6dfc3..ddf9e037d 100644 --- a/include/graphics/twm4nx/cwindowfactory.hxx +++ b/include/graphics/twm4nx/cwindowfactory.hxx @@ -12,6 +12,8 @@ // Copyright 1988 by Evans & Sutherland Computer Corporation, // // Please refer to apps/twm4nx/COPYING for detailed copyright information. +// Although not listed as a copyright holder, thanks and recognition need +// to go to Tom LaStrange, the original author of TWM. // // Redistribution and use in source and binary forms, with or without // modification, are permitted provided that the following conditions