From f1f4d629addb9d2741be8a8306b811e422d1f12b Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 10 Sep 2017 17:20:44 -0500 Subject: [PATCH] don't show the keymapper labels when not required --- menu/cbs/menu_cbs_get_value.c | 3 ++- menu/cbs/menu_cbs_left.c | 2 ++ menu/cbs/menu_cbs_right.c | 2 ++ menu/menu_displaylist.c | 31 ++++++++++++++++++++----------- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index c86d49e6eb..46a890c624 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -488,6 +488,7 @@ static void menu_action_setting_disp_set_label_input_desc( } +#ifdef HAVE_KEYMAPPER static void menu_action_setting_disp_set_label_input_desc_kbd( file_list_t* list, unsigned *w, unsigned type, unsigned i, @@ -517,7 +518,7 @@ static void menu_action_setting_disp_set_label_input_desc_kbd( *w = 19; strlcpy(s2, path, len2); } - +#endif static void menu_action_setting_disp_set_label_cheat( file_list_t* list, diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c index 72d3437b0d..55e291b15c 100644 --- a/menu/cbs/menu_cbs_left.c +++ b/menu/cbs/menu_cbs_left.c @@ -113,6 +113,7 @@ static int action_left_input_desc(unsigned type, const char *label, return 0; } +#ifdef HAVE_KEYMAPPER static int action_left_input_desc_kbd(unsigned type, const char *label, bool wraparound) { @@ -141,6 +142,7 @@ static int action_left_input_desc_kbd(unsigned type, const char *label, return 0; } +#endif static int action_left_scroll(unsigned type, const char *label, bool wraparound) diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c index 9ee53c15d9..c93a07dcba 100644 --- a/menu/cbs/menu_cbs_right.c +++ b/menu/cbs/menu_cbs_right.c @@ -102,6 +102,7 @@ int action_right_cheat(unsigned type, const char *label, wraparound); } +#ifdef HAVE_KEYMAPPER int action_right_input_desc_kbd(unsigned type, const char *label, bool wraparound) { @@ -130,6 +131,7 @@ int action_right_input_desc_kbd(unsigned type, const char *label, return 0; } +#endif int action_right_input_desc(unsigned type, const char *label, bool wraparound) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 51fabf9d25..c0c2de2243 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3504,25 +3504,34 @@ static int menu_displaylist_parse_options_remappings( } } } + #ifdef HAVE_KEYMAPPER if (system) { settings_t *settings = config_get_ptr(); - for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++) + + unsigned device = settings->uints.input_libretro_device[settings->uints.keymapper_port]; + device &= RETRO_DEVICE_MASK; + + if (device == RETRO_DEVICE_KEYBOARD) { - char desc_label[64]; - unsigned user = settings->uints.keymapper_port + 1; - unsigned desc_offset = retro_id; - const char *description = NULL; + for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++) + { + char desc_label[64]; + unsigned user = settings->uints.keymapper_port + 1; + unsigned desc_offset = retro_id; + const char *description = NULL; - desc_label[0] = '\0'; + desc_label[0] = '\0'; - snprintf(desc_label, sizeof(desc_label), - "%s: ", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B + retro_id)); - menu_entries_append_enum(info->list, desc_label, "", - MSG_UNKNOWN, - MENU_SETTINGS_INPUT_DESC_KBD_BEGIN + retro_id, 0, 0); + snprintf(desc_label, sizeof(desc_label), + "%s: ", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B + retro_id)); + menu_entries_append_enum(info->list, desc_label, "", + MSG_UNKNOWN, + MENU_SETTINGS_INPUT_DESC_KBD_BEGIN + retro_id, 0, 0); + } } } + #endif return 0; }