gwh/x50ng
1
0
Fork 0
forked from Miroirs/x49gp
Code Pull requests Activity

add symbols for arrow keys

Browse source
This commit is contained in:
Gwenhael Le Moine 2024-10-31 15:52:40 +01:00
parent 8901b1ea87
commit f04a835918
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
2 changed files with 128 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/x49gpng/symbol.c
View file

@ -12,23 +12,19 @@
static const cairo_path_data_t symbol_square_path_data[] = { SYMBOL_MOVE_TO( 0.100, 0.100 ), SYMBOL_LINE_TO( 0.500, 0.000 ),
SYMBOL_LINE_TO( 0.000, 0.500 ), SYMBOL_LINE_TO( -0.500, 0.000 ),
SYMBOL_CLOSE_PATH() };
SYMBOL( square, 0.7, 0.0, 0.1, 0.1, 0.6, 0.6 );
static const cairo_path_data_t symbol_triangleup_path_data[] = { SYMBOL_MOVE_TO( 0.100, 0.000 ), SYMBOL_LINE_TO( 0.800, 0.000 ),
SYMBOL_LINE_TO( -0.400, 0.693 ), SYMBOL_CLOSE_PATH() };
SYMBOL( triangleup, 1.0, 0.0, 0.1, 0.0, 0.9, 0.693 );
static const cairo_path_data_t symbol_triangleright_path_data[] = { SYMBOL_MOVE_TO( 0.100, 0.000 ), SYMBOL_LINE_TO( 0.000, 0.800 ),
SYMBOL_LINE_TO( 0.693, -0.400 ), SYMBOL_CLOSE_PATH() };
SYMBOL( triangleright, 0.893, 0.0, 0.1, 0.0, 0.793, 0.8 );
static const cairo_path_data_t symbol_arrowleftdblfull_path_data[] = {
SYMBOL_MOVE_TO( 0.100, 0.370 ), SYMBOL_LINE_TO( 0.652, 0.500 ), SYMBOL_LINE_TO( 0.000, -0.250 ), SYMBOL_LINE_TO( 1.000, 0.000 ),
SYMBOL_LINE_TO( 0.000, -0.500 ), SYMBOL_LINE_TO( -1.000, 0.000 ), SYMBOL_LINE_TO( 0.000, -0.250 ), SYMBOL_CLOSE_PATH() };
SYMBOL( arrowleftdblfull, 1.852, 0.0, 0.1, -0.13, 1.752, 0.87 );
static const cairo_path_data_t symbol_uparrowleft_path_data[] = { SYMBOL_MOVE_TO( 0.100, 0.500 ), SYMBOL_LINE_TO( 0.600, 0.200 ),
@ -36,7 +32,6 @@ static const cairo_path_data_t symbol_uparrowleft_path_data[] = { SYMBOL_MOVE_TO
SYMBOL_LINE_TO( 0.000, -0.550 ), SYMBOL_LINE_TO( -0.100, 0.000 ),
SYMBOL_LINE_TO( 0.000, 0.450 ), SYMBOL_LINE_TO( -0.400, 0.000 ),
SYMBOL_LINE_TO( 0.000, -0.150 ), SYMBOL_CLOSE_PATH() };
SYMBOL( uparrowleft, 1.3, 0.0, 0.1, 0.0, 1.2, 0.7 );
static const cairo_path_data_t symbol_uparrowright_path_data[] = { SYMBOL_MOVE_TO( 1.200, 0.500 ), SYMBOL_LINE_TO( -0.600, 0.200 ),
@ -44,13 +39,11 @@ static const cairo_path_data_t symbol_uparrowright_path_data[] = { SYMBOL_MOVE_T
SYMBOL_LINE_TO( 0.000, -0.550 ), SYMBOL_LINE_TO( 0.100, 0.000 ),
SYMBOL_LINE_TO( 0.000, 0.450 ), SYMBOL_LINE_TO( 0.400, 0.000 ),
SYMBOL_LINE_TO( 0.000, -0.150 ), SYMBOL_CLOSE_PATH() };
SYMBOL( uparrowright, 1.3, 0.0, 0.1, 0.0, 1.2, 0.7 );
static const cairo_path_data_t symbol_tick_path_data[] = { SYMBOL_MOVE_TO( 0.100, 0.400 ), SYMBOL_LINE_TO( 0.000, 0.450 ),
SYMBOL_LINE_TO( 0.150, 0.000 ), SYMBOL_LINE_TO( 0.000, -0.450 ),
SYMBOL_CLOSE_PATH() };
SYMBOL( tick, 0.35, 0.0, 0.1, 0.4, 0.25, 0.85 );
static const cairo_path_data_t symbol_radical_path_data[] = { SYMBOL_MOVE_TO( 0.000, 0.500 ), SYMBOL_LINE_TO( 0.214, 0.100 ),
@ -58,19 +51,16 @@ static const cairo_path_data_t symbol_radical_path_data[] = { SYMBOL_MOVE_TO( 0.
SYMBOL_LINE_TO( 0.077, 0.000 ), SYMBOL_LINE_TO( 0.000, -0.100 ),
SYMBOL_LINE_TO( -0.281, -1.050 ), SYMBOL_LINE_TO( -0.287, 0.616 ),
SYMBOL_LINE_TO( -0.123, -0.057 ), SYMBOL_CLOSE_PATH() };
SYMBOL( radical, 0.733, 0.0, 0.0, -0.15, 0.733, 1.0 );
static const cairo_path_data_t symbol_overscore_path_data[] = { SYMBOL_MOVE_TO( 0.000, 1.000 ), SYMBOL_LINE_TO( 0.900, 0.000 ),
SYMBOL_LINE_TO( 0.000, -0.100 ), SYMBOL_LINE_TO( -0.900, 0.000 ),
SYMBOL_CLOSE_PATH() };
SYMBOL( overscore, 0.8, 0.0, 0.0, 0.9, 0.9, 1.0 );
static const cairo_path_data_t symbol_minus_path_data[] = { SYMBOL_MOVE_TO( 0.050, 0.312 ), SYMBOL_LINE_TO( 0.000, 0.118 ),
SYMBOL_LINE_TO( 0.500, 0.000 ), SYMBOL_LINE_TO( 0.000, -0.118 ),
SYMBOL_CLOSE_PATH() };
SYMBOL( minus, 0.6, 0.0, 0.05, 0.312, 0.55, 0.430 );
static const cairo_path_data_t symbol_divide_path_data[] = { SYMBOL_MOVE_TO( 0.050, 0.312 ),
@ -88,15 +78,31 @@ static const cairo_path_data_t symbol_divide_path_data[] = { SYMBOL_MOVE_TO( 0.0
SYMBOL_LINE_TO( 0.135, 0.000 ),
SYMBOL_LINE_TO( 0.000, -0.135 ),
SYMBOL_CLOSE_PATH() };
SYMBOL( divide, 0.6, 0.0, 0.05, 0.069, 0.55, 0.673 );
static const cairo_path_data_t symbol_divisionslash_path_data[] = { SYMBOL_MOVE_TO( 0.050, 0.000 ), SYMBOL_LINE_TO( 0.345, 0.739 ),
SYMBOL_LINE_TO( 0.130, 0.000 ), SYMBOL_LINE_TO( -0.345, -0.739 ),
SYMBOL_CLOSE_PATH() };
SYMBOL( divisionslash, 0.575, 0.000, 0.050, 0.000, 0.525, 0.739 );
static const cairo_path_data_t symbol_arrowup_path_data[] = { SYMBOL_MOVE_TO( 0.000, 0.000 ), SYMBOL_LINE_TO( 1.000, 0.000 ),
SYMBOL_LINE_TO( -0.500, 1.000 ), SYMBOL_CLOSE_PATH() };
SYMBOL( arrowup, 1.0, 0.0, 0.1, 0.0, 0.9, 0.693 );
static const cairo_path_data_t symbol_arrowdown_path_data[] = { SYMBOL_MOVE_TO( 0.000, 1.000 ), SYMBOL_LINE_TO( 1.000, 0.000 ),
SYMBOL_LINE_TO( -0.500, -1.000 ), SYMBOL_CLOSE_PATH() };
SYMBOL( arrowdown, 1.0, 0.0, 0.1, 0.0, 0.9, 0.693 );
static const cairo_path_data_t symbol_arrowleft_path_data[] = { SYMBOL_MOVE_TO( 1.000, 0.000 ), SYMBOL_LINE_TO( 0.000, 1.000 ),
SYMBOL_LINE_TO( -1.000, -0.500 ), SYMBOL_CLOSE_PATH() };
SYMBOL( arrowleft, 1.0, 0.0, 0.1, 0.0, 0.9, 0.693 );
static const cairo_path_data_t symbol_arrowright_path_data[] = { SYMBOL_MOVE_TO( 0.000, 0.000 ), SYMBOL_LINE_TO( 0.000, 1.000 ),
SYMBOL_LINE_TO( 1.000, -0.500 ), SYMBOL_CLOSE_PATH() };
SYMBOL( arrowright, 1.0, 0.0, 0.1, 0.0, 0.9, 0.693 );
CONTROL( beginsuperscript, 0.0, 0.5, 1.0, 0.8 );
CONTROL( endsuperscript, 0.0, 0.5, 1.25, 1.0 );
@ -140,6 +146,11 @@ static const symbol_name_t symbol_names[] = {
{"kern-7", &symbol_kern_m7 },
{"kern-8", &symbol_kern_m8 },
{"kern-9", &symbol_kern_m9 },
{"arrowup", &symbol_arrowup },
{"arrowdown", &symbol_arrowdown },
{"arrowleft", &symbol_arrowleft },
{"arrowright", &symbol_arrowright },
{NULL, NULL }
};
#define NR_SYMBOLS ( sizeof( symbol_names ) / sizeof( symbol_names[ 0 ] ) - 1 )

126
src/x49gpng/ui.c
View file

@ -286,14 +286,14 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
.rowbit = ( 1 << 2 ),
.eint = 2,
.bg_color = UI_COLOR_BLACK },
{.label = NULL,
{.label = "\\arrowup",
.letter = NULL,
.left = NULL,
.right = NULL,
.below = NULL,
.color = UI_COLOR_BLACK,
.font_size = 0.0,
.font_weight = 0,
.font_size = 10.0,
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
.shape = UI_SHAPE_BUTTON_ROUND,
.letter_size = 0.0,
.layout = 0,
@ -306,15 +306,15 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
.columnbit = ( 1 << 6 ),
.rowbit = ( 1 << 1 ),
.eint = 1,
.bg_color = UI_COLOR_SILVER },
{.label = NULL,
.bg_color = UI_COLOR_GRAYSCALE_5 },
{.label = "\\arrowleft",
.letter = NULL,
.left = NULL,
.right = NULL,
.below = NULL,
.color = UI_COLOR_BLACK,
.font_size = 0.0,
.font_weight = 0,
.font_size = 10.0,
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
.shape = UI_SHAPE_BUTTON_ROUND,
.letter_size = 0.0,
.layout = 0,
@ -327,15 +327,15 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
.columnbit = ( 1 << 6 ),
.rowbit = ( 1 << 2 ),
.eint = 2,
.bg_color = UI_COLOR_SILVER },
{.label = NULL,
.bg_color = UI_COLOR_GRAYSCALE_5 },
{.label = "\\arrowdown",
.letter = NULL,
.left = NULL,
.right = NULL,
.below = NULL,
.color = UI_COLOR_BLACK,
.font_size = 0.0,
.font_weight = 0,
.font_size = 10.0,
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
.shape = UI_SHAPE_BUTTON_ROUND,
.letter_size = 0.0,
.layout = 0,
@ -348,15 +348,15 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
.columnbit = ( 1 << 6 ),
.rowbit = ( 1 << 3 ),
.eint = 3,
.bg_color = UI_COLOR_SILVER },
{.label = NULL,
.bg_color = UI_COLOR_GRAYSCALE_5 },
{.label = "\\arrowright",
.letter = NULL,
.left = NULL,
.right = NULL,
.below = NULL,
.color = UI_COLOR_BLACK,
.font_size = 0.0,
.font_weight = 0,
.font_size = 10.0,
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
.shape = UI_SHAPE_BUTTON_ROUND,
.letter_size = 0.0,
.layout = 0,
@ -369,7 +369,91 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
.columnbit = ( 1 << 6 ),
.rowbit = ( 1 << 4 ),
.eint = 4,
.bg_color = UI_COLOR_SILVER },
.bg_color = UI_COLOR_GRAYSCALE_5 },
/* {.label = NULL, */
/* .letter = NULL, */
/* .left = NULL, */
/* .right = NULL, */
/* .below = NULL, */
/* .color = UI_COLOR_BLACK, */
/* .font_size = 0.0, */
/* .font_weight = 0, */
/* .shape = UI_SHAPE_BUTTON_ROUND, */
/* .letter_size = 0.0, */
/* .layout = 0, */
/* .x = 200, */
/* .y = 38, */
/* .width = 33, */
/* .height = 33, */
/* .column = 6, */
/* .row = 1, */
/* .columnbit = ( 1 << 6 ), */
/* .rowbit = ( 1 << 1 ), */
/* .eint = 1, */
/* .bg_color = UI_COLOR_SILVER }, */
/* {.label = NULL, */
/* .letter = NULL, */
/* .left = NULL, */
/* .right = NULL, */
/* .below = NULL, */
/* .color = UI_COLOR_BLACK, */
/* .font_size = 0.0, */
/* .font_weight = 0, */
/* .shape = UI_SHAPE_BUTTON_ROUND, */
/* .letter_size = 0.0, */
/* .layout = 0, */
/* .x = 164, */
/* .y = 66, */
/* .width = 33, */
/* .height = 33, */
/* .column = 6, */
/* .row = 2, */
/* .columnbit = ( 1 << 6 ), */
/* .rowbit = ( 1 << 2 ), */
/* .eint = 2, */
/* .bg_color = UI_COLOR_SILVER }, */
/* {.label = NULL, */
/* .letter = NULL, */
/* .left = NULL, */
/* .right = NULL, */
/* .below = NULL, */
/* .color = UI_COLOR_BLACK, */
/* .font_size = 0.0, */
/* .font_weight = 0, */
/* .shape = UI_SHAPE_BUTTON_ROUND, */
/* .letter_size = 0.0, */
/* .layout = 0, */
/* .x = 200, */
/* .y = 94, */
/* .width = 33, */
/* .height = 33, */
/* .column = 6, */
/* .row = 3, */
/* .columnbit = ( 1 << 6 ), */
/* .rowbit = ( 1 << 3 ), */
/* .eint = 3, */
/* .bg_color = UI_COLOR_SILVER }, */
/* {.label = NULL, */
/* .letter = NULL, */
/* .left = NULL, */
/* .right = NULL, */
/* .below = NULL, */
/* .color = UI_COLOR_BLACK, */
/* .font_size = 0.0, */
/* .font_weight = 0, */
/* .shape = UI_SHAPE_BUTTON_ROUND, */
/* .letter_size = 0.0, */
/* .layout = 0, */
/* .x = 236, */
/* .y = 66, */
/* .width = 33, */
/* .height = 33, */
/* .column = 6, */
/* .row = 4, */
/* .columnbit = ( 1 << 6 ), */
/* .rowbit = ( 1 << 4 ), */
/* .eint = 4, */
/* .bg_color = UI_COLOR_SILVER }, */
{.label = "HIST",
.letter = "M",
.left = "CMD",
@ -1360,7 +1444,7 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
.rowbit = ( 1 << 2 ),
.eint = 2,
.bg_color = UI_COLOR_BLACK },
{.label = "",
{.label = "\\arrowup",
.letter = "",
.left = "UPDIR",
.right = NULL,
@ -1381,7 +1465,7 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
.rowbit = ( 1 << 1 ),
.eint = 1,
.bg_color = UI_COLOR_SILVER },
{.label = "",
{.label = "\\arrowleft",
.letter = "",
.left = "BEG COPY",
.right = NULL,
@ -1402,7 +1486,7 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
.rowbit = ( 1 << 2 ),
.eint = 2,
.bg_color = UI_COLOR_SILVER },
{.label = "",
{.label = "\\arrowdown",
.letter = "",
.left = "CUT",
.right = NULL,
@ -1423,7 +1507,7 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
.rowbit = ( 1 << 3 ),
.eint = 3,
.bg_color = UI_COLOR_SILVER },
{.label = "",
{.label = "\\arrowright",
.letter = "",
.left = "END PASTE",
.right = NULL,
@ -3886,7 +3970,7 @@ static int gui_load( x49gp_module_t* module, GKeyFile* keyfile )
int fd = x49gp_module_open_rodata( module,
ui->calculator == UI_CALCULATOR_HP49GP || ui->calculator == UI_CALCULATOR_HP49GP_NEWRPL
? "hp49g+-cropped.png"
: /* "blank.png" */ "hp50g-cropped.png",
: "blank.png" /* "hp50g-cropped.png" */,
&faceplate_texture_data );
if ( fd < 0 )
return fd;