From ce5afde9b68e5cd59387f13d2cad1f4c91a619fb Mon Sep 17 00:00:00 2001 From: Juho Kuisma Date: Fri, 17 Jan 2025 20:24:38 +0200 Subject: [PATCH] Rename r_cons_pal_update_event -> r_cons_pal_reload --- libr/cons/pal.c | 7 +++---- libr/core/cconfig.c | 2 +- libr/core/cmd_eval.inc.c | 4 ++-- libr/include/r_cons.h | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libr/cons/pal.c b/libr/cons/pal.c index 4f9c3e7612292..89250a17064f7 100644 --- a/libr/cons/pal.c +++ b/libr/cons/pal.c @@ -293,7 +293,7 @@ R_API void r_cons_pal_random(void) { rcolor = RCOLOR_AT (i); *rcolor = r_cons_color_random (ALPHA_FG); } - r_cons_pal_update_event (); + r_cons_pal_reload (); } R_API char *r_cons_pal_parse(const char *str, R_NULLABLE RColor *outcol) { @@ -618,7 +618,7 @@ R_API void r_cons_pal_list(int rad, const char *arg) { } /* Modify the palette to set a color value. - * r_cons_pal_update_event () must be called after this function + * r_cons_pal_reload () must be called after this function * so the changes take effect. */ R_API int r_cons_pal_set(const char *key, const char *val) { size_t i; @@ -665,8 +665,7 @@ R_API int r_cons_pal_len(void) { return keys_len; } -// R2_600 TODO: rename to RCons.pal_reload() // pal_apply() maybe? -R_API void r_cons_pal_update_event(void) { +R_API void r_cons_pal_reload(void) { __cons_pal_update_event (r_cons_context ()); } diff --git a/libr/core/cconfig.c b/libr/core/cconfig.c index bbb98a37c3a6e..1e1759e8f815a 100644 --- a/libr/core/cconfig.c +++ b/libr/core/cconfig.c @@ -1609,7 +1609,7 @@ static bool cb_color(void *user, void *data) { } r_cons_singleton ()->context->color_mode = (node->i_value > COLOR_MODE_16M) ? COLOR_MODE_16M: node->i_value; - r_cons_pal_update_event (); + r_cons_pal_reload (); r_print_set_flags (core->print, core->print->flags); r_log_set_colors (node->i_value); return true; diff --git a/libr/core/cmd_eval.inc.c b/libr/core/cmd_eval.inc.c index e64987a2750ad..882e57e983826 100644 --- a/libr/core/cmd_eval.inc.c +++ b/libr/core/cmd_eval.inc.c @@ -208,7 +208,7 @@ static bool cmd_load_theme(RCore *core, const char *_arg) { if (R_STR_ISNOTEMPTY (theme_script)) { core->cmdfilter = "ec "; r_core_cmd_lines (core, theme_script); - r_cons_pal_update_event (); + r_cons_pal_reload (); core->cmdfilter = NULL; ret = true; // maybe the script fails? } else { @@ -606,7 +606,7 @@ static bool cmd_ec(RCore *core, const char *input) { // Set color *q++ = 0; if (r_cons_pal_set (p, q)) { - r_cons_pal_update_event (); + r_cons_pal_reload (); } } else { char color[32] = {0}; diff --git a/libr/include/r_cons.h b/libr/include/r_cons.h index 9fa3c31f29eeb..8955485bad7ba 100644 --- a/libr/include/r_cons.h +++ b/libr/include/r_cons.h @@ -970,7 +970,7 @@ R_API void r_cons_thready(void); R_API int r_cons_palette_init(const unsigned char *pal); R_API int r_cons_pal_set(const char *key, const char *val); -R_API void r_cons_pal_update_event(void); +R_API void r_cons_pal_reload(void); R_API void r_cons_pal_free(RConsContext *ctx); R_API void r_cons_pal_init(RConsContext *ctx); R_API void r_cons_pal_copy(RConsContext *dst, RConsContext *src);