libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-07 14:23:29 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

settings_list.c - Add action OK callback

Browse Source
This commit is contained in:
twinaphex 2014-10-14 22:02:27 +02:00
parent da03f518bb
commit 5506674c69
3 changed files with 65 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
frontend/menu/menu_action.c
View File

@ -39,48 +39,8 @@ int menu_action_setting_apply(rarch_setting_t *setting)
int menu_action_setting_boolean(
rarch_setting_t *setting, unsigned action)
{
if (
!strcmp(setting->name, "savestate") ||
!strcmp(setting->name, "loadstate"))
{
switch (action)
{
case MENU_ACTION_START:
g_settings.state_slot = 0;
break;
case MENU_ACTION_LEFT:
// Slot -1 is (auto) slot.
if (g_settings.state_slot >= 0)
g_settings.state_slot--;
break;
case MENU_ACTION_RIGHT:
g_settings.state_slot++;
break;
case MENU_ACTION_OK:
*setting->value.boolean = !(*setting->value.boolean);
if (setting->cmd_trigger.idx != RARCH_CMD_NONE)
setting->cmd_trigger.triggered = true;
break;
}
}
else
{
switch (action)
{
case MENU_ACTION_OK:
if (setting->cmd_trigger.idx != RARCH_CMD_NONE)
setting->cmd_trigger.triggered = true;
/* fall-through */
case MENU_ACTION_LEFT:
case MENU_ACTION_RIGHT:
*setting->value.boolean = !(*setting->value.boolean);
break;
case MENU_ACTION_START:
*setting->value.boolean = setting->default_value.boolean;
break;
}
}
if (setting->action_ok)
setting->action_ok(setting, action);
return menu_action_setting_apply(setting);
}

60
settings_data.c
View File

@ -673,6 +673,62 @@ void setting_data_get_string_representation(rarch_setting_t* setting,
}
}
static int setting_data_bool_action_ok_savestates(void *data, unsigned action)
{
rarch_setting_t *setting = (rarch_setting_t*)data;
if (!setting)
return -1;
switch (action)
{
case MENU_ACTION_START:
g_settings.state_slot = 0;
break;
case MENU_ACTION_LEFT:
// Slot -1 is (auto) slot.
if (g_settings.state_slot >= 0)
g_settings.state_slot--;
break;
case MENU_ACTION_RIGHT:
g_settings.state_slot++;
break;
case MENU_ACTION_OK:
*setting->value.boolean = !(*setting->value.boolean);
if (setting->cmd_trigger.idx != RARCH_CMD_NONE)
setting->cmd_trigger.triggered = true;
break;
}
return 0;
}
static int setting_data_bool_action_ok_default(void *data, unsigned action)
{
rarch_setting_t *setting = (rarch_setting_t*)data;
if (!setting)
return -1;
switch (action)
{
case MENU_ACTION_OK:
if (setting->cmd_trigger.idx != RARCH_CMD_NONE)
setting->cmd_trigger.triggered = true;
/* fall-through */
case MENU_ACTION_LEFT:
case MENU_ACTION_RIGHT:
*setting->value.boolean = !(*setting->value.boolean);
break;
case MENU_ACTION_START:
*setting->value.boolean = setting->default_value.boolean;
break;
}
return 0;
}
rarch_setting_t setting_data_group_setting(enum setting_type type, const char* name)
{
rarch_setting_t result = { type, name };
@ -723,6 +779,8 @@ rarch_setting_t setting_data_bool_setting(const char* name,
result.default_value.boolean = default_value;
result.boolean.off_label = off;
result.boolean.on_label = on;
result.action_ok = setting_data_bool_action_ok_default;
return result;
}
@ -2325,6 +2383,7 @@ static bool setting_data_append_list_main_menu_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
(*list)[list_info->index - 1].action_ok = &setting_data_bool_action_ok_savestates;
settings_list_current_add_cmd (list, list_info, RARCH_CMD_SAVE_STATE);
settings_list_current_add_flags(list, list_info, SD_FLAG_EXIT);
@ -2339,6 +2398,7 @@ static bool setting_data_append_list_main_menu_options(
subgroup_info.name,
general_write_handler,
general_read_handler);
(*list)[list_info->index - 1].action_ok = &setting_data_bool_action_ok_savestates;
settings_list_current_add_cmd (list, list_info, RARCH_CMD_LOAD_STATE);
settings_list_current_add_flags(list, list_info, SD_FLAG_EXIT);

4
settings_list.h
View File

@ -81,6 +81,7 @@ enum setting_list_flags
#define SL_FLAG_ALL_SETTINGS (SL_FLAG_ALL - SL_FLAG_MAIN_MENU)
typedef void (*change_handler_t)(void *data);
typedef int (*action_ok_handler_t)(void *data, unsigned action);
typedef struct rarch_setting_info
{
@ -115,7 +116,8 @@ typedef struct rarch_setting
change_handler_t change_handler;
change_handler_t deferred_handler;
change_handler_t read_handler;
action_ok_handler_t action_ok;
union
{
bool boolean;