mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't show the keymapper labels when not required

Browse Source
This commit is contained in:
radius 2017-09-10 17:20:44 -05:00
parent bb2a92c980
commit f1f4d629ad
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
menu/cbs/menu_cbs_get_value.c
View File

@ -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( static void menu_action_setting_disp_set_label_input_desc_kbd(
file_list_t* list, file_list_t* list,
unsigned *w, unsigned type, unsigned i, unsigned *w, unsigned type, unsigned i,
@ -517,7 +518,7 @@ static void menu_action_setting_disp_set_label_input_desc_kbd(
*w = 19; *w = 19;
strlcpy(s2, path, len2); strlcpy(s2, path, len2);
} }
#endif
static void menu_action_setting_disp_set_label_cheat( static void menu_action_setting_disp_set_label_cheat(
file_list_t* list, file_list_t* list,

2
menu/cbs/menu_cbs_left.c
View File

@ -113,6 +113,7 @@ static int action_left_input_desc(unsigned type, const char *label,
return 0; return 0;
} }
#ifdef HAVE_KEYMAPPER
static int action_left_input_desc_kbd(unsigned type, const char *label, static int action_left_input_desc_kbd(unsigned type, const char *label,
bool wraparound) bool wraparound)
{ {
@ -141,6 +142,7 @@ static int action_left_input_desc_kbd(unsigned type, const char *label,
return 0; return 0;
} }
#endif
static int action_left_scroll(unsigned type, const char *label, static int action_left_scroll(unsigned type, const char *label,
bool wraparound) bool wraparound)

2
menu/cbs/menu_cbs_right.c
View File

@ -102,6 +102,7 @@ int action_right_cheat(unsigned type, const char *label,
wraparound); wraparound);
} }
#ifdef HAVE_KEYMAPPER
int action_right_input_desc_kbd(unsigned type, const char *label, int action_right_input_desc_kbd(unsigned type, const char *label,
bool wraparound) bool wraparound)
{ {
@ -130,6 +131,7 @@ int action_right_input_desc_kbd(unsigned type, const char *label,
return 0; return 0;
} }
#endif
int action_right_input_desc(unsigned type, const char *label, int action_right_input_desc(unsigned type, const char *label,
bool wraparound) bool wraparound)

31
menu/menu_displaylist.c
View File

@ -3504,25 +3504,34 @@ static int menu_displaylist_parse_options_remappings(
} }
} }
} }
#ifdef HAVE_KEYMAPPER
if (system) if (system)
{ {
settings_t *settings = config_get_ptr(); 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]; for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++)
unsigned user = settings->uints.keymapper_port + 1; {
unsigned desc_offset = retro_id; char desc_label[64];
const char *description = NULL; 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), snprintf(desc_label, sizeof(desc_label),
"%s: ", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B + retro_id)); "%s: ", msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B + retro_id));
menu_entries_append_enum(info->list, desc_label, "", menu_entries_append_enum(info->list, desc_label, "",
MSG_UNKNOWN, MSG_UNKNOWN,
MENU_SETTINGS_INPUT_DESC_KBD_BEGIN + retro_id, 0, 0); MENU_SETTINGS_INPUT_DESC_KBD_BEGIN + retro_id, 0, 0);
}
} }
} }
#endif
return 0; return 0;
} }