diff --git a/src/ui4x/48gx.c b/src/ui4x/48gx.c index 02cd34e..9450bc2 100644 --- a/src/ui4x/48gx.c +++ b/src/ui4x/48gx.c @@ -184,7 +184,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = menu_label_width, .label_bitmap_h = menu_label_height, - .lb = menu_label_bitmap, + .label_bitmap = menu_label_bitmap, .letter = "A", .left = 0, .highlight = false, @@ -199,7 +199,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = menu_label_width, .label_bitmap_h = menu_label_height, - .lb = menu_label_bitmap, + .label_bitmap = menu_label_bitmap, .letter = "B", .left = 0, .highlight = false, @@ -214,7 +214,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = menu_label_width, .label_bitmap_h = menu_label_height, - .lb = menu_label_bitmap, + .label_bitmap = menu_label_bitmap, .letter = "C", .left = 0, .highlight = false, @@ -229,7 +229,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = menu_label_width, .label_bitmap_h = menu_label_height, - .lb = menu_label_bitmap, + .label_bitmap = menu_label_bitmap, .letter = "D", .left = 0, .highlight = false, @@ -244,7 +244,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = menu_label_width, .label_bitmap_h = menu_label_height, - .lb = menu_label_bitmap, + .label_bitmap = menu_label_bitmap, .letter = "E", .left = 0, .highlight = false, @@ -259,7 +259,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = menu_label_width, .label_bitmap_h = menu_label_height, - .lb = menu_label_bitmap, + .label_bitmap = menu_label_bitmap, .letter = "F", .left = 0, .highlight = false, @@ -275,7 +275,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "G", .left = "RAD", .highlight = false, @@ -290,7 +290,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "H", .left = 0, .highlight = false, @@ -305,7 +305,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "I", .left = 0, .highlight = false, @@ -320,7 +320,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "J", .left = 0, .highlight = false, @@ -335,7 +335,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = up_width, .label_bitmap_h = up_height, - .lb = up_bitmap, + .label_bitmap = up_bitmap, .letter = "K", .left = 0, .highlight = false, @@ -350,7 +350,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "L", .left = "PREV", .highlight = false, @@ -366,7 +366,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = quote_width, .label_bitmap_h = quote_height, - .lb = quote_bitmap, + .label_bitmap = quote_bitmap, .letter = "M", .left = "UP", .highlight = false, @@ -381,7 +381,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "N", .left = "DEF", .highlight = false, @@ -396,7 +396,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "O", .left = "\x06NUM", .highlight = false, @@ -411,7 +411,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = left_width, .label_bitmap_h = left_height, - .lb = left_bitmap, + .label_bitmap = left_bitmap, .letter = "P", .left = "PICTURE", .highlight = false, @@ -426,7 +426,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = down_width, .label_bitmap_h = down_height, - .lb = down_bitmap, + .label_bitmap = down_bitmap, .letter = "Q", .left = "VIEW", .highlight = false, @@ -441,7 +441,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = right_width, .label_bitmap_h = right_height, - .lb = right_bitmap, + .label_bitmap = right_bitmap, .letter = "R", .left = "SWAP", .highlight = false, @@ -457,7 +457,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "S", .left = "ASIN", .highlight = false, @@ -472,7 +472,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "T", .left = "ACOS", .highlight = false, @@ -487,7 +487,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "U", .left = "ATAN", .highlight = false, @@ -502,7 +502,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = sqrt_width, .label_bitmap_h = sqrt_height, - .lb = sqrt_bitmap, + .label_bitmap = sqrt_bitmap, .letter = "V", .left = "\x13", .highlight = false, @@ -517,7 +517,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = power_width, .label_bitmap_h = power_height, - .lb = power_bitmap, + .label_bitmap = power_bitmap, .letter = "W", .left = "\x15", .highlight = false, @@ -532,7 +532,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = inv_width, .label_bitmap_h = inv_height, - .lb = inv_bitmap, + .label_bitmap = inv_bitmap, .letter = "X", .left = "\x16", .highlight = false, @@ -548,7 +548,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 2, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "EQUATION", .highlight = false, @@ -563,7 +563,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = neg_width, .label_bitmap_h = neg_height, - .lb = neg_bitmap, + .label_bitmap = neg_bitmap, .letter = "Y", .left = "EDIT", .highlight = false, @@ -578,7 +578,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "Z", .left = "PURG", .highlight = false, @@ -593,7 +593,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "CLEAR", .highlight = false, @@ -608,7 +608,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = bs_width, .label_bitmap_h = bs_height, - .lb = bs_bitmap, + .label_bitmap = bs_bitmap, .letter = 0, .left = "DROP", .highlight = false, @@ -624,7 +624,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = alpha_width, .label_bitmap_h = alpha_height, - .lb = alpha_bitmap, + .label_bitmap = alpha_bitmap, .letter = 0, .left = "USER", .highlight = false, @@ -639,7 +639,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "SOLVE", .highlight = true, @@ -654,7 +654,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "PLOT", .highlight = true, @@ -669,7 +669,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "SYMBOLIC", .highlight = true, @@ -684,7 +684,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = div_width, .label_bitmap_h = div_height, - .lb = div_bitmap, + .label_bitmap = div_bitmap, .letter = 0, .left = "\x17 ", .highlight = false, @@ -700,7 +700,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = shl_width, .label_bitmap_h = shl_height, - .lb = shl_bitmap, + .label_bitmap = shl_bitmap, .letter = 0, .left = 0, .highlight = false, @@ -715,7 +715,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "TIME", .highlight = true, @@ -730,7 +730,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "STAT", .highlight = true, @@ -745,7 +745,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "UNITS", .highlight = true, @@ -760,7 +760,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = mul_width, .label_bitmap_h = mul_height, - .lb = mul_bitmap, + .label_bitmap = mul_bitmap, .letter = 0, .left = "\x19 ", .highlight = false, @@ -776,7 +776,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = shr_width, .label_bitmap_h = shr_height, - .lb = shr_bitmap, + .label_bitmap = shr_bitmap, .letter = 0, .left = " ", .highlight = true, @@ -791,7 +791,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "I/O", .highlight = true, @@ -806,7 +806,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "LIBRARY", .highlight = true, @@ -821,7 +821,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "EQ LIB", .highlight = true, @@ -836,7 +836,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = minus_width, .label_bitmap_h = minus_height, - .lb = minus_bitmap, + .label_bitmap = minus_bitmap, .letter = 0, .left = "\x1b ", .highlight = false, @@ -852,7 +852,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "CONT", .highlight = false, @@ -867,7 +867,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "\x04 ", .highlight = false, @@ -882,7 +882,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "\x02 ", .highlight = false, @@ -897,7 +897,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "\x05 ", .highlight = false, @@ -912,7 +912,7 @@ button_t buttons_48gx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = plus_width, .label_bitmap_h = plus_height, - .lb = plus_bitmap, + .label_bitmap = plus_bitmap, .letter = 0, .left = "\x1d ", .highlight = false, diff --git a/src/ui4x/48sx.c b/src/ui4x/48sx.c index 14f062c..60b0e52 100644 --- a/src/ui4x/48sx.c +++ b/src/ui4x/48sx.c @@ -184,7 +184,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = menu_label_width, .label_bitmap_h = menu_label_height, - .lb = menu_label_bitmap, + .label_bitmap = menu_label_bitmap, .letter = "A", .left = 0, .highlight = false, @@ -199,7 +199,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = menu_label_width, .label_bitmap_h = menu_label_height, - .lb = menu_label_bitmap, + .label_bitmap = menu_label_bitmap, .letter = "B", .left = 0, .highlight = false, @@ -214,7 +214,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = menu_label_width, .label_bitmap_h = menu_label_height, - .lb = menu_label_bitmap, + .label_bitmap = menu_label_bitmap, .letter = "C", .left = 0, .highlight = false, @@ -229,7 +229,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = menu_label_width, .label_bitmap_h = menu_label_height, - .lb = menu_label_bitmap, + .label_bitmap = menu_label_bitmap, .letter = "D", .left = 0, .highlight = false, @@ -244,7 +244,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = menu_label_width, .label_bitmap_h = menu_label_height, - .lb = menu_label_bitmap, + .label_bitmap = menu_label_bitmap, .letter = "E", .left = 0, .highlight = false, @@ -259,7 +259,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = menu_label_width, .label_bitmap_h = menu_label_height, - .lb = menu_label_bitmap, + .label_bitmap = menu_label_bitmap, .letter = "F", .left = 0, .highlight = false, @@ -275,7 +275,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "G", .left = "PRINT", .highlight = true, @@ -290,7 +290,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "H", .left = "I/O", .highlight = true, @@ -305,7 +305,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "I", .left = "MODES", .highlight = true, @@ -320,7 +320,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "J", .left = "MEMORY", .highlight = true, @@ -335,7 +335,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = up_width, .label_bitmap_h = up_height, - .lb = up_bitmap, + .label_bitmap = up_bitmap, .letter = "K", .left = "LIBRARY", .highlight = true, @@ -350,7 +350,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "L", .left = "PREV", .highlight = false, @@ -366,7 +366,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = quote_width, .label_bitmap_h = quote_height, - .lb = quote_bitmap, + .label_bitmap = quote_bitmap, .letter = "M", .left = "UP", .highlight = false, @@ -381,7 +381,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "N", .left = "DEF", .highlight = false, @@ -396,7 +396,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "O", .left = "\x80Q", .highlight = false, @@ -411,7 +411,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = left_width, .label_bitmap_h = left_height, - .lb = left_bitmap, + .label_bitmap = left_bitmap, .letter = "P", .left = "GRAPH", .highlight = false, @@ -426,7 +426,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = down_width, .label_bitmap_h = down_height, - .lb = down_bitmap, + .label_bitmap = down_bitmap, .letter = "Q", .left = "REVIEW", .highlight = false, @@ -441,7 +441,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = right_width, .label_bitmap_h = right_height, - .lb = right_bitmap, + .label_bitmap = right_bitmap, .letter = "R", .left = "SWAP", .highlight = false, @@ -457,7 +457,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "S", .left = "ASIN", .highlight = false, @@ -472,7 +472,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "T", .left = "ACOS", .highlight = false, @@ -487,7 +487,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "U", .left = "ATAN", .highlight = false, @@ -502,7 +502,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = sqrt_width, .label_bitmap_h = sqrt_height, - .lb = sqrt_bitmap, + .label_bitmap = sqrt_bitmap, .letter = "V", .left = "\x0a", .highlight = false, @@ -517,7 +517,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = power_width, .label_bitmap_h = power_height, - .lb = power_bitmap, + .label_bitmap = power_bitmap, .letter = "W", .left = "\x0c", .highlight = false, @@ -532,7 +532,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = inv_width, .label_bitmap_h = inv_height, - .lb = inv_bitmap, + .label_bitmap = inv_bitmap, .letter = "X", .left = "\x0d", .highlight = false, @@ -548,7 +548,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 2, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "EQUATION", .highlight = false, @@ -563,7 +563,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = neg_width, .label_bitmap_h = neg_height, - .lb = neg_bitmap, + .label_bitmap = neg_bitmap, .letter = "Y", .left = "EDIT", .highlight = false, @@ -578,7 +578,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "Z", .left = "2D", .highlight = false, @@ -593,7 +593,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "PURGE", .highlight = false, @@ -608,7 +608,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = bs_width, .label_bitmap_h = bs_height, - .lb = bs_bitmap, + .label_bitmap = bs_bitmap, .letter = 0, .left = "DROP", .highlight = false, @@ -624,7 +624,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = alpha_width, .label_bitmap_h = alpha_height, - .lb = alpha_bitmap, + .label_bitmap = alpha_bitmap, .letter = 0, .left = "USR", .highlight = false, @@ -639,7 +639,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "SOLVE", .highlight = true, @@ -654,7 +654,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "PLOT", .highlight = true, @@ -669,7 +669,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "ALGEBRA", .highlight = true, @@ -684,7 +684,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = div_width, .label_bitmap_h = div_height, - .lb = div_bitmap, + .label_bitmap = div_bitmap, .letter = 0, .left = "( )", .highlight = false, @@ -700,7 +700,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = shl_width, .label_bitmap_h = shl_height, - .lb = shl_bitmap, + .label_bitmap = shl_bitmap, .letter = 0, .left = 0, .highlight = false, @@ -715,7 +715,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "TIME", .highlight = true, @@ -730,7 +730,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "STAT", .highlight = true, @@ -745,7 +745,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "UNITS", .highlight = true, @@ -760,7 +760,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = mul_width, .label_bitmap_h = mul_height, - .lb = mul_bitmap, + .label_bitmap = mul_bitmap, .letter = 0, .left = "[ ]", .highlight = false, @@ -776,7 +776,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = shr_width, .label_bitmap_h = shr_height, - .lb = shr_bitmap, + .label_bitmap = shr_bitmap, .letter = 0, .left = 0, .highlight = false, @@ -791,7 +791,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "RAD", .highlight = false, @@ -806,7 +806,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "STACK", .highlight = false, @@ -821,7 +821,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "CMD", .highlight = false, @@ -836,7 +836,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = minus_width, .label_bitmap_h = minus_height, - .lb = minus_bitmap, + .label_bitmap = minus_bitmap, .letter = 0, .left = "\x0e", .highlight = false, @@ -852,7 +852,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "CONT", .highlight = false, @@ -867,7 +867,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "= ", .highlight = false, @@ -882,7 +882,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = ",", .highlight = false, @@ -897,7 +897,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "\x11 ", .highlight = false, @@ -912,7 +912,7 @@ button_t buttons_48sx[ NB_HP48_KEYS ] = { .font_size = 0, .label_bitmap_w = plus_width, .label_bitmap_h = plus_height, - .lb = plus_bitmap, + .label_bitmap = plus_bitmap, .letter = 0, .left = "{ }", .highlight = false, diff --git a/src/ui4x/49g.c b/src/ui4x/49g.c index fa573d2..c84dce8 100644 --- a/src/ui4x/49g.c +++ b/src/ui4x/49g.c @@ -186,7 +186,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "A", .left = "Y=", .highlight = false, @@ -201,7 +201,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "B", .left = "WIN", .highlight = false, @@ -216,7 +216,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "C", .left = "GRAPH", .highlight = false, @@ -231,7 +231,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "D", .left = "2D/3D", .highlight = false, @@ -246,7 +246,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "E", .left = "TBLSET", .highlight = false, @@ -261,7 +261,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "F", .left = "TABLE", .highlight = false, @@ -277,7 +277,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "G", .left = "FILES", .highlight = false, @@ -292,7 +292,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "H", .left = "CUSTOM", .highlight = false, @@ -307,7 +307,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "I", .left = "i", .highlight = false, @@ -323,7 +323,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "J", .left = "UPDIR", .highlight = false, @@ -338,7 +338,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "K", .left = "RCL", .highlight = false, @@ -353,7 +353,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "L", .left = "PREV", .highlight = false, @@ -369,7 +369,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = left_width, .label_bitmap_h = left_height, - .lb = left_bitmap, + .label_bitmap = left_bitmap, .letter = 0, .left = 0, .highlight = false, @@ -384,7 +384,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = up_width, .label_bitmap_h = up_height, - .lb = up_bitmap, + .label_bitmap = up_bitmap, .letter = 0, .left = 0, .highlight = false, @@ -399,7 +399,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = right_width, .label_bitmap_h = right_height, - .lb = right_bitmap, + .label_bitmap = right_bitmap, .letter = 0, .left = 0, .highlight = false, @@ -414,7 +414,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = down_width, .label_bitmap_h = down_height, - .lb = down_bitmap, + .label_bitmap = down_bitmap, .letter = 0, .left = 0, .highlight = false, @@ -430,7 +430,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "M", .left = "CMD", .highlight = false, @@ -445,7 +445,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "N", .left = "PRG", .highlight = false, @@ -460,7 +460,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "O", .left = "MTRW", .highlight = false, @@ -475,7 +475,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "P", .left = "MTH", .highlight = false, @@ -490,7 +490,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = bs_width, .label_bitmap_h = bs_height, - .lb = bs_bitmap, + .label_bitmap = bs_bitmap, .letter = 0, .left = "DEL", .highlight = false, @@ -506,7 +506,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = power_width, .label_bitmap_h = power_height, - .lb = power_bitmap, + .label_bitmap = power_bitmap, .letter = "Q", .left = "\x16", .highlight = false, @@ -521,7 +521,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = sqrt_width, .label_bitmap_h = sqrt_height, - .lb = sqrt_bitmap, + .label_bitmap = sqrt_bitmap, .letter = "R", .left = "\x13", .highlight = false, @@ -536,7 +536,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "S", .left = "ASIN", .highlight = false, @@ -551,7 +551,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 2, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "T", .left = "ACOS", .highlight = false, @@ -566,7 +566,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "U", .left = "ATAN", .highlight = false, @@ -582,7 +582,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "V", .left = "\x15", .highlight = false, @@ -597,7 +597,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = neg_width, .label_bitmap_h = neg_height, - .lb = neg_bitmap, + .label_bitmap = neg_bitmap, .letter = "W", .left = "/=", .highlight = false, @@ -612,7 +612,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = "X", .left = "<=", .highlight = false, @@ -627,7 +627,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = inv_width, .label_bitmap_h = inv_height, - .lb = inv_bitmap, + .label_bitmap = inv_bitmap, .letter = "Y", .left = ">=", .highlight = false, @@ -642,7 +642,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = div_width, .label_bitmap_h = div_height, - .lb = div_bitmap, + .label_bitmap = div_bitmap, .letter = "Z", .left = "ABS ", .highlight = false, @@ -658,7 +658,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = alpha_width, .label_bitmap_h = alpha_height, - .lb = alpha_bitmap, + .label_bitmap = alpha_bitmap, .letter = 0, .left = "USER", .highlight = false, @@ -673,7 +673,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "S.SLV", .highlight = false, @@ -688,7 +688,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "EXP&LN", .highlight = false, @@ -703,7 +703,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "FINANCE", .highlight = false, @@ -718,7 +718,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = mul_width, .label_bitmap_h = mul_height, - .lb = mul_bitmap, + .label_bitmap = mul_bitmap, .letter = 0, .left = "\x19 ", .highlight = false, @@ -734,7 +734,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = shl_width, .label_bitmap_h = shl_height, - .lb = shl_bitmap, + .label_bitmap = shl_bitmap, .letter = 0, .left = 0, .highlight = false, @@ -749,7 +749,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "CALC", .highlight = false, @@ -764,7 +764,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "MATRICES", .highlight = false, @@ -779,7 +779,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "CONVERT", .highlight = false, @@ -794,7 +794,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = minus_width, .label_bitmap_h = minus_height, - .lb = minus_bitmap, + .label_bitmap = minus_bitmap, .letter = 0, .left = "\x17 ", .highlight = false, @@ -810,7 +810,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = shr_width, .label_bitmap_h = shr_height, - .lb = shr_bitmap, + .label_bitmap = shr_bitmap, .letter = 0, .left = " ", .highlight = false, @@ -825,7 +825,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "ARITH", .highlight = false, @@ -840,7 +840,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "DEF", .highlight = false, @@ -855,7 +855,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "\x02", .highlight = false, @@ -870,7 +870,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = plus_width, .label_bitmap_h = plus_height, - .lb = plus_bitmap, + .label_bitmap = plus_bitmap, .letter = 0, .left = "\x1d ", .highlight = false, @@ -886,7 +886,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "CONT", .highlight = false, @@ -901,7 +901,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "INF ", .highlight = false, @@ -916,7 +916,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 1, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = ":: ", .highlight = false, @@ -931,7 +931,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "\x05 ", .highlight = false, @@ -946,7 +946,7 @@ button_t buttons_49g[ NB_HP49_KEYS ] = { .font_size = 0, .label_bitmap_w = 0, .label_bitmap_h = 0, - .lb = 0, + .label_bitmap = 0, .letter = 0, .left = "ANS ", .highlight = false, diff --git a/src/ui4x/inner.h b/src/ui4x/inner.h index c23267f..2679ba9 100644 --- a/src/ui4x/inner.h +++ b/src/ui4x/inner.h @@ -55,7 +55,7 @@ typedef struct button_t { int label_color; const char* label_text; unsigned int label_bitmap_w, label_bitmap_h; - unsigned char* lb; + unsigned char* label_bitmap; /* label around the button */ const char* letter; diff --git a/src/ui4x/sdl2.c b/src/ui4x/sdl2.c index d1e3f6b..581b210 100644 --- a/src/ui4x/sdl2.c +++ b/src/ui4x/sdl2.c @@ -572,14 +572,14 @@ static SDL_Texture* create_button_texture( int hpkey, bool is_up ) y -= 1; write_with_big_font( x, y, BUTTONS[ hpkey ].label_text, BUTTONS[ hpkey ].label_color, UI4X_COLOR_BUTTON ); - } else if ( BUTTONS[ hpkey ].lb != ( unsigned char* )0 ) { + } else if ( BUTTONS[ hpkey ].label_bitmap != ( unsigned char* )0 ) { /* Button has a texture */ x = ( 1 + BUTTONS[ hpkey ].w - BUTTONS[ hpkey ].label_bitmap_w ) / 2; y = ( 1 + BUTTONS[ hpkey ].h - BUTTONS[ hpkey ].label_bitmap_h ) / 2; if ( is_up ) y += 1; - __draw_bitmap( x, y, BUTTONS[ hpkey ].label_bitmap_w, BUTTONS[ hpkey ].label_bitmap_h, BUTTONS[ hpkey ].lb, + __draw_bitmap( x, y, BUTTONS[ hpkey ].label_bitmap_w, BUTTONS[ hpkey ].label_bitmap_h, BUTTONS[ hpkey ].label_bitmap, BUTTONS[ hpkey ].label_color, UI4X_COLOR_BUTTON ); }