Added various missing labels to newrpl keyboard.

This commit is contained in:
claudiol 2018-10-10 10:24:16 -04:00
parent 63d87ff330
commit 9dd9ebc4dd

77
ui.c
View file

@ -446,31 +446,31 @@ static const x49gp_ui_key_t x49gp_newrpl_ui_keys[] =
99, 92, 36, 28, 7, 2, (1 << 7), (1 << 2), 2
},
{
NULL, NULL, NULL, NULL, NULL,
UI_COLOR_SILVER, 0.0, 0,
"", "", "UPDIR", NULL, NULL,
UI_COLOR_SILVER, 10.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_ROUND, 0.0, 0,
200, 38, 33, 33, 6, 1, (1 << 6), (1 << 1), 1
},
{
NULL, NULL, NULL, NULL, NULL,
UI_COLOR_SILVER, 0.0, 0,
"", "", "BEG COPY", NULL, NULL,
UI_COLOR_SILVER, 10.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_ROUND, 0.0, 0,
164, 66, 33, 33, 6, 2, (1 << 6), (1 << 2), 2
},
{
NULL, NULL, NULL, NULL, NULL,
UI_COLOR_SILVER, 0.0, 0,
"", "", "CUT", NULL, NULL,
UI_COLOR_SILVER, 10.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_ROUND, 0.0, 0,
200, 94, 33, 33, 6, 3, (1 << 6), (1 << 3), 3
},
{
NULL, NULL, NULL, NULL, NULL,
UI_COLOR_SILVER, 0.0, 0,
"", "", "END PASTE", NULL, NULL,
UI_COLOR_SILVER, 10.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_ROUND, 0.0, 0,
236, 66, 33, 33, 6, 4, (1 << 6), (1 << 4), 4
},
{
"S\\kern-1 T\\kern-1 O\\kern-1\\triangleright", "M", "RCL", NULL, NULL,
"S\\kern-1 T\\kern-1 O\\kern-1\\triangleright", "M", "RCL", "PREV.M", NULL,
UI_COLOR_WHITE, 12.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_NORMAL, 12.0, UI_LAYOUT_LEFT,
0, 141, 46, 28, 4, 1, (1 << 4), (1 << 1), 1
@ -488,7 +488,7 @@ static const x49gp_ui_key_t x49gp_newrpl_ui_keys[] =
119, 141, 46, 28, 2, 1, (1 << 2), (1 << 1), 1
},
{
"M\\kern-1 A\\kern-1 I\\kern-1 N", "P", NULL, NULL, NULL,
"M\\kern-1 E\\kern-1 N\\kern-1 U", "P", NULL, NULL, NULL,
UI_COLOR_WHITE, 12.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_NORMAL, 12.0, UI_LAYOUT_LEFT,
179, 141, 46, 28, 1, 1, (1 << 1), (1 << 1), 1
@ -566,19 +566,19 @@ static const x49gp_ui_key_t x49gp_newrpl_ui_keys[] =
179, 225, 46, 28, 1, 3, (1 << 1), (1 << 3), 3
},
{
"\\divide", "Z", NULL, NULL, NULL,
"\\divide", "Z", "ABS", "ARG", NULL,
UI_COLOR_WHITE, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_NORMAL, 12.0, UI_LAYOUT_LEFT_NO_SPACE,
238, 225, 46, 28, 0, 3, (1 << 0), (1 << 3), 3
},
{
"ALPHA", NULL, NULL, NULL, NULL,
"ALPHA", "", "", "ENTRY", NULL,
UI_COLOR_BLACK, 12.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_LARGE, 0.0, 0,
0, 267, 46, 32, 0, 0, 0, 0, 4
},
{
"7", NULL, NULL, NULL, NULL,
"7", "", "", "NUM.SLV", NULL,
UI_COLOR_WHITE, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_LARGE, 0.0, 0,
59, 267, 46, 32, 3, 4, (1 << 3), (1 << 4), 4
@ -590,7 +590,7 @@ static const x49gp_ui_key_t x49gp_newrpl_ui_keys[] =
119, 267, 46, 32, 2, 4, (1 << 2), (1 << 4), 4
},
{
"9", NULL, NULL, NULL, NULL,
"9", "", "", "TIME", NULL,
UI_COLOR_WHITE, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_LARGE, 0.0, 0,
179, 267, 46, 32, 1, 4, (1 << 1), (1 << 4), 4
@ -603,7 +603,7 @@ static const x49gp_ui_key_t x49gp_newrpl_ui_keys[] =
},
{
"\\uparrowleft", NULL, NULL, NULL, NULL,
UI_COLOR_WHITE, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_COLOR_BLACK, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_LARGE, 0.0, 0,
0, 313, 46, 32, 0, 0, 0, 0, 5
},
@ -620,7 +620,7 @@ static const x49gp_ui_key_t x49gp_newrpl_ui_keys[] =
119, 313, 46, 32, 2, 5, (1 << 2), (1 << 5), 5
},
{
"6", NULL, NULL, "UNITS", NULL,
"6", NULL, "CONVERT", "UNITS", NULL,
UI_COLOR_WHITE, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_LARGE, 0.0, 0,
179, 313, 46, 32, 1, 5, (1 << 1), (1 << 5), 5
@ -633,24 +633,24 @@ static const x49gp_ui_key_t x49gp_newrpl_ui_keys[] =
},
{
"\\uparrowright", NULL, NULL, NULL, NULL,
UI_COLOR_WHITE, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_COLOR_BLACK, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_LARGE, 0.0, 0,
0, 359, 46, 32, 0, 0, 0, 0, 6
},
{
"1", NULL, NULL, NULL, NULL,
"1", "", "ARITH", "CMPLX", NULL,
UI_COLOR_WHITE, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_LARGE, 0.0, 0,
59, 359, 46, 32, 3, 6, (1 << 3), (1 << 6), 6
},
{
"2", NULL, NULL, NULL, NULL,
"2", "", "", "LIB", NULL,
UI_COLOR_WHITE, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_LARGE, 0.0, 0,
119, 359, 46, 32, 2, 6, (1 << 2), (1 << 6), 6
},
{
"3", NULL, "\\math_numbersign", NULL, NULL,
"3", NULL, "\\math_numbersign", "BASE", NULL,
UI_COLOR_WHITE, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_LARGE, 0.0, 0,
179, 359, 46, 32, 1, 6, (1 << 1), (1 << 6), 6
@ -704,6 +704,7 @@ static const x49gp_ui_key_t x49gp_newrpl_ui_keys[] =
238, 405, 46, 32, 0, 7, (1 << 0), (1 << 7), 7
},
};
#define X49GP_NEWRPL_UI_NR_KEYS (sizeof(x49gp_newrpl_ui_keys) / sizeof(x49gp_newrpl_ui_keys[0]))
static const x49gp_ui_key_t x50g_ui_keys[] =
@ -1116,31 +1117,31 @@ static const x49gp_ui_key_t x50g_newrpl_ui_keys[] =
99, 92, 36, 28, 7, 2, (1 << 7), (1 << 2), 2
},
{
NULL, NULL, NULL, NULL, NULL,
UI_COLOR_SILVER, 0.0, 0,
"", "", "UPDIR", NULL, NULL,
UI_COLOR_SILVER, 10.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_ROUND, 0.0, 0,
200, 38, 33, 33, 6, 1, (1 << 6), (1 << 1), 1
},
{
NULL, NULL, NULL, NULL, NULL,
UI_COLOR_SILVER, 0.0, 0,
"", "", "BEG COPY", NULL, NULL,
UI_COLOR_SILVER, 10.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_ROUND, 0.0, 0,
164, 66, 33, 33, 6, 2, (1 << 6), (1 << 2), 2
},
{
NULL, NULL, NULL, NULL, NULL,
UI_COLOR_SILVER, 0.0, 0,
"", "", "CUT", NULL, NULL,
UI_COLOR_SILVER, 10.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_ROUND, 0.0, 0,
200, 94, 33, 33, 6, 3, (1 << 6), (1 << 3), 3
},
{
NULL, NULL, NULL, NULL, NULL,
UI_COLOR_SILVER, 0.0, 0,
"", "", "END PASTE", NULL, NULL,
UI_COLOR_SILVER, 10.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_ROUND, 0.0, 0,
236, 66, 33, 33, 6, 4, (1 << 6), (1 << 4), 4
},
{
"S\\kern-1 T\\kern-1 O\\kern-1\\triangleright", "M", "RCL", NULL, NULL,
"S\\kern-1 T\\kern-1 O\\kern-1\\triangleright", "M", "RCL", "PREV.M", NULL,
UI_COLOR_WHITE, 12.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_NORMAL, 12.0, UI_LAYOUT_LEFT,
0, 141, 46, 28, 4, 1, (1 << 4), (1 << 1), 1
@ -1158,7 +1159,7 @@ static const x49gp_ui_key_t x50g_newrpl_ui_keys[] =
119, 141, 46, 28, 2, 1, (1 << 2), (1 << 1), 1
},
{
"M\\kern-1 A\\kern-1 I\\kern-1 N", "P", NULL, NULL, NULL,
"M\\kern-1 E\\kern-1 N\\kern-1 U", "P", NULL, NULL, NULL,
UI_COLOR_WHITE, 12.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_NORMAL, 12.0, UI_LAYOUT_LEFT,
179, 141, 46, 28, 1, 1, (1 << 1), (1 << 1), 1
@ -1236,19 +1237,19 @@ static const x49gp_ui_key_t x50g_newrpl_ui_keys[] =
179, 225, 46, 28, 1, 3, (1 << 1), (1 << 3), 3
},
{
"\\divide", "Z", NULL, NULL, NULL,
"\\divide", "Z", "ABS", "ARG", NULL,
UI_COLOR_WHITE, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_NORMAL, 12.0, UI_LAYOUT_LEFT_NO_SPACE,
238, 225, 46, 28, 0, 3, (1 << 0), (1 << 3), 3
},
{
"ALPHA", NULL, NULL, NULL, NULL,
"ALPHA", "", "", "ENTRY", NULL,
UI_COLOR_BLACK, 12.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_LARGE, 0.0, 0,
0, 267, 46, 32, 0, 0, 0, 0, 4
},
{
"7", NULL, NULL, NULL, NULL,
"7", "", "", "NUM.SLV", NULL,
UI_COLOR_WHITE, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_LARGE, 0.0, 0,
59, 267, 46, 32, 3, 4, (1 << 3), (1 << 4), 4
@ -1260,7 +1261,7 @@ static const x49gp_ui_key_t x50g_newrpl_ui_keys[] =
119, 267, 46, 32, 2, 4, (1 << 2), (1 << 4), 4
},
{
"9", NULL, NULL, NULL, NULL,
"9", "", "", "TIME", NULL,
UI_COLOR_WHITE, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_LARGE, 0.0, 0,
179, 267, 46, 32, 1, 4, (1 << 1), (1 << 4), 4
@ -1290,7 +1291,7 @@ static const x49gp_ui_key_t x50g_newrpl_ui_keys[] =
119, 313, 46, 32, 2, 5, (1 << 2), (1 << 5), 5
},
{
"6", NULL, NULL, "UNITS", NULL,
"6", NULL, "CONVERT", "UNITS", NULL,
UI_COLOR_WHITE, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_LARGE, 0.0, 0,
179, 313, 46, 32, 1, 5, (1 << 1), (1 << 5), 5
@ -1308,19 +1309,19 @@ static const x49gp_ui_key_t x50g_newrpl_ui_keys[] =
0, 359, 46, 32, 0, 0, 0, 0, 6
},
{
"1", NULL, NULL, NULL, NULL,
"1", "", "ARITH", "CMPLX", NULL,
UI_COLOR_WHITE, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_LARGE, 0.0, 0,
59, 359, 46, 32, 3, 6, (1 << 3), (1 << 6), 6
},
{
"2", NULL, NULL, NULL, NULL,
"2", "", "", "LIB", NULL,
UI_COLOR_WHITE, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_LARGE, 0.0, 0,
119, 359, 46, 32, 2, 6, (1 << 2), (1 << 6), 6
},
{
"3", NULL, "\\math_numbersign", NULL, NULL,
"3", NULL, "\\math_numbersign", "BASE", NULL,
UI_COLOR_WHITE, 19.0, CAIRO_FONT_WEIGHT_BOLD,
UI_SHAPE_BUTTON_LARGE, 0.0, 0,
179, 359, 46, 32, 1, 6, (1 << 1), (1 << 6), 6