From 968c692a0469e60b8b8ac1466edcb6fcc8afb7b4 Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 8 Apr 2018 14:48:11 -0500 Subject: [PATCH] remap-redux: allow the menu to display manual keybinds --- input/input_driver.c | 2 +- input/input_remapping.c | 2 +- menu/menu_displaylist.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/input/input_driver.c b/input/input_driver.c index 98845510fc..8cd95fe416 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -2576,7 +2576,7 @@ static void input_config_get_bind_string_joykey( { if (bind->joykey_label && !string_is_empty(bind->joykey_label) && label_show) - snprintf(buf, size, "%s %s ", prefix, bind->joykey_label); + snprintf(buf, size, "%s %s (hat)", prefix, bind->joykey_label); else { const char *dir = "?"; diff --git a/input/input_remapping.c b/input/input_remapping.c index d16d65781a..ed71689ab2 100644 --- a/input/input_remapping.c +++ b/input/input_remapping.c @@ -115,7 +115,7 @@ bool input_remapping_load_file(void *data, const char *path) s3, key_strings[j]); - RARCH_LOG("pre_ident: %s:%d\n", stk_ident[j], settings->uints.input_remap_ids[i][j]); + /* RARCH_LOG("pre_ident: %s:%d\n", stk_ident[j], settings->uints.input_remap_ids[i][j]); */ if (config_get_int(conf, stk_ident[j], &stk_remap) && stk_remap != -1) settings->uints.input_remap_ids[i][j] = stk_remap; diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index d8a276e72a..77d616a855 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3271,7 +3271,8 @@ static int menu_displaylist_parse_options_remappings( const struct retro_keybind *keyptr = &input_config_binds[p][retro_id]; - strlcpy(descriptor, msg_hash_to_str(keyptr->enum_idx), sizeof(descriptor)); + snprintf(desc_label, sizeof(desc_label), "%s %s", msg_hash_to_str(keyptr->enum_idx), descriptor); + strlcpy(descriptor, desc_label, sizeof(descriptor)); } menu_entries_append_enum(info->list, descriptor, "",