From b0195af198aff6049abd8949d67ae65254708b38 Mon Sep 17 00:00:00 2001 From: Lephenixnoir Date: Mon, 29 Aug 2022 14:49:15 +0200 Subject: [PATCH] jfkeys: add color and font parameters --- include/justui/jfkeys.h | 19 ++++++++++++-- src/jfkeys.c | 57 ++++++++++++++++++++++++++++++----------- 2 files changed, 59 insertions(+), 17 deletions(-) diff --git a/include/justui/jfkeys.h b/include/justui/jfkeys.h index eca4f41..0912014 100644 --- a/include/justui/jfkeys.h +++ b/include/justui/jfkeys.h @@ -61,6 +61,11 @@ typedef struct { #ifdef FXCG50 char const *labels; char const *overrides[6]; + + int bg_color, bg_special_color; + int text_color, text_special_color; + + font_t const *font; #endif } jfkeys; @@ -103,15 +108,25 @@ int jfkeys_level(jfkeys *keys); void jfkeys_set_level(jfkeys *keys, int level); /* The following functions are available only on fx-CG 50 and are no-ops on - fx-9860 (you can't generate a good image for a tiny key). */ + fx-9860G (you can't generate a good image for a tiny key). */ /* fkeys_override(): Get the override for a key */ char const *jfkeys_override(jfkeys *keys, int key); -/* fkeys_set_override(): Override the value of a single key on all levels +/* jfkeys_set_override(): Override the value of a single key on all levels This functions sets the override on the specified key, which replaces the label for that key on all levels. This is useful to conditionally show functions. */ void jfkeys_set_override(jfkeys *keys, int key, char const *override); +/* jfkeys_set_color(): Change the key and text colors + * bg is the background color for MENU, ENTRY and ACTION keys (default + C_BLACK), and the border color for SPECIAL keys. + * bg_special is the background color for SPECIAL keys (default C_WHITE). + * text is the text color for MENU, ENTRY and ACTION keys (default C_WHITE). + * text_special is the text color for SPECIAL keys (default C_BLACK). */ +void jfkeys_set_color(jfkeys *keys, int bg, int bg_special, int text, + int text_special); +void jfkeys_set_font(jfkeys *keys, font_t const *font); + #endif /* _J_JFKEYS */ diff --git a/src/jfkeys.c b/src/jfkeys.c index f06804c..66fdc2e 100644 --- a/src/jfkeys.c +++ b/src/jfkeys.c @@ -36,6 +36,11 @@ jfkeys *jfkeys_create(char const *labels, void *parent) jwidget_init(&f->widget, jfkeys_type_id, parent); jfkeys_set(f, labels); for(int i = 0; i < 6; i++) f->overrides[i] = NULL; + f->bg_color = C_BLACK; + f->bg_special_color = C_WHITE; + f->text_color = C_WHITE; + f->text_special_color = C_BLACK; + f->font = dfont_default(); return f; } @@ -111,7 +116,7 @@ static void jfkeys_poly_render(void *f0, int base_x, int y) #endif #ifdef FXCG50 - font_t const *old_font = dfont(dfont_default()); + font_t const *old_font = dfont(f->font); char const *level = get_level(f->labels, f->level); if(!level) return; @@ -127,27 +132,31 @@ static void jfkeys_poly_render(void *f0, int base_x, int y) int x = base_x + 4 + 65 * position; int w = 63; - int color = (text[0] == '#') ? C_BLACK : C_WHITE; + int color = (text[0] == '#') ? f->text_special_color : f->text_color; if(text[0] == '.') { - drect(x, y, x + w - 1, y + 14, C_BLACK); + drect(x, y, x + w - 1, y + 14, f->bg_color); } - if(text[0] == '/' || text[0] == '@') { - dline(x + 1, y, x + w - 2, y, C_BLACK); - dline(x + 1, y + 14, x + w - 2, y + 14, C_BLACK); - drect(x, y + 1, x + w - 1, y + 13, C_BLACK); + if(text[0] == '@') { + dline(x + 1, y, x + w - 2, y, f->bg_color); + dline(x + 1, y + 14, x + w - 2, y + 14, f->bg_color); + drect(x, y + 1, x + w - 1, y + 13, f->bg_color); } if(text[0] == '/') { - dline(x + w - 1, y + 10, x + w - 5, y + 14, C_WHITE); - dline(x + w - 1, y + 11, x + w - 4, y + 14, C_WHITE); - dline(x + w - 1, y + 12, x + w - 3, y + 14, C_WHITE); - dline(x + w - 1, y + 13, x + w - 2, y + 14, C_WHITE); + dline(x + 1, y, x + w - 2, y, f->bg_color); + drect(x, y + 1, x + w - 1, y + 9, f->bg_color); + dline(x, y + 10, x + w - 2, y + 10, f->bg_color); + dline(x, y + 11, x + w - 3, y + 11, f->bg_color); + dline(x, y + 12, x + w - 4, y + 12, f->bg_color); + dline(x, y + 13, x + w - 5, y + 13, f->bg_color); + dline(x, y + 14, x + w - 6, y + 14, f->bg_color); } if(text[0] == '#') { - dline(x + 1, y, x + w - 2, y, C_BLACK); - dline(x + 1, y + 14, x + w - 2, y + 14, C_BLACK); - drect(x, y + 1, x + 1, y + 13, C_BLACK); - drect(x + w - 2, y + 1, x + w - 1, y + 13, C_BLACK); + dline(x + 1, y, x + w - 2, y, f->bg_color); + dline(x + 1, y + 14, x + w - 2, y + 14, f->bg_color); + drect(x, y + 1, x + 1, y + 13, f->bg_color); + drect(x + w - 2, y + 1, x + w - 1, y + 13, f->bg_color); + drect(x + 2, y + 1, x + w - 3, y + 13, f->bg_special_color); } dtext_opt(x + (w >> 1), y + 3, color, C_NONE, DTEXT_CENTER, DTEXT_TOP, @@ -189,6 +198,24 @@ void jfkeys_set_override(GUNUSED jfkeys *keys, GUNUSED int key, #endif } +void jfkeys_set_color(GUNUSED jfkeys *keys, GUNUSED int bg, + GUNUSED int bg_special, GUNUSED int text, GUNUSED int text_special) +{ + #ifdef FXCG50 + keys->bg_color = bg; + keys->bg_special_color = bg_special; + keys->text_color = text; + keys->text_special_color = text_special; + #endif +} + +void jfkeys_set_font(GUNUSED jfkeys *keys, GUNUSED font_t const *font) +{ + #ifdef FXCG50 + keys->font = font; + #endif +} + /* jfkeys type definition */ static jwidget_poly type_jfkeys = { .name = "jfkeys",