ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add Device Type controls to Core Input Options

This commit is contained in:
twinaphex 2015-10-22 08:38:29 +02:00
parent e4a11bc16b
commit d80289c39a
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
menu/menu_displaylist.c
View File

@ -1466,6 +1466,7 @@ int menu_displaylist_parse_settings(void *data, menu_displaylist_info_t *info,
setting = menu_setting_find(info_label); setting = menu_setting_find(info_label);
flags = menu_setting_get_flags(setting); flags = menu_setting_get_flags(setting);
if (!setting) if (!setting)
return -1; return -1;
@ -1478,6 +1479,9 @@ int menu_displaylist_parse_settings(void *data, menu_displaylist_info_t *info,
case PARSE_ACTION: case PARSE_ACTION:
precond = ST_ACTION; precond = ST_ACTION;
break; break;
case PARSE_ONLY_UINT:
precond = ST_UINT;
break;
case PARSE_ONLY_GROUP: case PARSE_ONLY_GROUP:
default: default:
precond = ST_END_GROUP; precond = ST_END_GROUP;
@ -1515,6 +1519,10 @@ int menu_displaylist_parse_settings(void *data, menu_displaylist_info_t *info,
if (type == ST_ACTION) if (type == ST_ACTION)
break; break;
goto loop; goto loop;
case PARSE_ONLY_UINT:
if (type == ST_UINT)
break;
goto loop;
} }
if (flags & SD_FLAG_ADVANCED && if (flags & SD_FLAG_ADVANCED &&
@ -1536,6 +1544,7 @@ loop:
if (menu_setting_get_type(setting) == precond) if (menu_setting_get_type(setting) == precond)
time_to_exit = true; time_to_exit = true;
break; break;
case PARSE_ONLY_UINT:
case PARSE_ACTION: case PARSE_ACTION:
time_to_exit = true; time_to_exit = true;
break; break;
@ -1937,6 +1946,7 @@ static int menu_displaylist_parse_options_remappings(menu_displaylist_info_t *in
unsigned p, retro_id; unsigned p, retro_id;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
rarch_system_info_t *system = rarch_system_info_get_ptr(); rarch_system_info_t *system = rarch_system_info_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
menu_entries_push(info->list, menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_REMAP_FILE_LOAD), menu_hash_to_str(MENU_LABEL_VALUE_REMAP_FILE_LOAD),
@ -1957,6 +1967,13 @@ static int menu_displaylist_parse_options_remappings(menu_displaylist_info_t *in
for (p = 0; p < settings->input.max_users; p++) for (p = 0; p < settings->input.max_users; p++)
{ {
char key_type[PATH_MAX_LENGTH];
snprintf(key_type, sizeof(key_type),
"input_libretro_device_p%u", p + 1);
menu_displaylist_parse_settings(menu, info,
key_type, PARSE_ONLY_UINT);
for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND + 4; retro_id++) for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND + 4; retro_id++)
{ {
char desc_label[64]; char desc_label[64];

5
menu/menu_displaylist.h
View File

@ -37,8 +37,9 @@ enum
PARSE_NONE = (1 << 0), PARSE_NONE = (1 << 0),
PARSE_GROUP = (1 << 1), PARSE_GROUP = (1 << 1),
PARSE_ACTION = (1 << 2), PARSE_ACTION = (1 << 2),
PARSE_ONLY_GROUP = (1 << 3), PARSE_ONLY_UINT = (1 << 3),
PARSE_SUB_GROUP = (1 << 4) PARSE_ONLY_GROUP = (1 << 4),
PARSE_SUB_GROUP = (1 << 5)
}; };
enum enum