From dfdbcb70c154847b516d72b6fe1d110645a30951 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 13 Jul 2014 13:18:47 -0600 Subject: NxWM: Add a larger minimize icon --- NxWidgets/nxwm/images/minimize42x42.png | Bin 0 -> 310 bytes NxWidgets/nxwm/src/glyph_calculator47x49.cxx | 308 +++++++++++++------------- NxWidgets/nxwm/src/glyph_calibration48x42.cxx | 174 +++++++-------- NxWidgets/nxwm/src/glyph_cmd49x43.cxx | 126 +++++------ NxWidgets/nxwm/src/glyph_minimize42x42.cxx | 262 ++++++++++++++++++++++ NxWidgets/nxwm/src/glyph_play48x48.cxx | 110 ++++----- 6 files changed, 621 insertions(+), 359 deletions(-) create mode 100755 NxWidgets/nxwm/images/minimize42x42.png create mode 100644 NxWidgets/nxwm/src/glyph_minimize42x42.cxx diff --git a/NxWidgets/nxwm/images/minimize42x42.png b/NxWidgets/nxwm/images/minimize42x42.png new file mode 100755 index 000000000..0d6eeb170 Binary files /dev/null and b/NxWidgets/nxwm/images/minimize42x42.png differ diff --git a/NxWidgets/nxwm/src/glyph_calculator47x49.cxx b/NxWidgets/nxwm/src/glyph_calculator47x49.cxx index 918868654..7e97e1235 100644 --- a/NxWidgets/nxwm/src/glyph_calculator47x49.cxx +++ b/NxWidgets/nxwm/src/glyph_calculator47x49.cxx @@ -207,153 +207,153 @@ static const nxgl_mxpixel_t g_calculatorBrightlLut[BITMAP_NLUTCODES] = static const struct NXWidgets::SRlePaletteBitmapEntry g_calculatorRleEntries[] = { - {46, 0}, { 1, 1}, /* Row 0 */ - { 1, 0}, {45, 2}, { 1, 1}, /* Row 1 */ - { 1, 0}, { 1, 2}, {43, 1}, { 1, 2}, { 1, 1}, /* Row 2 */ - { 1, 0}, { 1, 2}, { 1, 1}, {41, 3}, { 1, 0}, { 1, 2}, { 1, 1}, /* Row 3 */ - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 4}, {36, 5}, { 1, 4}, { 1, 6}, /* Row 4 */ - { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 5}, {37, 7}, { 1, 8}, { 1, 3}, /* Row 5 */ - { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 5}, { 1, 7}, {35, 4}, { 1, 7}, /* Row 6 */ - { 1, 8}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 5}, { 1, 7}, {35, 4}, { 1, 7}, /* Row 7 */ - { 1, 8}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 5}, { 1, 7}, {35, 4}, { 1, 7}, /* Row 8 */ - { 1, 8}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 5}, { 1, 7}, {35, 4}, { 1, 7}, /* Row 9 */ - { 1, 8}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 5}, { 1, 7}, {35, 4}, { 1, 7}, /* Row 10 */ - { 1, 8}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 5}, { 1, 7}, {35, 4}, { 1, 7}, /* Row 11 */ - { 1, 8}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 5}, { 1, 7}, {35, 4}, { 1, 7}, /* Row 12 */ - { 1, 8}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 4}, {36, 7}, { 1, 9}, { 1, 8}, /* Row 13 */ - { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 6}, {38, 8}, { 1, 3}, { 1, 0}, /* Row 14 */ - { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, {41, 3}, { 1, 0}, { 1, 2}, { 1, 1}, /* Row 15 */ - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 7, 1}, { 1, 10}, { 2, 3}, { 7, 1}, /* Row 16 */ - { 1, 10}, { 2, 3}, { 7, 1}, { 1, 10}, { 2, 3}, { 7, 1}, { 1, 10}, { 2, 3}, - { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, /* Row 17 */ - { 1, 11}, { 1, 3}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, { 2, 3}, { 1, 1}, - { 1, 2}, { 5, 0}, { 1, 1}, { 2, 3}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, - { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, /* Row 18 */ - { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, - { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, { 1, 11}, - { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, { 1, 11}, { 1, 3}, - { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, /* Row 19 */ - { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, - { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, - { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, - { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 2, 3}, /* Row 20 */ - { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, - { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, - { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, - { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 1, 3}, /* Row 21 */ - { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, - { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, - { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, - { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 3, 12}, /* Row 22 */ - { 2, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, - { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, { 1, 11}, - { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, { 1, 11}, { 1, 3}, - { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, /* Row 23 */ - { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, { 1, 3}, { 1, 10}, { 6, 1}, - { 1, 3}, { 1, 11}, { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, { 1, 3}, - { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 2, 3}, { 8, 11}, { 2, 3}, { 8, 11}, { 2, 3}, /* Row 24 */ - { 8, 11}, { 2, 3}, { 8, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, {41, 3}, { 1, 0}, { 1, 2}, { 1, 1}, /* Row 25 */ - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 7, 1}, { 1, 10}, { 2, 3}, { 7, 1}, /* Row 26 */ - { 1, 10}, { 2, 3}, { 7, 1}, { 1, 10}, { 2, 3}, { 7, 1}, { 1, 10}, { 2, 3}, - { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, /* Row 27 */ - { 1, 11}, { 1, 3}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, { 1, 11}, { 1, 3}, - { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, { 2, 3}, { 1, 1}, { 1, 2}, { 5, 0}, - { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, /* Row 28 */ - { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, - { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, { 1, 11}, - { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, { 1, 11}, { 1, 3}, - { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, /* Row 29 */ - { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, - { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, - { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, - { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, /* Row 30 */ - { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, - { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, - { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, - { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, /* Row 31 */ - { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, - { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, - { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, - { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, /* Row 32 */ - { 2, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, - { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, { 1, 11}, - { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, { 1, 11}, { 1, 3}, - { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, /* Row 33 */ - { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, { 1, 3}, { 1, 10}, { 6, 1}, - { 1, 3}, { 1, 11}, { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, { 1, 3}, - { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 2, 3}, { 8, 11}, { 2, 3}, { 8, 11}, { 3, 3}, /* Row 34 */ - { 7, 11}, { 2, 3}, { 8, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, {41, 3}, { 1, 0}, { 1, 2}, { 1, 1}, /* Row 35 */ - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 7, 1}, { 1, 10}, { 2, 3}, { 7, 1}, /* Row 36 */ - { 1, 10}, { 2, 3}, { 7, 1}, { 1, 10}, { 2, 3}, { 7, 1}, { 1, 10}, { 2, 3}, - { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, /* Row 37 */ - { 1, 11}, { 1, 3}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, { 1, 11}, { 1, 3}, - { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 2}, - { 5, 0}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, /* Row 38 */ - { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, - { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, { 1, 11}, - { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, { 1, 11}, { 1, 3}, - { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, /* Row 39 */ - { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, - { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, - { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, - { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, /* Row 40 */ - { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, - { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, - { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, - { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, /* Row 41 */ - { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, - { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, - { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, - { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, /* Row 42 */ - { 2, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, - { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, { 1, 11}, - { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, { 1, 11}, { 1, 3}, - { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, /* Row 43 */ - { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, { 1, 3}, { 1, 10}, { 6, 1}, - { 1, 3}, { 1, 11}, { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, { 1, 3}, - { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, { 2, 3}, { 8, 11}, { 2, 3}, { 8, 11}, { 2, 3}, /* Row 44 */ - { 8, 11}, { 2, 3}, { 8, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, - { 1, 0}, { 1, 2}, { 1, 1}, {41, 3}, { 1, 0}, { 1, 2}, { 1, 1}, /* Row 45 */ - { 1, 0}, { 1, 2}, {43, 0}, { 1, 2}, { 1, 1}, /* Row 46 */ - { 1, 0}, {45, 2}, { 1, 1}, /* Row 47 */ - {47, 1} /* Row 48 */ + {46, 0}, { 1, 1}, /* Row 0 */ + { 1, 0}, {45, 2}, { 1, 1}, /* Row 1 */ + { 1, 0}, { 1, 2}, {43, 1}, { 1, 2}, { 1, 1}, /* Row 2 */ + { 1, 0}, { 1, 2}, { 1, 1}, {41, 3}, { 1, 0}, { 1, 2}, { 1, 1}, /* Row 3 */ + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 4}, {36, 5}, { 1, 4}, { 1, 6}, /* Row 4 */ + { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 5}, {37, 7}, { 1, 8}, { 1, 3}, /* Row 5 */ + { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 5}, { 1, 7}, {35, 4}, { 1, 7}, /* Row 6 */ + { 1, 8}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 5}, { 1, 7}, {35, 4}, { 1, 7}, /* Row 7 */ + { 1, 8}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 5}, { 1, 7}, {35, 4}, { 1, 7}, /* Row 8 */ + { 1, 8}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 5}, { 1, 7}, {35, 4}, { 1, 7}, /* Row 9 */ + { 1, 8}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 5}, { 1, 7}, {35, 4}, { 1, 7}, /* Row 10 */ + { 1, 8}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 5}, { 1, 7}, {35, 4}, { 1, 7}, /* Row 11 */ + { 1, 8}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 5}, { 1, 7}, {35, 4}, { 1, 7}, /* Row 12 */ + { 1, 8}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 4}, {36, 7}, { 1, 9}, { 1, 8}, /* Row 13 */ + { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 6}, {38, 8}, { 1, 3}, { 1, 0}, /* Row 14 */ + { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, {41, 3}, { 1, 0}, { 1, 2}, { 1, 1}, /* Row 15 */ + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 7, 1}, { 1, 10}, { 2, 3}, { 7, 1}, /* Row 16 */ + { 1, 10}, { 2, 3}, { 7, 1}, { 1, 10}, { 2, 3}, { 7, 1}, { 1, 10}, { 2, 3}, + { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, /* Row 17 */ + { 1, 11}, { 1, 3}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, { 2, 3}, { 1, 1}, + { 1, 2}, { 5, 0}, { 1, 1}, { 2, 3}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, + { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, /* Row 18 */ + { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, + { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, { 1, 11}, + { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, { 1, 11}, { 1, 3}, + { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, /* Row 19 */ + { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, + { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, + { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, + { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 2, 3}, /* Row 20 */ + { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, + { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, + { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, + { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 1, 3}, /* Row 21 */ + { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, + { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, + { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, + { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 3, 12}, /* Row 22 */ + { 2, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, + { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, { 1, 11}, + { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, { 1, 11}, { 1, 3}, + { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, /* Row 23 */ + { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, { 1, 3}, { 1, 10}, { 6, 1}, + { 1, 3}, { 1, 11}, { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, { 1, 3}, + { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 2, 3}, { 8, 11}, { 2, 3}, { 8, 11}, { 2, 3}, /* Row 24 */ + { 8, 11}, { 2, 3}, { 8, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, {41, 3}, { 1, 0}, { 1, 2}, { 1, 1}, /* Row 25 */ + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 7, 1}, { 1, 10}, { 2, 3}, { 7, 1}, /* Row 26 */ + { 1, 10}, { 2, 3}, { 7, 1}, { 1, 10}, { 2, 3}, { 7, 1}, { 1, 10}, { 2, 3}, + { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, /* Row 27 */ + { 1, 11}, { 1, 3}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, { 1, 11}, { 1, 3}, + { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, { 2, 3}, { 1, 1}, { 1, 2}, { 5, 0}, + { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, /* Row 28 */ + { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, + { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, { 1, 11}, + { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, { 1, 11}, { 1, 3}, + { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, /* Row 29 */ + { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, + { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, + { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, + { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, /* Row 30 */ + { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, + { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, + { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, + { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, /* Row 31 */ + { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, + { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, + { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, + { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, /* Row 32 */ + { 2, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, + { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, { 1, 11}, + { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, { 1, 11}, { 1, 3}, + { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, /* Row 33 */ + { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, { 1, 3}, { 1, 10}, { 6, 1}, + { 1, 3}, { 1, 11}, { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, { 1, 3}, + { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 2, 3}, { 8, 11}, { 2, 3}, { 8, 11}, { 3, 3}, /* Row 34 */ + { 7, 11}, { 2, 3}, { 8, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, {41, 3}, { 1, 0}, { 1, 2}, { 1, 1}, /* Row 35 */ + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 7, 1}, { 1, 10}, { 2, 3}, { 7, 1}, /* Row 36 */ + { 1, 10}, { 2, 3}, { 7, 1}, { 1, 10}, { 2, 3}, { 7, 1}, { 1, 10}, { 2, 3}, + { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, /* Row 37 */ + { 1, 11}, { 1, 3}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, { 1, 11}, { 1, 3}, + { 1, 1}, { 1, 2}, { 5, 0}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 2}, + { 5, 0}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, /* Row 38 */ + { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, + { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, { 1, 11}, + { 1, 3}, { 1, 1}, { 1, 0}, { 1, 1}, { 4, 10}, { 1, 1}, { 1, 11}, { 1, 3}, + { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, /* Row 39 */ + { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, + { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, + { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 3}, + { 1, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, /* Row 40 */ + { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, + { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, + { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 2, 3}, + { 2, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, /* Row 41 */ + { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, + { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, + { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 1, 3}, + { 3, 12}, { 1, 1}, { 1, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, /* Row 42 */ + { 2, 1}, { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, + { 1, 11}, { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, { 1, 11}, + { 1, 3}, { 1, 1}, { 1, 0}, { 1, 10}, { 3, 12}, { 2, 1}, { 1, 11}, { 1, 3}, + { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, /* Row 43 */ + { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, { 1, 3}, { 1, 10}, { 6, 1}, + { 1, 3}, { 1, 11}, { 1, 3}, { 1, 10}, { 6, 1}, { 1, 3}, { 1, 11}, { 1, 3}, + { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, { 2, 3}, { 8, 11}, { 2, 3}, { 8, 11}, { 2, 3}, /* Row 44 */ + { 8, 11}, { 2, 3}, { 8, 11}, { 1, 3}, { 1, 0}, { 1, 2}, { 1, 1}, + { 1, 0}, { 1, 2}, { 1, 1}, {41, 3}, { 1, 0}, { 1, 2}, { 1, 1}, /* Row 45 */ + { 1, 0}, { 1, 2}, {43, 0}, { 1, 2}, { 1, 1}, /* Row 46 */ + { 1, 0}, {45, 2}, { 1, 1}, /* Row 47 */ + {47, 1} /* Row 48 */ }; /******************************************************************************************** @@ -362,14 +362,14 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_calculatorRleEntries[] = const struct NXWidgets::SRlePaletteBitmap NxWM::g_calculatorBitmap = { - CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel - CONFIG_NXWIDGETS_FMT, // fmt - Color format - BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) - BITMAP_NCOLUMNS, // width - Width in pixels - BITMAP_NROWS, // height - Height in rows + CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel + CONFIG_NXWIDGETS_FMT, // fmt - Color format + BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) + BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NROWS, // height - Height in rows { // lut - Pointer to the beginning of the Look-Up Table (LUT) - g_calculatorNormalLut, // Index 0: Unselected LUT - g_calculatorBrightlLut, // Index 1: Selected LUT + g_calculatorNormalLut, // Index 0: Unselected LUT + g_calculatorBrightlLut, // Index 1: Selected LUT }, g_calculatorRleEntries // data - Pointer to the beginning of the RLE data }; diff --git a/NxWidgets/nxwm/src/glyph_calibration48x42.cxx b/NxWidgets/nxwm/src/glyph_calibration48x42.cxx index 2db4e627c..7e87f085c 100644 --- a/NxWidgets/nxwm/src/glyph_calibration48x42.cxx +++ b/NxWidgets/nxwm/src/glyph_calibration48x42.cxx @@ -215,84 +215,84 @@ static const nxgl_mxpixel_t g_calibrationBrightlLut[BITMAP_NLUTCODES] = static const struct NXWidgets::SRlePaletteBitmapEntry g_calibrationRleEntries[] = { - {22, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {12, 0}, { 2, 1}, { 2, 0}, /* Row 0 */ - {28, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {10, 0}, /* Row 1 */ - { 1, 0}, { 1, 2}, { 2, 1}, { 1, 3}, { 2, 0}, { 1, 2}, {26, 0}, { 1, 1}, /* Row 2 */ - { 2, 2}, { 1, 3}, { 4, 0}, - { 6, 0}, { 2, 1}, { 2, 4}, { 4, 1}, {26, 0}, { 1, 1}, { 1, 2}, /* Row 3 */ - { 1, 2}, { 1, 3}, { 8, 0}, { 1, 2}, { 2, 1}, { 1, 3}, { 2, 4}, { 1, 1}, /* Row 4 */ - { 3, 3}, {22, 0}, - { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 1, 2}, { 1, 1}, { 2, 3}, /* Row 5 */ - { 2, 4}, { 2, 2}, { 1, 3}, {19, 0}, - {10, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 4, 0}, { 1, 2}, { 2, 1}, { 1, 3}, /* Row 6 */ - { 4, 0}, { 2, 2}, {14, 0}, - {16, 0}, { 2, 1}, { 2, 2}, { 2, 0}, { 1, 2}, { 1, 1}, { 2, 3}, { 1, 4}, /* Row 7 */ - { 5, 0}, { 1, 1}, { 1, 2}, { 8, 0}, - {22, 0}, { 2, 1}, { 2, 2}, { 3, 1}, { 1, 3}, { 1, 4}, { 7, 0}, { 1, 1}, /* Row 8 */ - { 1, 2}, { 2, 0}, - {26, 0}, { 1, 2}, { 1, 1}, { 4, 2}, { 2, 3}, { 1, 4}, { 7, 0}, /* Row 9 */ - { 2, 0}, { 1, 1}, { 1, 2}, {26, 0}, { 1, 2}, { 3, 1}, { 4, 2}, { 4, 0}, /* Row 10 */ - { 8, 0}, { 1, 1}, { 1, 2}, {16, 0}, { 1, 1}, { 1, 3}, { 6, 0}, { 2, 1}, /* Row 11 */ - { 2, 3}, { 1, 4}, { 1, 0}, { 2, 1}, - { 1, 2}, { 1, 3}, {11, 0}, { 1, 1}, { 2, 2}, { 1, 4}, {11, 0}, { 1, 2}, /* Row 12 */ - { 2, 0}, { 2, 1}, { 2, 3}, { 3, 0}, { 1, 2}, { 2, 1}, { 1, 3}, - { 1, 4}, { 3, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {10, 0}, { 2, 1}, { 3, 2}, /* Row 13 */ - { 1, 4}, {10, 0}, { 4, 1}, { 2, 4}, { 1, 3}, { 1, 1}, - { 2, 1}, { 2, 3}, { 1, 4}, { 5, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 9, 0}, /* Row 14 */ - { 1, 1}, { 2, 2}, { 2, 0}, { 2, 2}, { 1, 4}, { 9, 0}, { 2, 3}, - { 1, 3}, { 1, 1}, { 2, 4}, { 2, 1}, { 1, 3}, { 1, 4}, { 8, 0}, { 1, 1}, /* Row 15 */ - { 2, 2}, { 1, 3}, { 8, 0}, { 1, 2}, { 1, 1}, { 1, 2}, { 4, 0}, { 2, 2}, - { 1, 4}, { 4, 0}, - { 7, 0}, { 1, 3}, { 2, 2}, { 1, 3}, {11, 0}, { 1, 1}, { 2, 2}, { 1, 3}, /* Row 16 */ - { 8, 0}, { 1, 1}, { 1, 2}, { 6, 0}, - { 2, 2}, {12, 0}, { 2, 2}, {12, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 7, 0}, /* Row 17 */ - { 1, 2}, { 1, 1}, { 1, 0}, - { 7, 0}, { 1, 2}, { 1, 4}, {11, 0}, { 1, 1}, { 1, 2}, {12, 0}, { 1, 1}, /* Row 18 */ - { 2, 2}, { 1, 3}, { 4, 0}, - { 3, 0}, { 1, 1}, { 1, 2}, { 8, 0}, { 2, 2}, {11, 0}, { 1, 1}, { 1, 2}, /* Row 19 */ - {12, 0}, { 1, 1}, { 1, 2}, - { 1, 2}, { 1, 3}, { 6, 0}, { 1, 2}, { 1, 1}, { 1, 2}, { 8, 0}, { 1, 1}, /* Row 20 */ - { 1, 2}, { 1, 4}, { 9, 0}, { 1, 1}, { 2, 2}, { 1, 4}, { 7, 0}, - { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 2, 1}, {10, 0}, { 1, 1}, /* Row 21 */ - { 1, 2}, { 8, 0}, { 2, 1}, { 3, 2}, { 1, 4}, - {10, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 1, 1}, { 1, 2}, {10, 0}, /* Row 22 */ - { 1, 1}, { 1, 2}, { 7, 0}, { 1, 1}, - { 2, 2}, { 2, 0}, { 2, 2}, { 1, 4}, { 9, 0}, { 1, 1}, { 2, 2}, { 1, 3}, /* Row 23 */ - { 6, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, - { 1, 2}, { 2, 0}, - { 4, 0}, { 1, 2}, { 1, 1}, { 1, 2}, { 4, 0}, { 2, 2}, { 1, 4}, { 8, 0}, /* Row 24 */ - { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, - { 2, 6}, - { 2, 0}, { 1, 1}, { 1, 2}, { 6, 0}, { 1, 1}, { 1, 2}, { 6, 0}, { 2, 2}, /* Row 25 */ - { 8, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 1, 1}, { 1, 2}, { 2, 0}, - { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 2}, { 1, 1}, /* Row 26 */ - { 8, 0}, { 1, 2}, { 1, 4}, { 7, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 4, 0}, - { 2, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 27 */ - { 1, 2}, { 5, 0}, { 1, 1}, { 1, 2}, { 8, 0}, { 2, 2}, { 7, 0}, { 1, 1}, - { 1, 2}, - { 1, 2}, { 1, 3}, { 4, 0}, { 4, 1}, {10, 2}, { 4, 3}, { 2, 0}, { 1, 2}, /* Row 28 */ - { 1, 1}, { 1, 2}, { 1, 0}, { 4, 5}, { 2, 6}, { 1, 0}, { 1, 1}, { 1, 2}, - { 1, 4}, { 2, 0}, - { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 4, 0}, { 4, 1}, {10, 2}, { 4, 3}, /* Row 29 */ - { 2, 0}, { 2, 1}, { 2, 0}, { 4, 5}, { 2, 6}, - { 2, 0}, { 1, 1}, { 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {24, 0}, /* Row 30 */ - { 1, 1}, { 1, 2}, { 2, 0}, - { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, { 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, /* Row 31 */ - { 1, 3}, {22, 0}, - { 2, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 32 */ - { 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {16, 0}, - { 8, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 33 */ - { 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {10, 0}, - {14, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 34 */ - { 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 4, 0}, - {20, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 35 */ - { 1, 2}, { 6, 0}, { 1, 1}, { 1, 2}, - { 1, 2}, { 1, 3}, {22, 0}, { 4, 1}, {10, 2}, { 4, 3}, /* Row 36 */ - { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {22, 0}, { 4, 1}, { 8, 2}, /* Row 37 */ - { 2, 2}, { 4, 3}, { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {28, 0}, /* Row 38 */ - {16, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {22, 0}, /* Row 39 */ - {22, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {16, 0}, /* Row 40 */ - {26, 0}, { 1, 2}, { 1, 1}, { 4, 2}, { 1, 3}, { 1, 4}, { 8, 0} /* Row 41 */ + {22, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {12, 0}, { 2, 1}, { 2, 0}, /* Row 0 */ + {28, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {10, 0}, /* Row 1 */ + { 1, 0}, { 1, 2}, { 2, 1}, { 1, 3}, { 2, 0}, { 1, 2}, {26, 0}, { 1, 1}, /* Row 2 */ + { 2, 2}, { 1, 3}, { 4, 0}, + { 6, 0}, { 2, 1}, { 2, 4}, { 4, 1}, {26, 0}, { 1, 1}, { 1, 2}, /* Row 3 */ + { 1, 2}, { 1, 3}, { 8, 0}, { 1, 2}, { 2, 1}, { 1, 3}, { 2, 4}, { 1, 1}, /* Row 4 */ + { 3, 3}, {22, 0}, + { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 1, 2}, { 1, 1}, { 2, 3}, /* Row 5 */ + { 2, 4}, { 2, 2}, { 1, 3}, {19, 0}, + {10, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 4, 0}, { 1, 2}, { 2, 1}, { 1, 3}, /* Row 6 */ + { 4, 0}, { 2, 2}, {14, 0}, + {16, 0}, { 2, 1}, { 2, 2}, { 2, 0}, { 1, 2}, { 1, 1}, { 2, 3}, { 1, 4}, /* Row 7 */ + { 5, 0}, { 1, 1}, { 1, 2}, { 8, 0}, + {22, 0}, { 2, 1}, { 2, 2}, { 3, 1}, { 1, 3}, { 1, 4}, { 7, 0}, { 1, 1}, /* Row 8 */ + { 1, 2}, { 2, 0}, + {26, 0}, { 1, 2}, { 1, 1}, { 4, 2}, { 2, 3}, { 1, 4}, { 7, 0}, /* Row 9 */ + { 2, 0}, { 1, 1}, { 1, 2}, {26, 0}, { 1, 2}, { 3, 1}, { 4, 2}, { 4, 0}, /* Row 10 */ + { 8, 0}, { 1, 1}, { 1, 2}, {16, 0}, { 1, 1}, { 1, 3}, { 6, 0}, { 2, 1}, /* Row 11 */ + { 2, 3}, { 1, 4}, { 1, 0}, { 2, 1}, + { 1, 2}, { 1, 3}, {11, 0}, { 1, 1}, { 2, 2}, { 1, 4}, {11, 0}, { 1, 2}, /* Row 12 */ + { 2, 0}, { 2, 1}, { 2, 3}, { 3, 0}, { 1, 2}, { 2, 1}, { 1, 3}, + { 1, 4}, { 3, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {10, 0}, { 2, 1}, { 3, 2}, /* Row 13 */ + { 1, 4}, {10, 0}, { 4, 1}, { 2, 4}, { 1, 3}, { 1, 1}, + { 2, 1}, { 2, 3}, { 1, 4}, { 5, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 9, 0}, /* Row 14 */ + { 1, 1}, { 2, 2}, { 2, 0}, { 2, 2}, { 1, 4}, { 9, 0}, { 2, 3}, + { 1, 3}, { 1, 1}, { 2, 4}, { 2, 1}, { 1, 3}, { 1, 4}, { 8, 0}, { 1, 1}, /* Row 15 */ + { 2, 2}, { 1, 3}, { 8, 0}, { 1, 2}, { 1, 1}, { 1, 2}, { 4, 0}, { 2, 2}, + { 1, 4}, { 4, 0}, + { 7, 0}, { 1, 3}, { 2, 2}, { 1, 3}, {11, 0}, { 1, 1}, { 2, 2}, { 1, 3}, /* Row 16 */ + { 8, 0}, { 1, 1}, { 1, 2}, { 6, 0}, + { 2, 2}, {12, 0}, { 2, 2}, {12, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 7, 0}, /* Row 17 */ + { 1, 2}, { 1, 1}, { 1, 0}, + { 7, 0}, { 1, 2}, { 1, 4}, {11, 0}, { 1, 1}, { 1, 2}, {12, 0}, { 1, 1}, /* Row 18 */ + { 2, 2}, { 1, 3}, { 4, 0}, + { 3, 0}, { 1, 1}, { 1, 2}, { 8, 0}, { 2, 2}, {11, 0}, { 1, 1}, { 1, 2}, /* Row 19 */ + {12, 0}, { 1, 1}, { 1, 2}, + { 1, 2}, { 1, 3}, { 6, 0}, { 1, 2}, { 1, 1}, { 1, 2}, { 8, 0}, { 1, 1}, /* Row 20 */ + { 1, 2}, { 1, 4}, { 9, 0}, { 1, 1}, { 2, 2}, { 1, 4}, { 7, 0}, + { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 2, 1}, {10, 0}, { 1, 1}, /* Row 21 */ + { 1, 2}, { 8, 0}, { 2, 1}, { 3, 2}, { 1, 4}, + {10, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 1, 1}, { 1, 2}, {10, 0}, /* Row 22 */ + { 1, 1}, { 1, 2}, { 7, 0}, { 1, 1}, + { 2, 2}, { 2, 0}, { 2, 2}, { 1, 4}, { 9, 0}, { 1, 1}, { 2, 2}, { 1, 3}, /* Row 23 */ + { 6, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, + { 1, 2}, { 2, 0}, + { 4, 0}, { 1, 2}, { 1, 1}, { 1, 2}, { 4, 0}, { 2, 2}, { 1, 4}, { 8, 0}, /* Row 24 */ + { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, + { 2, 6}, + { 2, 0}, { 1, 1}, { 1, 2}, { 6, 0}, { 1, 1}, { 1, 2}, { 6, 0}, { 2, 2}, /* Row 25 */ + { 8, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 6, 0}, { 1, 1}, { 1, 2}, { 2, 0}, + { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, { 1, 2}, { 5, 0}, { 1, 2}, { 1, 1}, /* Row 26 */ + { 8, 0}, { 1, 2}, { 1, 4}, { 7, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 4, 0}, + { 2, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 27 */ + { 1, 2}, { 5, 0}, { 1, 1}, { 1, 2}, { 8, 0}, { 2, 2}, { 7, 0}, { 1, 1}, + { 1, 2}, + { 1, 2}, { 1, 3}, { 4, 0}, { 4, 1}, {10, 2}, { 4, 3}, { 2, 0}, { 1, 2}, /* Row 28 */ + { 1, 1}, { 1, 2}, { 1, 0}, { 4, 5}, { 2, 6}, { 1, 0}, { 1, 1}, { 1, 2}, + { 1, 4}, { 2, 0}, + { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 4, 0}, { 4, 1}, {10, 2}, { 4, 3}, /* Row 29 */ + { 2, 0}, { 2, 1}, { 2, 0}, { 4, 5}, { 2, 6}, + { 2, 0}, { 1, 1}, { 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {24, 0}, /* Row 30 */ + { 1, 1}, { 1, 2}, { 2, 0}, + { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, { 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, /* Row 31 */ + { 1, 3}, {22, 0}, + { 2, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 32 */ + { 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {16, 0}, + { 8, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 33 */ + { 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {10, 0}, + {14, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 34 */ + { 1, 2}, { 6, 0}, { 1, 1}, { 2, 2}, { 1, 3}, { 4, 0}, + {20, 0}, { 1, 1}, { 1, 2}, { 2, 0}, { 4, 5}, { 2, 6}, { 2, 0}, { 1, 1}, /* Row 35 */ + { 1, 2}, { 6, 0}, { 1, 1}, { 1, 2}, + { 1, 2}, { 1, 3}, {22, 0}, { 4, 1}, {10, 2}, { 4, 3}, /* Row 36 */ + { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {22, 0}, { 4, 1}, { 8, 2}, /* Row 37 */ + { 2, 2}, { 4, 3}, { 4, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {28, 0}, /* Row 38 */ + {16, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {22, 0}, /* Row 39 */ + {22, 0}, { 1, 1}, { 2, 2}, { 1, 3}, {16, 0}, /* Row 40 */ + {26, 0}, { 1, 2}, { 1, 1}, { 4, 2}, { 1, 3}, { 1, 4}, { 8, 0} /* Row 41 */ }; /******************************************************************************************** @@ -301,14 +301,14 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_calibrationRleEntries[] const struct NXWidgets::SRlePaletteBitmap NxWM::g_calibrationBitmap = { - CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel - CONFIG_NXWIDGETS_FMT, // fmt - Color format - BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) - BITMAP_NCOLUMNS, // width - Width in pixels - BITMAP_NROWS, // height - Height in rows - { // lut - Pointer to the beginning of the Look-Up Table (LUT) - g_calibrationNormalLut, // Index 0: Unselected LUT - g_calibrationBrightlLut, // Index 1: Selected LUT + CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel + CONFIG_NXWIDGETS_FMT, // fmt - Color format + BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) + BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NROWS, // height - Height in rows + { // lut - Pointer to the beginning of the Look-Up Table (LUT) + g_minimizeNormalLut, // Index 0: Unselected LUT + g_minimizeBrightlLut, // Index 1: Selected LUT }, - g_calibrationRleEntries // data - Pointer to the beginning of the RLE data + g_minimizeRleEntries // data - Pointer to the beginning of the RLE data }; diff --git a/NxWidgets/nxwm/src/glyph_cmd49x43.cxx b/NxWidgets/nxwm/src/glyph_cmd49x43.cxx index 74b4f163c..b6031f584 100644 --- a/NxWidgets/nxwm/src/glyph_cmd49x43.cxx +++ b/NxWidgets/nxwm/src/glyph_cmd49x43.cxx @@ -203,62 +203,62 @@ static const nxgl_mxpixel_t g_cmdBrightlLut[BITMAP_NLUTCODES] = static const struct NXWidgets::SRlePaletteBitmapEntry g_cmdRleEntries[] = { - {47, 0}, { 1, 1}, { 1, 2}, /* Row 0 */ - { 1, 0}, {46, 3}, { 1, 1}, { 1, 2}, /* Row 1 */ - { 1, 0}, {46, 3}, { 1, 1}, { 1, 2}, /* Row 2 */ - { 1, 0}, {31, 3}, { 6, 4}, { 2, 3}, { 6, 5}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 3 */ - { 1, 0}, {31, 3}, { 1, 4}, { 3, 6}, { 2, 4}, { 2, 3}, { 1, 5}, { 3, 7}, /* Row 4 */ - { 2, 5}, { 1, 3}, { 1, 1}, { 1, 2}, - { 1, 0}, {31, 3}, { 1, 4}, { 2, 6}, { 3, 4}, { 2, 3}, { 1, 5}, { 2, 7}, /* Row 5 */ - { 3, 5}, { 1, 3}, { 1, 1}, { 1, 2}, - { 1, 0}, {31, 3}, { 1, 4}, { 1, 6}, { 4, 4}, { 2, 3}, { 1, 5}, { 1, 7}, /* Row 6 */ - { 4, 5}, { 1, 3}, { 1, 1}, { 1, 2}, - { 1, 0}, {31, 3}, { 6, 4}, { 2, 3}, { 6, 5}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 7 */ - { 1, 0}, {31, 3}, { 6, 4}, { 2, 3}, { 6, 5}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 8 */ - { 1, 0}, {46, 3}, { 1, 1}, { 1, 2}, /* Row 9 */ - { 1, 0}, {46, 3}, { 1, 1}, { 1, 2}, /* Row 10 */ - { 1, 0}, { 1, 3}, {44, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 11 */ - { 1, 0}, { 1, 3}, { 1, 1}, {43, 2}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 12 */ - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 13 */ - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 1, 1}, { 1, 8}, {40, 1}, { 1, 3}, /* Row 14 */ - { 1, 1}, { 1, 2}, - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 2, 1}, { 1, 8}, {39, 1}, { 1, 3}, /* Row 15 */ - { 1, 1}, { 1, 2}, - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 3, 1}, { 1, 8}, {38, 1}, { 1, 3}, /* Row 16 */ - { 1, 1}, { 1, 2}, - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 4, 1}, { 1, 8}, {37, 1}, { 1, 3}, /* Row 17 */ - { 1, 1}, { 1, 2}, - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 5, 1}, { 1, 8}, {36, 1}, { 1, 3}, /* Row 18 */ - { 1, 1}, { 1, 2}, - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 4, 1}, { 1, 8}, { 1, 9}, {36, 1}, /* Row 19 */ - { 1, 3}, { 1, 1}, { 1, 2}, - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 3, 1}, { 1, 8}, { 1, 9}, {37, 1}, /* Row 20 */ - { 1, 3}, { 1, 1}, { 1, 2}, - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 2, 1}, { 1, 8}, { 1, 9}, { 4, 1}, /* Row 21 */ - { 9, 8}, {25, 1}, { 1, 3}, { 1, 1}, { 1, 2}, - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 1, 1}, { 1, 8}, { 1, 9}, { 6, 1}, /* Row 22 */ - { 9, 9}, {24, 1}, { 1, 3}, { 1, 1}, { 1, 2}, - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 1, 1}, { 1, 9}, {40, 1}, { 1, 3}, /* Row 23 */ - { 1, 1}, { 1, 2}, - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 24 */ - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 25 */ - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 26 */ - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 27 */ - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 28 */ - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 29 */ - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 30 */ - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 31 */ - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 32 */ - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 33 */ - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 34 */ - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 35 */ - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 36 */ - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 37 */ - { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 38 */ - { 1, 0}, { 1, 3}, {44, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 39 */ - { 1, 0}, {46, 3}, { 1, 1}, { 1, 2}, /* Row 40 */ - {48, 1}, { 1, 2}, /* Row 41 */ - {49, 2} /* Row 42 */ + {47, 0}, { 1, 1}, { 1, 2}, /* Row 0 */ + { 1, 0}, {46, 3}, { 1, 1}, { 1, 2}, /* Row 1 */ + { 1, 0}, {46, 3}, { 1, 1}, { 1, 2}, /* Row 2 */ + { 1, 0}, {31, 3}, { 6, 4}, { 2, 3}, { 6, 5}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 3 */ + { 1, 0}, {31, 3}, { 1, 4}, { 3, 6}, { 2, 4}, { 2, 3}, { 1, 5}, { 3, 7}, /* Row 4 */ + { 2, 5}, { 1, 3}, { 1, 1}, { 1, 2}, + { 1, 0}, {31, 3}, { 1, 4}, { 2, 6}, { 3, 4}, { 2, 3}, { 1, 5}, { 2, 7}, /* Row 5 */ + { 3, 5}, { 1, 3}, { 1, 1}, { 1, 2}, + { 1, 0}, {31, 3}, { 1, 4}, { 1, 6}, { 4, 4}, { 2, 3}, { 1, 5}, { 1, 7}, /* Row 6 */ + { 4, 5}, { 1, 3}, { 1, 1}, { 1, 2}, + { 1, 0}, {31, 3}, { 6, 4}, { 2, 3}, { 6, 5}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 7 */ + { 1, 0}, {31, 3}, { 6, 4}, { 2, 3}, { 6, 5}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 8 */ + { 1, 0}, {46, 3}, { 1, 1}, { 1, 2}, /* Row 9 */ + { 1, 0}, {46, 3}, { 1, 1}, { 1, 2}, /* Row 10 */ + { 1, 0}, { 1, 3}, {44, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 11 */ + { 1, 0}, { 1, 3}, { 1, 1}, {43, 2}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 12 */ + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 13 */ + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 1, 1}, { 1, 8}, {40, 1}, { 1, 3}, /* Row 14 */ + { 1, 1}, { 1, 2}, + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 2, 1}, { 1, 8}, {39, 1}, { 1, 3}, /* Row 15 */ + { 1, 1}, { 1, 2}, + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 3, 1}, { 1, 8}, {38, 1}, { 1, 3}, /* Row 16 */ + { 1, 1}, { 1, 2}, + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 4, 1}, { 1, 8}, {37, 1}, { 1, 3}, /* Row 17 */ + { 1, 1}, { 1, 2}, + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 5, 1}, { 1, 8}, {36, 1}, { 1, 3}, /* Row 18 */ + { 1, 1}, { 1, 2}, + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 4, 1}, { 1, 8}, { 1, 9}, {36, 1}, /* Row 19 */ + { 1, 3}, { 1, 1}, { 1, 2}, + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 3, 1}, { 1, 8}, { 1, 9}, {37, 1}, /* Row 20 */ + { 1, 3}, { 1, 1}, { 1, 2}, + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 2, 1}, { 1, 8}, { 1, 9}, { 4, 1}, /* Row 21 */ + { 9, 8}, {25, 1}, { 1, 3}, { 1, 1}, { 1, 2}, + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 1, 1}, { 1, 8}, { 1, 9}, { 6, 1}, /* Row 22 */ + { 9, 9}, {24, 1}, { 1, 3}, { 1, 1}, { 1, 2}, + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, { 1, 1}, { 1, 9}, {40, 1}, { 1, 3}, /* Row 23 */ + { 1, 1}, { 1, 2}, + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 24 */ + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 25 */ + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 26 */ + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 27 */ + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 28 */ + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 29 */ + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 30 */ + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 31 */ + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 32 */ + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 33 */ + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 34 */ + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 35 */ + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 36 */ + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 37 */ + { 1, 0}, { 1, 3}, { 1, 1}, { 1, 2}, {42, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 38 */ + { 1, 0}, { 1, 3}, {44, 1}, { 1, 3}, { 1, 1}, { 1, 2}, /* Row 39 */ + { 1, 0}, {46, 3}, { 1, 1}, { 1, 2}, /* Row 40 */ + {48, 1}, { 1, 2}, /* Row 41 */ + {49, 2} /* Row 42 */ }; /******************************************************************************************** @@ -267,14 +267,14 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_cmdRleEntries[] = const struct NXWidgets::SRlePaletteBitmap NxWM::g_cmdBitmap = { - CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel - CONFIG_NXWIDGETS_FMT, // fmt - Color format - BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) - BITMAP_NCOLUMNS, // width - Width in pixels - BITMAP_NROWS, // height - Height in rows + CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel + CONFIG_NXWIDGETS_FMT, // fmt - Color format + BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) + BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NROWS, // height - Height in rows { // lut - Pointer to the beginning of the Look-Up Table (LUT) - g_cmdNormalLut, // Index 0: Unselected LUT - g_cmdBrightlLut, // Index 1: Selected LUT + g_cmdNormalLut, // Index 0: Unselected LUT + g_cmdBrightlLut, // Index 1: Selected LUT }, g_cmdRleEntries // data - Pointer to the beginning of the RLE data }; diff --git a/NxWidgets/nxwm/src/glyph_minimize42x42.cxx b/NxWidgets/nxwm/src/glyph_minimize42x42.cxx new file mode 100644 index 000000000..6ba2f23f8 --- /dev/null +++ b/NxWidgets/nxwm/src/glyph_minimize42x42.cxx @@ -0,0 +1,262 @@ +/******************************************************************************************** + * NxWidgets/nxwm/src/glyph_minimize42x42.cxx + * + * Copyright (C) 2014 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, NxWidgets, nor the names of its contributors + * me 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 +#include + +#include "crlepalettebitmap.hxx" + +#include "nxwmconfig.hxx" +#include "nxwmglyphs.hxx" + +/******************************************************************************************** + * Pre-Processor Definitions + ********************************************************************************************/ + +#define BITMAP_NROWS 42 +#define BITMAP_NCOLUMNS 42 +#define BITMAP_NLUTCODES 8 + +#define DARK_MINIMIZE_ICON 1 + +/******************************************************************************************** + * Private Bitmap Data + ********************************************************************************************/ + +using namespace NxWM; + +/* RGB24 (8-8-8) Colors */ + +#if CONFIG_NXWIDGETS_BPP == 24 || CONFIG_NXWIDGETS_BPP == 32 +# ifdef DARK_MINIMIZE_ICON + +static const uint32_t g_minimizeNormalLut[BITMAP_NLUTCODES] = +{ + 0x1b368a, 0x3651a5, 0x001b8a, 0x001ba5, 0x1b1b6f, 0x00008a, 0xbdbdbd, 0xa5bdbd /* Codes 0-7 */ +}; + +static const uint32_t g_minimizeBrightlLut[BITMAP_NLUTCODES] = +{ + 0x2448b8, 0x486cdc, 0x0024b8, 0x0024dc, 0x242494, 0x0000b8, 0xfcfcfc, 0xdcfcfc /* Codes 0-7 */ +}; + +# else /* DARK_MINIMIZE_ICON */ + +static const uint32_t g_minimizeNormalLut[BITMAP_NLUTCODES] = +{ + 0x2448b8, 0x486cdc, 0x0024b8, 0x0024dc, 0x242494, 0x0000b8, 0xfcfcfc, 0xdcfcfc /* Codes 0-7 */ +}; + +static const uint32_t g_minimizeBrightlLut[BITMAP_NLUTCODES] = +{ + 0x2d5ae6, 0x5a87ff, 0x002de6, 0x002dff, 0x2d2db9, 0x0000e6, 0xffffff, 0xffffff /* Codes 0-7 */ +}; +# endif /* DARK_MINIMIZE_ICON */ + +/* RGB16 (565) Colors */ + +#elif CONFIG_NXWIDGETS_BPP == 16 +# ifdef DARK_MINIMIZE_ICON + +static const uint16_t g_minimizeNormalLut[BITMAP_NLUTCODES] = +{ + 0x19b1, 0x3294, 0x00d1, 0x00d4, 0x18cd, 0x0011, 0xbdf7, 0xa5f7 /* Codes 0-7 */ +}; + +static const uint16_t g_minimizeBrightlLut[BITMAP_NLUTCODES] = +{ + 0x2257, 0x4b7b, 0x0137, 0x013b, 0x2132, 0x0017, 0xffff, 0xdfff /* Codes 0-7 */ +}; + +# else /* DARK_MINIMIZE_ICON */ + +static const uint16_t g_minimizeNormalLut[BITMAP_NLUTCODES] = +{ + 0x2257, 0x4b7b, 0x0137, 0x013b, 0x2132, 0x0017, 0xffff, 0xdfff /* Codes 0-7 */ +}; + +static const uint16_t g_minimizeBrightlLut[BITMAP_NLUTCODES] = +{ + 0x2adc, 0x5c3f, 0x017c, 0x017f, 0x2977, 0x001c, 0xffff, 0xffff /* Codes 0-7 */ +}; + +# endif /* DARK_MINIMIZE_ICON */ + +/* 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 pointless lookups do make the logic compatible with the + * 16- and 24-bit types. + */ + +#elif CONFIG_NXWIDGETS_BPP == 8 +# ifdef CONFIG_NXWIDGETS_GREYSCALE + +/* 8-bit Greyscale */ + +# ifdef DARK_MINIMIZE_ICON + +static const uint8_t g_minimizeNormalLut[BITMAP_NLUTCODES] = +{ + 0x37, 0x52, 0x1f, 0x22, 0x24, 0x0f, 0xbd, 0xb5 /* Codes 0-7 */ +}; + +static const uint8_t g_minimizeBrightlLut[BITMAP_NLUTCODES] = +{ + 0x4a, 0x6e, 0x2a, 0x2e, 0x30, 0x14, 0xfc, 0xf2 /* Codes 0-7 */ +}; + +# else /* DARK_MINIMIZE_ICON */ + +static const uint8_t g_minimizeNormalLut[BITMAP_NLUTCODES] = +{ + 0x4a, 0x6e, 0x2a, 0x2e, 0x30, 0x14, 0xfc, 0xf2 /* Codes 0-7 */ +}; + +static const uint8_t g_minimizeBrightlLut[BITMAP_NLUTCODES] = +{ + 0x5c, 0x87, 0x34, 0x37, 0x3c, 0x1a, 0xff, 0xff /* Codes 0-7 */ +}; + +# endif /* DARK_MINIMIZE_ICON */ + +# else /* CONFIG_NXWIDGETS_GREYSCALE */ + +/* RGB8 (332) Colors */ + +# ifdef DARK_MINIMIZE_ICON + +static const nxgl_mxpixel_t g_minimizeNormalLut[BITMAP_NLUTCODES] = +{ + 0x06, 0x2a, 0x02, 0x02, 0x01, 0x02, 0xb6, 0xb6 /* Codes 0-7 */ +}; + +static const nxgl_mxpixel_t g_minimizeBrightlLut[BITMAP_NLUTCODES] = +{ + 0x2a, 0x4f, 0x06, 0x07, 0x26, 0x02, 0xff, 0xdf /* Codes 0-7 */ +}; + +# else /* DARK_MINIMIZE_ICON */ + +static const nxgl_mxpixel_t g_minimizeNormalLut[BITMAP_NLUTCODES] = +{ + 0x2a, 0x4f, 0x06, 0x07, 0x26, 0x02, 0xff, 0xdf /* Codes 0-7 */ +}; + +static const nxgl_mxpixel_t g_minimizeBrightlLut[BITMAP_NLUTCODES] = +{ + 0x2b, 0x53, 0x07, 0x07, 0x26, 0x03, 0xff, 0xff /* Codes 0-7 */ +}; + +# endif /* DARK_MINIMIZE_ICON */ +# endif /* CONFIG_NXWIDGETS_GREYSCALE */ +#else +# error Unsupported pixel format +#endif + +static const struct NXWidgets::SRlePaletteBitmapEntry g_minimizeRleEntries[] = +{ + { 2, 0}, {40, 1}, /* Row 0 */ + { 2, 0}, {40, 1}, /* Row 1 */ + { 2, 1}, {10, 2}, {10, 3}, {16, 2}, { 2, 4}, { 2, 0}, /* Row 2 */ + { 2, 1}, {10, 2}, {10, 3}, {16, 2}, { 2, 4}, { 2, 0}, /* Row 3 */ + { 2, 1}, { 6, 2}, {16, 3}, {16, 2}, { 2, 4}, /* Row 4 */ + { 2, 1}, { 6, 2}, {16, 3}, {16, 2}, { 2, 4}, /* Row 5 */ + { 2, 1}, { 4, 2}, {20, 3}, {14, 2}, { 2, 4}, /* Row 6 */ + { 2, 1}, { 4, 2}, {20, 3}, {14, 2}, { 2, 4}, /* Row 7 */ + { 2, 1}, { 2, 2}, {20, 3}, {16, 2}, { 2, 4}, /* Row 8 */ + { 2, 1}, { 2, 2}, {20, 3}, {16, 2}, { 2, 4}, /* Row 9 */ + { 2, 1}, { 2, 2}, {18, 3}, {18, 2}, { 2, 4}, /* Row 10 */ + { 2, 1}, { 2, 2}, {18, 3}, {18, 2}, { 2, 4}, /* Row 11 */ + { 2, 1}, {18, 3}, {18, 2}, { 2, 5}, { 2, 4}, /* Row 12 */ + { 2, 1}, {18, 3}, {18, 2}, { 2, 5}, { 2, 4}, /* Row 13 */ + { 2, 1}, {16, 3}, {20, 2}, { 2, 5}, { 2, 4}, /* Row 14 */ + { 2, 1}, {16, 3}, {20, 2}, { 2, 5}, { 2, 4}, /* Row 15 */ + { 2, 1}, {14, 3}, {22, 2}, { 2, 5}, { 2, 4}, /* Row 16 */ + { 2, 1}, {14, 3}, {22, 2}, { 2, 5}, { 2, 4}, /* Row 17 */ + { 2, 1}, { 2, 2}, { 8, 3}, {24, 2}, { 4, 5}, { 2, 4}, /* Row 18 */ + { 2, 1}, { 2, 2}, { 8, 3}, {24, 2}, { 4, 5}, { 2, 4}, /* Row 19 */ + { 2, 1}, { 4, 2}, { 2, 3}, {28, 2}, { 4, 5}, { 2, 4}, /* Row 20 */ + { 2, 1}, { 4, 2}, { 2, 3}, {28, 2}, { 4, 5}, { 2, 4}, /* Row 21 */ + { 2, 1}, {32, 2}, { 6, 5}, { 2, 4}, /* Row 22 */ + { 2, 1}, {32, 2}, { 6, 5}, { 2, 4}, /* Row 23 */ + { 2, 1}, {30, 2}, { 8, 5}, { 2, 4}, /* Row 24 */ + { 2, 1}, {30, 2}, { 8, 5}, { 2, 4}, /* Row 25 */ + { 2, 1}, {26, 2}, {12, 5}, { 2, 4}, /* Row 26 */ + { 2, 1}, {26, 2}, {12, 5}, { 2, 4}, /* Row 27 */ + { 2, 1}, {22, 2}, {16, 5}, { 2, 4}, /* Row 28 */ + { 2, 1}, {22, 2}, {16, 5}, { 2, 4}, /* Row 29 */ + { 2, 1}, {16, 2}, {22, 5}, { 2, 4}, /* Row 30 */ + { 2, 1}, {16, 2}, {22, 5}, { 2, 4}, /* Row 31 */ + { 2, 1}, { 8, 2}, {30, 5}, { 2, 4}, /* Row 32 */ + { 2, 1}, { 8, 2}, {30, 5}, { 2, 4}, /* Row 33 */ + { 2, 1}, { 4, 2}, {28, 6}, { 2, 7}, { 4, 5}, { 2, 4}, /* Row 34 */ + { 2, 1}, { 4, 2}, {28, 6}, { 2, 7}, { 4, 5}, { 2, 4}, /* Row 35 */ + { 2, 1}, { 2, 2}, { 2, 5}, {30, 7}, { 4, 5}, { 2, 4}, /* Row 36 */ + { 2, 1}, { 2, 2}, { 2, 5}, {30, 7}, { 4, 5}, { 2, 4}, /* Row 37 */ + { 2, 1}, {38, 5}, { 2, 0}, /* Row 38 */ + { 2, 1}, {38, 5}, { 2, 0}, /* Row 39 */ + { 2, 1}, { 2, 0}, {34, 4}, { 2, 0}, { 2, 1}, /* Row 40 */ + { 2, 1}, { 2, 0}, {34, 4}, { 2, 0}, { 2, 1} /* Row 41 */ +}; + +/******************************************************************************************** + * Public Bitmap Structure Definitions + ********************************************************************************************/ + +const struct NXWidgets::SRlePaletteBitmap NxWM::g_minimizeBitmap = +{ + CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel + CONFIG_NXWIDGETS_FMT, // fmt - Color format + BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) + BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NROWS, // height - Height in rows + { // lut - Pointer to the beginning of the Look-Up Table (LUT) + g_minimizeNormalLut, // Index 0: Unselected LUT + g_minimizeBrightLut, // Index 1: Selected LUT + }, + g_minimizeRleEntries // data - Pointer to the beginning of the RLE data +}; diff --git a/NxWidgets/nxwm/src/glyph_play48x48.cxx b/NxWidgets/nxwm/src/glyph_play48x48.cxx index 526606e62..d74b815ad 100644 --- a/NxWidgets/nxwm/src/glyph_play48x48.cxx +++ b/NxWidgets/nxwm/src/glyph_play48x48.cxx @@ -215,54 +215,54 @@ static const nxgl_mxpixel_t g_playBrightlLut[BITMAP_NLUTCODES] = static const struct NXWidgets::SRlePaletteBitmapEntry g_playRleEntries[] = { - { 1, 0}, { 2, 1}, { 45, 2}, /* Row 0 */ - { 2, 3}, { 1, 0}, { 2, 1}, { 43, 2}, /* Row 1 */ - { 4, 3}, { 1, 0}, { 2, 1}, { 41, 2}, /* Row 2 */ - { 6, 3}, { 1, 0}, { 2, 1}, { 39, 2}, /* Row 3 */ - { 8, 3}, { 1, 0}, { 2, 1}, { 37, 2}, /* Row 4 */ - { 10, 3}, { 1, 0}, { 2, 1}, { 35, 2}, /* Row 5 */ - { 12, 3}, { 1, 0}, { 2, 1}, { 33, 2}, /* Row 6 */ - { 14, 3}, { 1, 0}, { 2, 1}, { 31, 2}, /* Row 7 */ - { 16, 3}, { 1, 0}, { 2, 1}, { 29, 2}, /* Row 8 */ - { 18, 3}, { 1, 0}, { 2, 1}, { 27, 2}, /* Row 9 */ - { 20, 3}, { 1, 0}, { 2, 1}, { 25, 2}, /* Row 10 */ - { 22, 3}, { 1, 0}, { 2, 1}, { 23, 2}, /* Row 11 */ - { 24, 3}, { 1, 0}, { 2, 1}, { 21, 2}, /* Row 12 */ - { 26, 3}, { 1, 0}, { 2, 1}, { 19, 2}, /* Row 13 */ - { 28, 3}, { 1, 0}, { 2, 1}, { 17, 2}, /* Row 14 */ - { 30, 3}, { 1, 0}, { 2, 1}, { 15, 2}, /* Row 15 */ - { 32, 3}, { 1, 0}, { 2, 1}, { 13, 2}, /* Row 16 */ - { 34, 3}, { 1, 0}, { 2, 1}, { 11, 2}, /* Row 17 */ - { 36, 3}, { 1, 0}, { 2, 1}, { 9, 2}, /* Row 18 */ - { 38, 3}, { 1, 0}, { 2, 1}, { 7, 2}, /* Row 19 */ - { 40, 3}, { 1, 0}, { 2, 1}, { 5, 2}, /* Row 20 */ - { 42, 3}, { 1, 0}, { 2, 1}, { 3, 2}, /* Row 21 */ - { 44, 3}, { 1, 0}, { 2, 1}, { 1, 2}, /* Row 22 */ - { 46, 3}, { 1, 0}, { 1, 1}, /* Row 23 */ - { 46, 4}, { 1, 5}, { 1, 6}, /* Row 24 */ - { 44, 4}, { 1, 5}, { 2, 6}, { 1, 2}, /* Row 25 */ - { 42, 4}, { 3, 6}, { 3, 2}, /* Row 26 */ - { 40, 4}, { 1, 5}, { 2, 6}, { 5, 2}, /* Row 27 */ - { 38, 4}, { 3, 6}, { 7, 2}, /* Row 28 */ - { 36, 4}, { 1, 5}, { 2, 6}, { 9, 2}, /* Row 29 */ - { 34, 4}, { 3, 6}, { 11, 2}, /* Row 30 */ - { 32, 4}, { 1, 5}, { 2, 6}, { 13, 2}, /* Row 31 */ - { 30, 4}, { 3, 6}, { 15, 2}, /* Row 32 */ - { 28, 4}, { 1, 5}, { 2, 6}, { 17, 2}, /* Row 33 */ - { 26, 4}, { 3, 6}, { 19, 2}, /* Row 34 */ - { 24, 4}, { 1, 5}, { 2, 6}, { 21, 2}, /* Row 35 */ - { 22, 4}, { 3, 6}, { 23, 2}, /* Row 36 */ - { 20, 4}, { 1, 5}, { 2, 6}, { 25, 2}, /* Row 37 */ - { 18, 4}, { 3, 6}, { 27, 2}, /* Row 38 */ - { 16, 4}, { 1, 5}, { 2, 6}, { 29, 2}, /* Row 39 */ - { 14, 4}, { 3, 6}, { 31, 2}, /* Row 40 */ - { 12, 4}, { 1, 5}, { 2, 6}, { 33, 2}, /* Row 41 */ - { 10, 4}, { 3, 6}, { 35, 2}, /* Row 42 */ - { 8, 4}, { 1, 5}, { 2, 6}, { 37, 2}, /* Row 43 */ - { 6, 4}, { 3, 6}, { 39, 2}, /* Row 44 */ - { 4, 4}, { 1, 5}, { 2, 6}, { 41, 2}, /* Row 45 */ - { 2, 4}, { 3, 6}, { 43, 2}, /* Row 46 */ - { 1, 5}, { 2, 6}, { 45, 2}, /* Row 47 */ + { 1, 0}, { 2, 1}, { 45, 2}, /* Row 0 */ + { 2, 3}, { 1, 0}, { 2, 1}, { 43, 2}, /* Row 1 */ + { 4, 3}, { 1, 0}, { 2, 1}, { 41, 2}, /* Row 2 */ + { 6, 3}, { 1, 0}, { 2, 1}, { 39, 2}, /* Row 3 */ + { 8, 3}, { 1, 0}, { 2, 1}, { 37, 2}, /* Row 4 */ + { 10, 3}, { 1, 0}, { 2, 1}, { 35, 2}, /* Row 5 */ + { 12, 3}, { 1, 0}, { 2, 1}, { 33, 2}, /* Row 6 */ + { 14, 3}, { 1, 0}, { 2, 1}, { 31, 2}, /* Row 7 */ + { 16, 3}, { 1, 0}, { 2, 1}, { 29, 2}, /* Row 8 */ + { 18, 3}, { 1, 0}, { 2, 1}, { 27, 2}, /* Row 9 */ + { 20, 3}, { 1, 0}, { 2, 1}, { 25, 2}, /* Row 10 */ + { 22, 3}, { 1, 0}, { 2, 1}, { 23, 2}, /* Row 11 */ + { 24, 3}, { 1, 0}, { 2, 1}, { 21, 2}, /* Row 12 */ + { 26, 3}, { 1, 0}, { 2, 1}, { 19, 2}, /* Row 13 */ + { 28, 3}, { 1, 0}, { 2, 1}, { 17, 2}, /* Row 14 */ + { 30, 3}, { 1, 0}, { 2, 1}, { 15, 2}, /* Row 15 */ + { 32, 3}, { 1, 0}, { 2, 1}, { 13, 2}, /* Row 16 */ + { 34, 3}, { 1, 0}, { 2, 1}, { 11, 2}, /* Row 17 */ + { 36, 3}, { 1, 0}, { 2, 1}, { 9, 2}, /* Row 18 */ + { 38, 3}, { 1, 0}, { 2, 1}, { 7, 2}, /* Row 19 */ + { 40, 3}, { 1, 0}, { 2, 1}, { 5, 2}, /* Row 20 */ + { 42, 3}, { 1, 0}, { 2, 1}, { 3, 2}, /* Row 21 */ + { 44, 3}, { 1, 0}, { 2, 1}, { 1, 2}, /* Row 22 */ + { 46, 3}, { 1, 0}, { 1, 1}, /* Row 23 */ + { 46, 4}, { 1, 5}, { 1, 6}, /* Row 24 */ + { 44, 4}, { 1, 5}, { 2, 6}, { 1, 2}, /* Row 25 */ + { 42, 4}, { 3, 6}, { 3, 2}, /* Row 26 */ + { 40, 4}, { 1, 5}, { 2, 6}, { 5, 2}, /* Row 27 */ + { 38, 4}, { 3, 6}, { 7, 2}, /* Row 28 */ + { 36, 4}, { 1, 5}, { 2, 6}, { 9, 2}, /* Row 29 */ + { 34, 4}, { 3, 6}, { 11, 2}, /* Row 30 */ + { 32, 4}, { 1, 5}, { 2, 6}, { 13, 2}, /* Row 31 */ + { 30, 4}, { 3, 6}, { 15, 2}, /* Row 32 */ + { 28, 4}, { 1, 5}, { 2, 6}, { 17, 2}, /* Row 33 */ + { 26, 4}, { 3, 6}, { 19, 2}, /* Row 34 */ + { 24, 4}, { 1, 5}, { 2, 6}, { 21, 2}, /* Row 35 */ + { 22, 4}, { 3, 6}, { 23, 2}, /* Row 36 */ + { 20, 4}, { 1, 5}, { 2, 6}, { 25, 2}, /* Row 37 */ + { 18, 4}, { 3, 6}, { 27, 2}, /* Row 38 */ + { 16, 4}, { 1, 5}, { 2, 6}, { 29, 2}, /* Row 39 */ + { 14, 4}, { 3, 6}, { 31, 2}, /* Row 40 */ + { 12, 4}, { 1, 5}, { 2, 6}, { 33, 2}, /* Row 41 */ + { 10, 4}, { 3, 6}, { 35, 2}, /* Row 42 */ + { 8, 4}, { 1, 5}, { 2, 6}, { 37, 2}, /* Row 43 */ + { 6, 4}, { 3, 6}, { 39, 2}, /* Row 44 */ + { 4, 4}, { 1, 5}, { 2, 6}, { 41, 2}, /* Row 45 */ + { 2, 4}, { 3, 6}, { 43, 2}, /* Row 46 */ + { 1, 5}, { 2, 6}, { 45, 2}, /* Row 47 */ }; /******************************************************************************************** @@ -271,14 +271,14 @@ static const struct NXWidgets::SRlePaletteBitmapEntry g_playRleEntries[] = const struct NXWidgets::SRlePaletteBitmap NxWM::g_playBitmap = { - CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel - CONFIG_NXWIDGETS_FMT, // fmt - Color format - BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) - BITMAP_NCOLUMNS, // width - Width in pixels - BITMAP_NROWS, // height - Height in rows + CONFIG_NXWIDGETS_BPP, // bpp - Bits per pixel + CONFIG_NXWIDGETS_FMT, // fmt - Color format + BITMAP_NLUTCODES, // nlut - Number of colors in the lLook-Up Table (LUT) + BITMAP_NCOLUMNS, // width - Width in pixels + BITMAP_NROWS, // height - Height in rows { // lut - Pointer to the beginning of the Look-Up Table (LUT) - g_playNormalLut, // Index 0: Unselected LUT - g_playBrightlLut, // Index 1: Selected LUT + g_playNormalLut, // Index 0: Unselected LUT + g_playBrightlLut, // Index 1: Selected LUT }, g_playRleEntries // data - Pointer to the beginning of the RLE data }; -- cgit v1.2.3