From 092a7a5059069c803bf6412edb32cd7ab38b1567 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Thu, 3 Oct 2024 14:10:46 +0200 Subject: [PATCH] convert colors to 0x format --- Makefile | 2 +- src/ui4x/48gx.c | 364 +++++++++++++++++------------------ src/ui4x/48sx.c | 364 +++++++++++++++++------------------ src/ui4x/49g.c | 396 +++++++++++++++++++-------------------- src/ui4x/bitmaps_fonts.h | 1 - src/ui4x/inner.h | 39 ++-- 6 files changed, 582 insertions(+), 584 deletions(-) diff --git a/Makefile b/Makefile index fda16bc..5b1b85d 100644 --- a/Makefile +++ b/Makefile @@ -143,7 +143,7 @@ clean-all: mrproper # Formatting pretty-code: - clang-format -i src/*.c src/*.h + clang-format -i src/*.c src/ui4x/*.h src/*.c src/ui4x/*.h make -C src/libChf pretty-code # Dependencies diff --git a/src/ui4x/48gx.c b/src/ui4x/48gx.c index 48bb596..bd8400a 100644 --- a/src/ui4x/48gx.c +++ b/src/ui4x/48gx.c @@ -1,181 +1,181 @@ #include "inner.h" color_t colors_48gx[ NB_COLORS ] = { + /* UI4X_COLOR_WHITE */ { - /* #FFFFFF */ - .r = 255, - .g = 255, - .b = 255, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 255, + .r = 0xFF, + .g = 0xFF, + .b = 0xFF, + .a = 0xFF, + .mono_rgb = 0xFF, + .gray_rgb = 0xFF, }, + /* UI4X_COLOR_SHIFT_LEFT */ { - /* #ffbaff */ - .r = 255, - .g = 186, - .b = 255, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 220, + .r = 0xFF, + .g = 0xBA, + .b = 0xFF, + .a = 0xFF, + .mono_rgb = 0xFF, + .gray_rgb = 0xDC, }, + /* UI4X_COLOR_SHIFT_RIGHT */ { - /* #00ffcc */ - .r = 0, - .g = 255, - .b = 204, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 169, + .r = 0x0, + .g = 0xFF, + .b = 0xCC, + .a = 0xFF, + .mono_rgb = 0xFF, + .gray_rgb = 0xA9, }, + /* UI4X_COLOR_BUTTON_EDGE_TOP */ { - /* #646464 */ - .r = 104, - .g = 104, - .b = 104, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 104, + .r = 0x68, + .g = 0x68, + .b = 0x68, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x68, }, + /* UI4X_COLOR_BUTTON */ { - /* #585858 */ - .r = 88, - .g = 88, - .b = 88, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 88, + .r = 0x58, + .g = 0x58, + .b = 0x58, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x58, }, + /* UI4X_COLOR_BUTTON_EDGE_BOTTOM */ { - /* #4a4a4a */ - .r = 74, - .g = 74, - .b = 74, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 74, + .r = 0x4A, + .g = 0x4A, + .b = 0x4A, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x4A, }, + /* UI4X_COLOR_LCD_BG */ { - /* #cadd5c */ - .r = 202, - .g = 221, - .b = 92, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 205, + .r = 0xCA, + .g = 0xDD, + .b = 0x5C, + .a = 0xFF, + .mono_rgb = 0xFF, + .gray_rgb = 0xCD, }, + /* UI4X_COLOR_LCD_PIXEL */ { - /* #000080 */ - .r = 0, - .g = 0, - .b = 128, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 20, + .r = 0x0, + .g = 0x0, + .b = 0x80, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x14, }, + /* UI4X_COLOR_FACEPLATE_EDGE_TOP */ { - /* #585858 */ - .r = 88, - .g = 88, - .b = 88, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 88, + .r = 0x58, + .g = 0x58, + .b = 0x58, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x58, }, + /* UI4X_COLOR_FACEPLATE */ { - /* #4a4a4a */ - .r = 74, - .g = 74, - .b = 74, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 74, + .r = 0x4A, + .g = 0x4A, + .b = 0x4A, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x4A, }, + /* UI4X_COLOR_FACEPLATE_EDGE_BOTTOM */ { - /* #404040 */ - .r = 64, - .g = 64, - .b = 64, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 64, + .r = 0x40, + .g = 0x40, + .b = 0x40, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x40, }, + /* UI4X_COLOR_UPPER_FACEPLATE_EDGE_TOP */ { - /* #808080 */ - .r = 128, - .g = 128, - .b = 138, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 128, + .r = 0x80, + .g = 0x80, + .b = 0x8A, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x80, }, + /* UI4X_COLOR_UPPER_FACEPLATE */ { - /* #68686E */ - .r = 104, - .g = 104, - .b = 110, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 104, + .r = 0x68, + .g = 0x68, + .b = 0x6E, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x68, }, + /* UI4X_COLOR_UPPER_FACEPLATE_EDGE_BOTTOM */ { - /* #54545a */ - .r = 84, - .g = 84, - .b = 90, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 84, + .r = 0x54, + .g = 0x54, + .b = 0x5A, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x54, }, + /* UI4X_COLOR_HP_LOGO */ { - /* #b0b0b8 */ - .r = 176, - .g = 176, - .b = 184, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 176, + .r = 0xB0, + .g = 0xB0, + .b = 0xB8, + .a = 0xFF, + .mono_rgb = 0xFF, + .gray_rgb = 0xB0, }, + /* UI4X_COLOR_HP_LOGO_BG */ { - /* #68686e */ - .r = 104, - .g = 104, - .b = 110, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 104, + .r = 0x68, + .g = 0x68, + .b = 0x6E, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x68, }, + /* UI4X_COLOR_48GX_128K_RAM */ { - /* #f0f0f0 */ - .r = 240, - .g = 240, - .b = 240, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 240, + .r = 0xF0, + .g = 0xF0, + .b = 0xF0, + .a = 0xFF, + .mono_rgb = 0xFF, + .gray_rgb = 0xF0, }, + /* UI4X_COLOR_FRAME */ { - /* #000000 */ - .r = 0, - .g = 0, - .b = 0, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 0, + .r = 0x0, + .g = 0x0, + .b = 0x0, + .a = 0xFF, + .mono_rgb = 0xFF, + .gray_rgb = 0x0, }, + /* UI4X_COLOR_KEYPAD_HIGHLIGHT */ { - /* #68686e */ - .r = 104, - .g = 104, - .b = 110, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 104, + .r = 0x68, + .g = 0x68, + .b = 0x6E, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x68, }, }; button_t buttons_48gx[ NB_HP48_KEYS ] = { - { .x = 0, + {.x = 0, .y = 0, .w = 36, .h = 23, @@ -190,7 +190,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 50, + {.x = 50, .y = 0, .w = 36, .h = 23, @@ -205,7 +205,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 100, + {.x = 100, .y = 0, .w = 36, .h = 23, @@ -220,7 +220,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 150, + {.x = 150, .y = 0, .w = 36, .h = 23, @@ -235,7 +235,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 200, + {.x = 200, .y = 0, .w = 36, .h = 23, @@ -250,7 +250,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 250, + {.x = 250, .y = 0, .w = 36, .h = 23, @@ -266,7 +266,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .right = 0, .sub = 0 }, - { .x = 0, + {.x = 0, .y = 50, .w = 36, .h = 26, @@ -281,7 +281,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "POLAR", .sub = 0 }, - { .x = 50, + {.x = 50, .y = 50, .w = 36, .h = 26, @@ -296,7 +296,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "CHARS", .sub = 0 }, - { .x = 100, + {.x = 100, .y = 50, .w = 36, .h = 26, @@ -311,7 +311,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "MODES", .sub = 0 }, - { .x = 150, + {.x = 150, .y = 50, .w = 36, .h = 26, @@ -326,7 +326,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "MEMORY", .sub = 0 }, - { .x = 200, + {.x = 200, .y = 50, .w = 36, .h = 26, @@ -341,7 +341,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "STACK", .sub = 0 }, - { .x = 250, + {.x = 250, .y = 50, .w = 36, .h = 26, @@ -357,7 +357,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .right = "MENU", .sub = 0 }, - { .x = 0, + {.x = 0, .y = 100, .w = 36, .h = 26, @@ -372,7 +372,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "HOME", .sub = 0 }, - { .x = 50, + {.x = 50, .y = 100, .w = 36, .h = 26, @@ -387,7 +387,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "RCL", .sub = 0 }, - { .x = 100, + {.x = 100, .y = 100, .w = 36, .h = 26, @@ -402,7 +402,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "UNDO", .sub = 0 }, - { .x = 150, + {.x = 150, .y = 100, .w = 36, .h = 26, @@ -417,7 +417,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 200, + {.x = 200, .y = 100, .w = 36, .h = 26, @@ -432,7 +432,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 250, + {.x = 250, .y = 100, .w = 36, .h = 26, @@ -448,7 +448,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .right = 0, .sub = 0 }, - { .x = 0, + {.x = 0, .y = 150, .w = 36, .h = 26, @@ -463,7 +463,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "\x07", .sub = 0 }, - { .x = 50, + {.x = 50, .y = 150, .w = 36, .h = 26, @@ -478,7 +478,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "\x08", .sub = 0 }, - { .x = 100, + {.x = 100, .y = 150, .w = 36, .h = 26, @@ -493,7 +493,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "\x09", .sub = 0 }, - { .x = 150, + {.x = 150, .y = 150, .w = 36, .h = 26, @@ -508,7 +508,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "\x14", .sub = 0 }, - { .x = 200, + {.x = 200, .y = 150, .w = 36, .h = 26, @@ -523,7 +523,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "LOG", .sub = 0 }, - { .x = 250, + {.x = 250, .y = 150, .w = 36, .h = 26, @@ -539,7 +539,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .right = "LN", .sub = 0 }, - { .x = 0, + {.x = 0, .y = 200, .w = 86, .h = 26, @@ -554,7 +554,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "MATRIX", .sub = 0 }, - { .x = 100, + {.x = 100, .y = 200, .w = 36, .h = 26, @@ -569,7 +569,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "CMD", .sub = 0 }, - { .x = 150, + {.x = 150, .y = 200, .w = 36, .h = 26, @@ -584,7 +584,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "ARG", .sub = 0 }, - { .x = 200, + {.x = 200, .y = 200, .w = 36, .h = 26, @@ -599,7 +599,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 250, + {.x = 250, .y = 200, .w = 36, .h = 26, @@ -615,7 +615,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .right = 0, .sub = 0 }, - { .x = 0, + {.x = 0, .y = 250, .w = 36, .h = 26, @@ -630,7 +630,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "ENTRY", .sub = 0 }, - { .x = 60, + {.x = 60, .y = 250, .w = 46, .h = 26, @@ -645,7 +645,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 120, + {.x = 120, .y = 250, .w = 46, .h = 26, @@ -660,7 +660,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 180, + {.x = 180, .y = 250, .w = 46, .h = 26, @@ -675,7 +675,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 240, + {.x = 240, .y = 250, .w = 46, .h = 26, @@ -691,7 +691,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .right = "\x18", .sub = 0 }, - { .x = 0, + {.x = 0, .y = 300, .w = 36, .h = 26, @@ -706,7 +706,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 60, + {.x = 60, .y = 300, .w = 46, .h = 26, @@ -721,7 +721,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 120, + {.x = 120, .y = 300, .w = 46, .h = 26, @@ -736,7 +736,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 180, + {.x = 180, .y = 300, .w = 46, .h = 26, @@ -751,7 +751,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 240, + {.x = 240, .y = 300, .w = 46, .h = 26, @@ -767,7 +767,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .right = "\x1a", .sub = 0 }, - { .x = 0, + {.x = 0, .y = 350, .w = 36, .h = 26, @@ -782,7 +782,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 60, + {.x = 60, .y = 350, .w = 46, .h = 26, @@ -797,7 +797,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 120, + {.x = 120, .y = 350, .w = 46, .h = 26, @@ -812,7 +812,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 180, + {.x = 180, .y = 350, .w = 46, .h = 26, @@ -827,7 +827,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 240, + {.x = 240, .y = 350, .w = 46, .h = 26, @@ -843,7 +843,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .right = "\x1c", .sub = 0 }, - { .x = 0, + {.x = 0, .y = 400, .w = 36, .h = 26, @@ -858,7 +858,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "OFF", .sub = "CANCEL"}, - { .x = 60, + {.x = 60, .y = 400, .w = 46, .h = 26, @@ -873,7 +873,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "\x03", .sub = 0 }, - { .x = 120, + {.x = 120, .y = 400, .w = 46, .h = 26, @@ -888,7 +888,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "\x01", .sub = 0 }, - { .x = 180, + {.x = 180, .y = 400, .w = 46, .h = 26, @@ -903,7 +903,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "\x1f", .sub = 0 }, - { .x = 240, + {.x = 240, .y = 400, .w = 46, .h = 26, diff --git a/src/ui4x/48sx.c b/src/ui4x/48sx.c index 115d7d5..07a5c64 100644 --- a/src/ui4x/48sx.c +++ b/src/ui4x/48sx.c @@ -1,181 +1,181 @@ #include "inner.h" color_t colors_48sx[ NB_COLORS ] = { + /* UI4X_COLOR_WHITE */ { - /* #ffffff */ - .r = 255, - .g = 255, - .b = 255, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 255, + .r = 0xFF, + .g = 0xFF, + .b = 0xFF, + .a = 0xFF, + .mono_rgb = 0xFF, + .gray_rgb = 0xFF, }, + /* UI4X_COLOR_SHIFT_LEFT */ { - /* #ffa600 */ - .r = 255, - .g = 166, - .b = 0, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 230, + .r = 0xFF, + .g = 0xA6, + .b = 0x0, + .a = 0xFF, + .mono_rgb = 0xFF, + .gray_rgb = 0xE6, }, + /* UI4X_COLOR_SHIFT_RIGHT */ { - /* #00d2ff */ - .r = 0, - .g = 210, - .b = 255, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 169, + .r = 0x0, + .g = 0xD2, + .b = 0xFF, + .a = 0xFF, + .mono_rgb = 0xFF, + .gray_rgb = 0xA9, }, + /* UI4X_COLOR_BUTTON_EDGE_TOP */ { - /* #6d5d5d */ - .r = 109, - .g = 93, - .b = 93, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 91, + .r = 0x6D, + .g = 0x5D, + .b = 0x5D, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x5B, }, + /* UI4X_COLOR_BUTTON */ { - /* #5a4d4d */ - .r = 90, - .g = 77, - .b = 77, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 81, + .r = 0x5A, + .g = 0x4D, + .b = 0x4D, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x51, }, + /* UI4X_COLOR_BUTTON_EDGE_BOTTOM */ { - /* #4c4141 */ - .r = 76, - .g = 65, - .b = 65, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 69, + .r = 0x4C, + .g = 0x41, + .b = 0x41, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x45, }, + /* UI4X_COLOR_LCD_BG */ { - /* #cadd5c */ - .r = 202, - .g = 221, - .b = 92, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 205, + .r = 0xCA, + .g = 0xDD, + .b = 0x5C, + .a = 0xFF, + .mono_rgb = 0xFF, + .gray_rgb = 0xCD, }, + /* UI4X_COLOR_LCD_PIXEL */ { - /* #000080 */ - .r = 0, - .g = 0, - .b = 128, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 20, + .r = 0x0, + .g = 0x0, + .b = 0x80, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x14, }, + /* UI4X_COLOR_FACEPLATE_EDGE_TOP */ { - /* #6d4e4e */ - .r = 109, - .g = 78, - .b = 78, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 88, + .r = 0x6D, + .g = 0x4E, + .b = 0x4E, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x58, }, + /* UI4X_COLOR_FACEPLATE */ { - /* #5a4040 */ - .r = 90, - .g = 64, - .b = 64, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 73, + .r = 0x5A, + .g = 0x40, + .b = 0x40, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x49, }, + /* UI4X_COLOR_FACEPLATE_EDGE_BOTTOM */ { - /* #4c3636 */ - .r = 76, - .g = 54, - .b = 54, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 60, + .r = 0x4C, + .g = 0x36, + .b = 0x36, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x3C, }, + /* UI4X_COLOR_UPPER_FACEPLATE_EDGE_TOP */ { - /* #9b7654 */ - .r = 155, - .g = 118, - .b = 84, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 124, + .r = 0x9B, + .g = 0x76, + .b = 0x54, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x7C, }, + /* UI4X_COLOR_UPPER_FACEPLATE */ { - /* #7c5e43 */ - .r = 124, - .g = 94, - .b = 67, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 99, + .r = 0x7C, + .g = 0x5E, + .b = 0x43, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x63, }, + /* UI4X_COLOR_UPPER_FACEPLATE_EDGE_BOTTOM */ { - /* #644b35 */ - .r = 100, - .g = 75, - .b = 53, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 79, + .r = 0x64, + .g = 0x4B, + .b = 0x35, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x4F, }, + /* UI4X_COLOR_HP_LOGO */ { - /* #cca96b */ - .r = 204, - .g = 169, - .b = 107, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 172, + .r = 0xCC, + .g = 0xA9, + .b = 0x6B, + .a = 0xFF, + .mono_rgb = 0xFF, + .gray_rgb = 0xAC, }, + /* UI4X_COLOR_HP_LOGO_BG */ { - /* #404040 */ - .r = 64, - .g = 64, - .b = 64, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 65, + .r = 0x40, + .g = 0x40, + .b = 0x40, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x41, }, + /* UI4X_COLOR_48GX_128K_RAM */ { - /* #cab890 */ - .r = 202, - .g = 184, - .b = 144, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 185, + .r = 0xCA, + .g = 0xB8, + .b = 0x90, + .a = 0xFF, + .mono_rgb = 0xFF, + .gray_rgb = 0xB9, }, + /* UI4X_COLOR_FRAME */ { - /* #000000 */ - .r = 0, - .g = 0, - .b = 0, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 0, + .r = 0x0, + .g = 0x0, + .b = 0x0, + .a = 0xFF, + .mono_rgb = 0xFF, + .gray_rgb = 0x0, }, + /* UI4X_COLOR_KEYPAD_HIGHLIGHT */ { - /* #3c2a2a */ - .r = 60, - .g = 42, - .b = 42, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 48, + .r = 0x3C, + .g = 0x2A, + .b = 0x2A, + .a = 0xFF, + .mono_rgb = 0x0, + .gray_rgb = 0x30, }, }; button_t buttons_48sx[ NB_HP48_KEYS ] = { - { .x = 0, + {.x = 0, .y = 0, .w = 36, .h = 23, @@ -190,7 +190,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 50, + {.x = 50, .y = 0, .w = 36, .h = 23, @@ -205,7 +205,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 100, + {.x = 100, .y = 0, .w = 36, .h = 23, @@ -220,7 +220,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 150, + {.x = 150, .y = 0, .w = 36, .h = 23, @@ -235,7 +235,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 200, + {.x = 200, .y = 0, .w = 36, .h = 23, @@ -250,7 +250,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 250, + {.x = 250, .y = 0, .w = 36, .h = 23, @@ -266,7 +266,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .right = 0, .sub = 0 }, - { .x = 0, + {.x = 0, .y = 50, .w = 36, .h = 26, @@ -281,7 +281,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 50, + {.x = 50, .y = 50, .w = 36, .h = 26, @@ -296,7 +296,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 100, + {.x = 100, .y = 50, .w = 36, .h = 26, @@ -311,7 +311,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 150, + {.x = 150, .y = 50, .w = 36, .h = 26, @@ -326,7 +326,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 200, + {.x = 200, .y = 50, .w = 36, .h = 26, @@ -341,7 +341,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 250, + {.x = 250, .y = 50, .w = 36, .h = 26, @@ -357,7 +357,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .right = 0, .sub = 0 }, - { .x = 0, + {.x = 0, .y = 100, .w = 36, .h = 26, @@ -372,7 +372,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "HOME", .sub = 0 }, - { .x = 50, + {.x = 50, .y = 100, .w = 36, .h = 26, @@ -387,7 +387,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "RCL", .sub = 0 }, - { .x = 100, + {.x = 100, .y = 100, .w = 36, .h = 26, @@ -402,7 +402,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "\x80NUM", .sub = 0 }, - { .x = 150, + {.x = 150, .y = 100, .w = 36, .h = 26, @@ -417,7 +417,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 200, + {.x = 200, .y = 100, .w = 36, .h = 26, @@ -432,7 +432,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 250, + {.x = 250, .y = 100, .w = 36, .h = 26, @@ -448,7 +448,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .right = 0, .sub = 0 }, - { .x = 0, + {.x = 0, .y = 150, .w = 36, .h = 26, @@ -463,7 +463,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "\x07", .sub = 0 }, - { .x = 50, + {.x = 50, .y = 150, .w = 36, .h = 26, @@ -478,7 +478,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "\x08", .sub = 0 }, - { .x = 100, + {.x = 100, .y = 150, .w = 36, .h = 26, @@ -493,7 +493,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "\x09", .sub = 0 }, - { .x = 150, + {.x = 150, .y = 150, .w = 36, .h = 26, @@ -508,7 +508,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "\x0b", .sub = 0 }, - { .x = 200, + {.x = 200, .y = 150, .w = 36, .h = 26, @@ -523,7 +523,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "LOG", .sub = 0 }, - { .x = 250, + {.x = 250, .y = 150, .w = 36, .h = 26, @@ -539,7 +539,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .right = "LN", .sub = 0 }, - { .x = 0, + {.x = 0, .y = 200, .w = 86, .h = 26, @@ -554,7 +554,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "MATRIX", .sub = 0 }, - { .x = 100, + {.x = 100, .y = 200, .w = 36, .h = 26, @@ -569,7 +569,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "VISIT", .sub = 0 }, - { .x = 150, + {.x = 150, .y = 200, .w = 36, .h = 26, @@ -584,7 +584,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "3D", .sub = 0 }, - { .x = 200, + {.x = 200, .y = 200, .w = 36, .h = 26, @@ -599,7 +599,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 250, + {.x = 250, .y = 200, .w = 36, .h = 26, @@ -615,7 +615,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .right = "CLR", .sub = 0 }, - { .x = 0, + {.x = 0, .y = 250, .w = 36, .h = 26, @@ -630,7 +630,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "ENTRY", .sub = 0 }, - { .x = 60, + {.x = 60, .y = 250, .w = 46, .h = 26, @@ -645,7 +645,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 120, + {.x = 120, .y = 250, .w = 46, .h = 26, @@ -660,7 +660,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 180, + {.x = 180, .y = 250, .w = 46, .h = 26, @@ -675,7 +675,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 240, + {.x = 240, .y = 250, .w = 46, .h = 26, @@ -691,7 +691,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .right = "#", .sub = 0 }, - { .x = 0, + {.x = 0, .y = 300, .w = 36, .h = 26, @@ -706,7 +706,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 60, + {.x = 60, .y = 300, .w = 46, .h = 26, @@ -721,7 +721,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 120, + {.x = 120, .y = 300, .w = 46, .h = 26, @@ -736,7 +736,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 180, + {.x = 180, .y = 300, .w = 46, .h = 26, @@ -751,7 +751,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 1, .right = 0, .sub = 0 }, - { .x = 240, + {.x = 240, .y = 300, .w = 46, .h = 26, @@ -767,7 +767,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .right = "_", .sub = 0 }, - { .x = 0, + {.x = 0, .y = 350, .w = 36, .h = 26, @@ -782,7 +782,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 60, + {.x = 60, .y = 350, .w = 46, .h = 26, @@ -797,7 +797,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "POLAR", .sub = 0 }, - { .x = 120, + {.x = 120, .y = 350, .w = 46, .h = 26, @@ -812,7 +812,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "ARG", .sub = 0 }, - { .x = 180, + {.x = 180, .y = 350, .w = 46, .h = 26, @@ -827,7 +827,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "MENU", .sub = 0 }, - { .x = 240, + {.x = 240, .y = 350, .w = 46, .h = 26, @@ -843,7 +843,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .right = "\x0f", .sub = 0 }, - { .x = 0, + {.x = 0, .y = 400, .w = 36, .h = 26, @@ -858,7 +858,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = "OFF", .sub = "ATTN"}, - { .x = 60, + {.x = 60, .y = 400, .w = 46, .h = 26, @@ -873,7 +873,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = " \x80", .sub = 0 }, - { .x = 120, + {.x = 120, .y = 400, .w = 46, .h = 26, @@ -888,7 +888,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = " \x10", .sub = 0 }, - { .x = 180, + {.x = 180, .y = 400, .w = 46, .h = 26, @@ -903,7 +903,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .is_menu = 0, .right = " \x12", .sub = 0 }, - { .x = 240, + {.x = 240, .y = 400, .w = 46, .h = 26, diff --git a/src/ui4x/49g.c b/src/ui4x/49g.c index 0c34532..225daee 100644 --- a/src/ui4x/49g.c +++ b/src/ui4x/49g.c @@ -1,183 +1,183 @@ #include "inner.h" color_t colors_49g[ NB_COLORS ] = { + /* UI4X_COLOR_WHITE */ { - /* #FFFFFF */ - .r = 255, - .g = 255, - .b = 255, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 255, + .r = 0xff, + .g = 0xff, + .b = 0xff, + .a = 0xff, + .mono_rgb = 0xff, + .gray_rgb = 0xff, }, + /* UI4X_COLOR_SHIFT_LEFT */ { - /* #00bfff */ - .r = 0x00, + .r = 0x00, .g = 0xbf, .b = 0xff, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 220, + .a = 0xff, + .mono_rgb = 0xff, + .gray_rgb = 0xDC, }, + /* UI4X_COLOR_SHIFT_RIGHT */ { - /* #cd5c5c */ - .r = 0xcd, + .r = 0xcd, .g = 0x5c, .b = 0x5c, .a = 0xff, - .mono_rgb = 255, - .gray_rgb = 169, + .mono_rgb = 0xff, + .gray_rgb = 0xA9, }, + /* UI4X_COLOR_BUTTON_EDGE_TOP */ { - /* #646464 */ - .r = 104, - .g = 104, - .b = 104, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 104, + .r = 0x68, + .g = 0x68, + .b = 0x68, + .a = 0xff, + .mono_rgb = 0x00, + .gray_rgb = 0x68, }, + /* UI4X_COLOR_BUTTON */ { - /* #304055 */ - .r = 0x30, + .r = 0x30, .g = 0x40, .b = 0x55, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 88, + .a = 0xff, + .mono_rgb = 0x00, + .gray_rgb = 0x58, }, + /* UI4X_COLOR_BUTTON_EDGE_BOTTOM */ { - /* #4a4a4a */ - .r = 74, - .g = 74, - .b = 74, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 74, + .r = 0x4A, + .g = 0x4A, + .b = 0x4A, + .a = 0xff, + .mono_rgb = 0x00, + .gray_rgb = 0x4A, }, + /* UI4X_COLOR_LCD_BG */ { - /* #cccccc */ - .r = 0xcc, + .r = 0xcc, .g = 0xcc, .b = 0xcc, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 205, + .a = 0xff, + .mono_rgb = 0xff, + .gray_rgb = 0xCD, }, + /* UI4X_COLOR_LCD_PIXEL */ { - /* #000000 */ - .r = 0x00, + .r = 0x00, .g = 0x00, .b = 0x00, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 20, + .a = 0xff, + .mono_rgb = 0x00, + .gray_rgb = 0x14, }, + /* UI4X_COLOR_FACEPLATE_EDGE_TOP */ { - /* #888888 */ - .r = 88, - .g = 88, - .b = 88, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 88, + .r = 0x58, + .g = 0x58, + .b = 0x58, + .a = 0xff, + .mono_rgb = 0x00, + .gray_rgb = 0x58, }, + /* UI4X_COLOR_FACEPLATE */ { - /* #304055 */ - .r = 0x30, + .r = 0x30, .g = 0x40, .b = 0x55, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 74, + .a = 0xff, + .mono_rgb = 0x00, + .gray_rgb = 0x4A, }, + /* UI4X_COLOR_FACEPLATE_EDGE_BOTTOM */ { - /* #646464 */ - .r = 64, - .g = 64, - .b = 64, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 64, + .r = 0x40, + .g = 0x40, + .b = 0x40, + .a = 0xff, + .mono_rgb = 0x00, + .gray_rgb = 0x40, }, + /* UI4X_COLOR_UPPER_FACEPLATE_EDGE_TOP */ { - /* #80808a */ - .r = 128, - .g = 128, - .b = 138, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 128, + .r = 0x80, + .g = 0x80, + .b = 0x8A, + .a = 0xff, + .mono_rgb = 0x00, + .gray_rgb = 0x80, }, + /* UI4X_COLOR_UPPER_FACEPLATE */ { - /* #304055 */ - .r = 0x30, + .r = 0x30, .g = 0x40, .b = 0x55, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 104, + .a = 0xff, + .mono_rgb = 0x00, + .gray_rgb = 0x68, }, + /* UI4X_COLOR_UPPER_FACEPLATE_EDGE_BOTTOM */ { - /* #54545a */ - .r = 84, - .g = 84, - .b = 90, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 84, + .r = 0x54, + .g = 0x54, + .b = 0x5A, + .a = 0xff, + .mono_rgb = 0x00, + .gray_rgb = 0x54, }, + /* UI4X_COLOR_HP_LOGO */ { - /* #b0b0b8 */ - .r = 176, - .g = 176, - .b = 184, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 176, + .r = 0xB0, + .g = 0xB0, + .b = 0xB8, + .a = 0xff, + .mono_rgb = 0xff, + .gray_rgb = 0xB0, }, + /* UI4X_COLOR_HP_LOGO_BG */ { - /* #68686e */ - .r = 104, - .g = 104, - .b = 110, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 104, + .r = 0x68, + .g = 0x68, + .b = 0x6E, + .a = 0xff, + .mono_rgb = 0x00, + .gray_rgb = 0x68, }, + /* UI4X_COLOR_48GX_128K_RAM */ { - /* #f0f0f0 */ - .r = 240, - .g = 240, - .b = 240, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 240, + .r = 0xF0, + .g = 0xF0, + .b = 0xF0, + .a = 0xff, + .mono_rgb = 0xff, + .gray_rgb = 0xF0, }, + /* UI4X_COLOR_FRAME */ { - /* #000000 */ - .r = 0, - .g = 0, - .b = 0, - .a = 255, - .mono_rgb = 255, - .gray_rgb = 0, + .r = 0x00, + .g = 0x00, + .b = 0x00, + .a = 0xff, + .mono_rgb = 0xff, + .gray_rgb = 0x00, }, + /* UI4X_COLOR_KEYPAD_HIGHLIGHT */ { - /* #4f6165 */ - .r = 0x4f, + .r = 0x4f, .g = 0x61, .b = 0x65, - .a = 255, - .mono_rgb = 0, - .gray_rgb = 104, + .a = 0xff, + .mono_rgb = 0x00, + .gray_rgb = 0x68, }, }; #define KB_LINE_HEIGHT 45 button_t buttons_49g[ NB_HP49_KEYS ] = { - { .x = 0, + {.x = 0, .y = 0, .w = 36, .h = 26, @@ -191,8 +191,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "Y=", .is_menu = 0, .right = 0, - .sub = 0}, - { .x = 50, + .sub = 0 }, + {.x = 50, .y = 0, .w = 36, .h = 26, @@ -206,8 +206,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "WIN", .is_menu = 0, .right = 0, - .sub = 0}, - { .x = 100, + .sub = 0 }, + {.x = 100, .y = 0, .w = 36, .h = 26, @@ -221,8 +221,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "GRAPH", .is_menu = 0, .right = 0, - .sub = 0}, - { .x = 150, + .sub = 0 }, + {.x = 150, .y = 0, .w = 36, .h = 26, @@ -236,8 +236,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "2D/3D", .is_menu = 0, .right = 0, - .sub = 0}, - { .x = 200, + .sub = 0 }, + {.x = 200, .y = 0, .w = 36, .h = 26, @@ -251,8 +251,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "TBLSET", .is_menu = 0, .right = 0, - .sub = 0}, - { .x = 250, + .sub = 0 }, + {.x = 250, .y = 0, .w = 36, .h = 26, @@ -266,9 +266,9 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "TABLE", .is_menu = 0, .right = 0, - .sub = 0}, + .sub = 0 }, - { .x = 0, + {.x = 0, .y = 1 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -282,8 +282,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "FILES", .is_menu = 0, .right = "BEGIN", - .sub = 0}, - { .x = 60, + .sub = 0 }, + {.x = 60, .y = 1 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -297,8 +297,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "CUSTOM", .is_menu = 0, .right = "END", - .sub = 0}, - { .x = 120, + .sub = 0 }, + {.x = 120, .y = 1 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -312,9 +312,9 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "i", .is_menu = 0, .right = "I", - .sub = 0}, + .sub = 0 }, - { .x = 0, + {.x = 0, .y = 2 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -328,8 +328,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "UPDIR", .is_menu = 0, .right = "COPY", - .sub = 0}, - { .x = 60, + .sub = 0 }, + {.x = 60, .y = 2 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -343,8 +343,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "RCL", .is_menu = 0, .right = "CUT", - .sub = 0}, - { .x = 120, + .sub = 0 }, + {.x = 120, .y = 2 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -358,9 +358,9 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "PREV", .is_menu = 0, .right = "PASTE", - .sub = 0}, + .sub = 0 }, - { .x = 180, + {.x = 180, .y = 1.4 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -374,8 +374,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = 0, .is_menu = 0, .right = 0, - .sub = 0}, - { .x = 210, + .sub = 0 }, + {.x = 210, .y = 0.75 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -389,8 +389,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = 0, .is_menu = 0, .right = 0, - .sub = 0}, - { .x = 240, + .sub = 0 }, + {.x = 240, .y = 1.4 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -404,8 +404,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = 0, .is_menu = 0, .right = 0, - .sub = 0}, - { .x = 210, + .sub = 0 }, + {.x = 210, .y = 2 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -419,9 +419,9 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = 0, .is_menu = 0, .right = 0, - .sub = 0}, + .sub = 0 }, - { .x = 0, + {.x = 0, .y = 3 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -435,8 +435,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "CMD", .is_menu = 0, .right = "UNDO", - .sub = 0}, - { .x = 60, + .sub = 0 }, + {.x = 60, .y = 3 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -450,8 +450,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "PRG", .is_menu = 0, .right = "CHARS", - .sub = 0}, - { .x = 120, + .sub = 0 }, + {.x = 120, .y = 3 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -465,8 +465,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "MTRW", .is_menu = 0, .right = "'", - .sub = 0}, - { .x = 180, + .sub = 0 }, + {.x = 180, .y = 3 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -480,8 +480,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "MTH", .is_menu = 0, .right = "EVAL", - .sub = 0}, - { .x = 240, + .sub = 0 }, + {.x = 240, .y = 3 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -495,9 +495,9 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "DEL", .is_menu = 0, .right = "CLEAR", - .sub = 0}, + .sub = 0 }, - { .x = 0, + {.x = 0, .y = 4 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -511,8 +511,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "\x16", .is_menu = 0, .right = "LN", - .sub = 0}, - { .x = 60, + .sub = 0 }, + {.x = 60, .y = 4 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -526,8 +526,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "\x13", .is_menu = 0, .right = "\x14", - .sub = 0}, - { .x = 120, + .sub = 0 }, + {.x = 120, .y = 4 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -541,8 +541,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "ASIN", .is_menu = 0, .right = "\x09", - .sub = 0}, - { .x = 180, + .sub = 0 }, + {.x = 180, .y = 4 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -556,8 +556,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "ACOS", .is_menu = 0, .right = "\x07", - .sub = 0}, - { .x = 240, + .sub = 0 }, + {.x = 240, .y = 4 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -571,9 +571,9 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "ATAN", .is_menu = 0, .right = "\x08", - .sub = 0}, + .sub = 0 }, - { .x = 0, + {.x = 0, .y = 5 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -587,8 +587,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "\x15", .is_menu = 0, .right = "LOG", - .sub = 0}, - { .x = 60, + .sub = 0 }, + {.x = 60, .y = 5 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -602,8 +602,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "/=", .is_menu = 0, .right = "=", - .sub = 0}, - { .x = 120, + .sub = 0 }, + {.x = 120, .y = 5 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -617,8 +617,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "<=", .is_menu = 0, .right = "<", - .sub = 0}, - { .x = 180, + .sub = 0 }, + {.x = 180, .y = 5 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -632,8 +632,8 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = ">=", .is_menu = 0, .right = ">", - .sub = 0}, - { .x = 240, + .sub = 0 }, + {.x = 240, .y = 5 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -647,9 +647,9 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .left = "ABS ", .is_menu = 0, .right = "ARG", - .sub = 0}, + .sub = 0 }, - { .x = 0, + {.x = 0, .y = 6 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -664,7 +664,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .is_menu = 0, .right = "ENTRY", .sub = 0 }, - { .x = 60, + {.x = 60, .y = 6 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -679,7 +679,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .is_menu = 0, .right = "NUM.SLV", .sub = 0 }, - { .x = 120, + {.x = 120, .y = 6 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -694,7 +694,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .is_menu = 0, .right = "TRIG", .sub = 0 }, - { .x = 180, + {.x = 180, .y = 6 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -709,7 +709,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .is_menu = 0, .right = "TIME", .sub = 0 }, - { .x = 240, + {.x = 240, .y = 6 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -725,7 +725,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .right = "\x1c", .sub = 0 }, - { .x = 0, + {.x = 0, .y = 7 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -740,7 +740,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 60, + {.x = 60, .y = 7 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -755,7 +755,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .is_menu = 0, .right = "ALG", .sub = 0 }, - { .x = 120, + {.x = 120, .y = 7 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -770,7 +770,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .is_menu = 0, .right = "STAT", .sub = 0 }, - { .x = 180, + {.x = 180, .y = 7 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -785,7 +785,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .is_menu = 0, .right = "UNITS", .sub = 0 }, - { .x = 240, + {.x = 240, .y = 7 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -801,7 +801,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .right = "\x1a", .sub = 0 }, - { .x = 0, + {.x = 0, .y = 8 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -816,7 +816,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .is_menu = 0, .right = 0, .sub = 0 }, - { .x = 60, + {.x = 60, .y = 8 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -831,7 +831,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .is_menu = 0, .right = "CMPLX", .sub = 0 }, - { .x = 120, + {.x = 120, .y = 8 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -846,7 +846,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .is_menu = 0, .right = "LIB", .sub = 0 }, - { .x = 180, + {.x = 180, .y = 8 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -861,7 +861,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .is_menu = 0, .right = "BASE", .sub = 0 }, - { .x = 240, + {.x = 240, .y = 8 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -877,7 +877,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .right = "\x1b", .sub = 0 }, - { .x = 0, + {.x = 0, .y = 9 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -892,7 +892,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .is_menu = 0, .right = "OFF", .sub = "CANCEL"}, - { .x = 60, + {.x = 60, .y = 9 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -907,7 +907,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .is_menu = 0, .right = "\x03", .sub = 0 }, - { .x = 120, + {.x = 120, .y = 9 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -922,7 +922,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .is_menu = 0, .right = "\x01", .sub = 0 }, - { .x = 180, + {.x = 180, .y = 9 * KB_LINE_HEIGHT, .w = 46, .h = 26, @@ -937,7 +937,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .is_menu = 0, .right = "\x02", .sub = 0 }, - { .x = 240, + {.x = 240, .y = 9 * KB_LINE_HEIGHT, .w = 46, .h = 26, diff --git a/src/ui4x/bitmaps_fonts.h b/src/ui4x/bitmaps_fonts.h index 0ca1b26..c8f2d2a 100644 --- a/src/ui4x/bitmaps_fonts.h +++ b/src/ui4x/bitmaps_fonts.h @@ -420,7 +420,6 @@ static unsigned char arrow_48gx_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0 #define equal_48gx_height 12 static unsigned char equal_48gx_bits[] = { 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00 }; - /************/ /* BIG FONT */ /************/ diff --git a/src/ui4x/inner.h b/src/ui4x/inner.h index 559d24f..5517e3a 100644 --- a/src/ui4x/inner.h +++ b/src/ui4x/inner.h @@ -7,26 +7,25 @@ #include "bitmaps_fonts.h" // Colors -/* 48SX 48GX 49g */ -#define UI4X_COLOR_WHITE 0 /* #ffffff #ffffff #ffffff */ -#define UI4X_COLOR_SHIFT_LEFT 1 /* #ffa600 #ffbaff #7476dd */ -#define UI4X_COLOR_SHIFT_RIGHT 2 /* #00d2ff #00ffcc #d46262 */ -#define UI4X_COLOR_BUTTON_EDGE_TOP 3 /* #6d5d5d #646464 #646464 */ -#define UI4X_COLOR_BUTTON 4 /* #5a4d4d #585858 #909b94 */ -#define UI4X_COLOR_BUTTON_EDGE_BOTTOM 5 /* #4c4141 #4a4a4a #4a4a4a */ -#define UI4X_COLOR_LCD_BG 6 /* #cadd5c #cadd5c #a8c0b0 */ -#define UI4X_COLOR_LCD_PIXEL 7 /* #000080 #000080 #000020 */ -#define UI4X_COLOR_FACEPLATE_EDGE_TOP 8 /* #6d4e4e #585858 #585858 */ -#define UI4X_COLOR_FACEPLATE 9 /* #5a4040 #4a4a4a #4a4a4a */ -#define UI4X_COLOR_FACEPLATE_EDGE_BOTTOM 10 /* #4c3636 #404040 #404040 */ -#define UI4X_COLOR_UPPER_FACEPLATE_EDGE_TOP 11 /* #9b7654 #808080 #808080 */ -#define UI4X_COLOR_UPPER_FACEPLATE 12 /* #7c5e43 #68686e #86a6b9 */ -#define UI4X_COLOR_UPPER_FACEPLATE_EDGE_BOTTOM 13 /* #644b35 #54545a #97b7ca */ -#define UI4X_COLOR_HP_LOGO 14 /* #cca96b #b0b0b8 #b0b0b8 */ -#define UI4X_COLOR_HP_LOGO_BG 15 /* #404040 #68686e #68686e */ -#define UI4X_COLOR_48GX_128K_RAM 16 /* #cab890 #f0f0f0 #f0f0f0 */ -#define UI4X_COLOR_FRAME 17 /* #000000 #000000 #000000 */ -#define UI4X_COLOR_KEYPAD_HIGHLIGHT 18 /* #3c2a2a #68686e #4f6165 */ +#define UI4X_COLOR_WHITE 0 +#define UI4X_COLOR_SHIFT_LEFT 1 +#define UI4X_COLOR_SHIFT_RIGHT 2 +#define UI4X_COLOR_BUTTON_EDGE_TOP 3 +#define UI4X_COLOR_BUTTON 4 +#define UI4X_COLOR_BUTTON_EDGE_BOTTOM 5 +#define UI4X_COLOR_LCD_BG 6 +#define UI4X_COLOR_LCD_PIXEL 7 +#define UI4X_COLOR_FACEPLATE_EDGE_TOP 8 +#define UI4X_COLOR_FACEPLATE 9 +#define UI4X_COLOR_FACEPLATE_EDGE_BOTTOM 10 +#define UI4X_COLOR_UPPER_FACEPLATE_EDGE_TOP 11 +#define UI4X_COLOR_UPPER_FACEPLATE 12 +#define UI4X_COLOR_UPPER_FACEPLATE_EDGE_BOTTOM 13 +#define UI4X_COLOR_HP_LOGO 14 +#define UI4X_COLOR_HP_LOGO_BG 15 +#define UI4X_COLOR_48GX_128K_RAM 16 +#define UI4X_COLOR_FRAME 17 +#define UI4X_COLOR_KEYPAD_HIGHLIGHT 18 #define FIRST_COLOR UI4X_COLOR_WHITE #define LAST_COLOR UI4X_COLOR_KEYPAD_HIGHLIGHT