mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-01 20:54:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create ST_STRING_OPTIONS

Browse Source
This commit is contained in:
twinaphex 2015-10-11 23:07:43 +02:00
parent caa168bd7a
commit e085747e02
3 changed files with 44 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu/menu_entry.c
View File

@ -71,9 +71,6 @@ enum menu_entry_type menu_entry_get_type(uint32_t i)
enum setting_type setting_type = menu_setting_get_type(setting); enum setting_type setting_type = menu_setting_get_type(setting);
const char *values = menu_setting_get_values(setting); const char *values = menu_setting_get_values(setting);
if (values && (setting_type == ST_STRING))
return MENU_ENTRY_ENUM;
switch (setting_type) switch (setting_type)
{ {
case ST_BOOL: case ST_BOOL:
@ -90,17 +87,14 @@ enum menu_entry_type menu_entry_get_type(uint32_t i)
return MENU_ENTRY_PATH; return MENU_ENTRY_PATH;
case ST_DIR: case ST_DIR:
return MENU_ENTRY_DIR; return MENU_ENTRY_DIR;
case ST_STRING_OPTIONS:
return MENU_ENTRY_ENUM;
case ST_STRING: case ST_STRING:
return MENU_ENTRY_STRING; return MENU_ENTRY_STRING;
case ST_HEX: case ST_HEX:
return MENU_ENTRY_HEX; return MENU_ENTRY_HEX;
case ST_NONE: default:
case ST_ACTION:
case ST_GROUP:
case ST_SUB_GROUP:
case ST_END_GROUP:
case ST_END_SUB_GROUP:
break; break;
} }
} }

53
menu/menu_setting.c
View File

@ -353,6 +353,7 @@ int menu_action_handle_setting(rarch_setting_t *setting,
case ST_HEX: case ST_HEX:
case ST_FLOAT: case ST_FLOAT:
case ST_STRING: case ST_STRING:
case ST_STRING_OPTIONS:
case ST_DIR: case ST_DIR:
case ST_BIND: case ST_BIND:
case ST_ACTION: case ST_ACTION:
@ -520,6 +521,7 @@ void *setting_get_ptr(rarch_setting_t *setting)
case ST_BIND: case ST_BIND:
return setting->value.keybind; return setting->value.keybind;
case ST_STRING: case ST_STRING:
case ST_STRING_OPTIONS:
case ST_PATH: case ST_PATH:
case ST_DIR: case ST_DIR:
return setting->value.string; return setting->value.string;
@ -559,6 +561,7 @@ static void setting_reset_setting(rarch_setting_t* setting)
*setting->value.keybind = *setting->default_value.keybind; *setting->value.keybind = *setting->default_value.keybind;
break; break;
case ST_STRING: case ST_STRING:
case ST_STRING_OPTIONS:
case ST_PATH: case ST_PATH:
case ST_DIR: case ST_DIR:
if (setting->default_value.string) if (setting->default_value.string)
@ -654,6 +657,7 @@ int menu_setting_set_with_string_representation(rarch_setting_t* setting,
case ST_PATH: case ST_PATH:
case ST_DIR: case ST_DIR:
case ST_STRING: case ST_STRING:
case ST_STRING_OPTIONS:
case ST_ACTION: case ST_ACTION:
strlcpy(setting->value.string, value, setting->size); strlcpy(setting->value.string, value, setting->size);
break; break;
@ -1538,6 +1542,7 @@ static int setting_generic_action_ok_linefeed(void *data, bool wraparound)
cb = menu_input_st_hex_callback; cb = menu_input_st_hex_callback;
break; break;
case ST_STRING: case ST_STRING:
case ST_STRING_OPTIONS:
cb = menu_input_st_string_callback; cb = menu_input_st_string_callback;
break; break;
default: default:
@ -2714,7 +2719,7 @@ static void general_write_handler(void *data)
#define CONFIG_STRING_OPTIONS(TARGET, NAME, SHORT, DEF, OPTS, group_info, subgroup_info, parent_group, CHANGE_HANDLER, READ_HANDLER) \ #define CONFIG_STRING_OPTIONS(TARGET, NAME, SHORT, DEF, OPTS, group_info, subgroup_info, parent_group, CHANGE_HANDLER, READ_HANDLER) \
{ \ { \
if (!(menu_settings_list_append(list, list_info, setting_string_setting_options(ST_STRING, NAME, SHORT, TARGET, sizeof(TARGET), DEF, "", OPTS, group_info, subgroup_info, parent_group, CHANGE_HANDLER, READ_HANDLER)))) return false; \ if (!(menu_settings_list_append(list, list_info, setting_string_setting_options(ST_STRING_OPTIONS, NAME, SHORT, TARGET, sizeof(TARGET), DEF, "", OPTS, group_info, subgroup_info, parent_group, CHANGE_HANDLER, READ_HANDLER)))) return false; \
} }
#define CONFIG_HEX(TARGET, NAME, SHORT, DEF, group_info, subgroup_info, parent_group, CHANGE_HANDLER, READ_HANDLER) \ #define CONFIG_HEX(TARGET, NAME, SHORT, DEF, group_info, subgroup_info, parent_group, CHANGE_HANDLER, READ_HANDLER) \
@ -2762,11 +2767,6 @@ static void setting_add_special_callbacks(
break; break;
} }
} }
else if (values & SD_FLAG_IS_DRIVER)
{
(*list)[idx].action_left = setting_string_action_left_driver;
(*list)[idx].action_right = setting_string_action_right_driver;
}
} }
static void settings_data_list_current_add_flags( static void settings_data_list_current_add_flags(
@ -2971,6 +2971,8 @@ static bool setting_append_list_driver_options(
NULL, NULL,
NULL); NULL);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER); settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER);
(*list)[list_info->index - 1].action_left = setting_string_action_left_driver;
(*list)[list_info->index - 1].action_right = setting_string_action_right_driver;
CONFIG_STRING_OPTIONS( CONFIG_STRING_OPTIONS(
settings->input.joypad_driver, settings->input.joypad_driver,
@ -2984,6 +2986,8 @@ static bool setting_append_list_driver_options(
NULL, NULL,
NULL); NULL);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER); settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER);
(*list)[list_info->index - 1].action_left = setting_string_action_left_driver;
(*list)[list_info->index - 1].action_right = setting_string_action_right_driver;
CONFIG_STRING_OPTIONS( CONFIG_STRING_OPTIONS(
settings->video.driver, settings->video.driver,
@ -2997,6 +3001,8 @@ static bool setting_append_list_driver_options(
NULL, NULL,
NULL); NULL);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER); settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER);
(*list)[list_info->index - 1].action_left = setting_string_action_left_driver;
(*list)[list_info->index - 1].action_right = setting_string_action_right_driver;
CONFIG_STRING_OPTIONS( CONFIG_STRING_OPTIONS(
settings->audio.driver, settings->audio.driver,
@ -3010,6 +3016,8 @@ static bool setting_append_list_driver_options(
NULL, NULL,
NULL); NULL);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER); settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER);
(*list)[list_info->index - 1].action_left = setting_string_action_left_driver;
(*list)[list_info->index - 1].action_right = setting_string_action_right_driver;
CONFIG_STRING_OPTIONS( CONFIG_STRING_OPTIONS(
settings->audio.resampler, settings->audio.resampler,
@ -3023,6 +3031,8 @@ static bool setting_append_list_driver_options(
NULL, NULL,
NULL); NULL);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER); settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER);
(*list)[list_info->index - 1].action_left = setting_string_action_left_driver;
(*list)[list_info->index - 1].action_right = setting_string_action_right_driver;
CONFIG_STRING_OPTIONS( CONFIG_STRING_OPTIONS(
settings->camera.driver, settings->camera.driver,
@ -3036,6 +3046,8 @@ static bool setting_append_list_driver_options(
NULL, NULL,
NULL); NULL);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER); settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER);
(*list)[list_info->index - 1].action_left = setting_string_action_left_driver;
(*list)[list_info->index - 1].action_right = setting_string_action_right_driver;
CONFIG_STRING_OPTIONS( CONFIG_STRING_OPTIONS(
settings->location.driver, settings->location.driver,
@ -3049,6 +3061,8 @@ static bool setting_append_list_driver_options(
NULL, NULL,
NULL); NULL);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER); settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER);
(*list)[list_info->index - 1].action_left = setting_string_action_left_driver;
(*list)[list_info->index - 1].action_right = setting_string_action_right_driver;
CONFIG_STRING_OPTIONS( CONFIG_STRING_OPTIONS(
settings->menu.driver, settings->menu.driver,
@ -3062,6 +3076,8 @@ static bool setting_append_list_driver_options(
NULL, NULL,
NULL); NULL);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER); settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER);
(*list)[list_info->index - 1].action_left = setting_string_action_left_driver;
(*list)[list_info->index - 1].action_right = setting_string_action_right_driver;
CONFIG_STRING_OPTIONS( CONFIG_STRING_OPTIONS(
settings->record.driver, settings->record.driver,
@ -3075,6 +3091,8 @@ static bool setting_append_list_driver_options(
NULL, NULL,
NULL); NULL);
settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER); settings_data_list_current_add_flags(list, list_info, SD_FLAG_IS_DRIVER);
(*list)[list_info->index - 1].action_left = setting_string_action_left_driver;
(*list)[list_info->index - 1].action_right = setting_string_action_right_driver;
END_SUB_GROUP(list, list_info, parent_group); END_SUB_GROUP(list, list_info, parent_group);
END_GROUP(list, list_info, parent_group); END_GROUP(list, list_info, parent_group);
@ -6555,16 +6573,23 @@ void menu_setting_free(rarch_setting_t *list)
for (; menu_setting_get_type(setting) != ST_NONE; menu_settings_list_increment(&setting)) for (; menu_setting_get_type(setting) != ST_NONE; menu_settings_list_increment(&setting))
{ {
if (flags & SD_FLAG_IS_DRIVER) enum setting_type setting_type = menu_setting_get_type(setting);
{
if (setting->values)
free((void*)setting->values);
}
if (menu_setting_get_type(setting) == ST_BIND) switch (setting_type)
{ {
free((void*)setting->name); case ST_STRING_OPTIONS:
free((void*)setting->short_description); if (setting->values)
free((void*)setting->values);
setting->values = NULL;
break;
case ST_BIND:
free((void*)setting->name);
free((void*)setting->short_description);
setting->name = NULL;
setting->short_description = NULL;
break;
default:
break;
} }
} }

1
menu/menu_setting.h
View File

@ -36,6 +36,7 @@ enum setting_type
ST_PATH, ST_PATH,
ST_DIR, ST_DIR,
ST_STRING, ST_STRING,
ST_STRING_OPTIONS,
ST_HEX, ST_HEX,
ST_BIND, ST_BIND,
ST_GROUP, ST_GROUP,