diff --git a/Makefile.common b/Makefile.common
index 9045b135f7..7698913e11 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -348,7 +348,8 @@ ifeq ($(HAVE_MENU_COMMON), 1)
menu/menu_entries_cbs_start.o \
menu/menu_entries_cbs_select.o \
menu/menu_entries_cbs_refresh.o \
- menu/menu_entries_cbs_toggle.o \
+ menu/menu_entries_cbs_left.o \
+ menu/menu_entries_cbs_right.o \
menu/menu_entries_cbs_deferred_push.o \
menu/menu_entries_cbs_representation.o \
menu/menu_entries_cbs_iterate.o \
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 079a265026..92662852b0 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -722,7 +722,8 @@ MENU
#include "../menu/menu_entries_cbs_start.c"
#include "../menu/menu_entries_cbs_select.c"
#include "../menu/menu_entries_cbs_refresh.c"
-#include "../menu/menu_entries_cbs_toggle.c"
+#include "../menu/menu_entries_cbs_left.c"
+#include "../menu/menu_entries_cbs_right.c"
#include "../menu/menu_entries_cbs_deferred_push.c"
#include "../menu/menu_entries_cbs_representation.c"
#include "../menu/menu_entries_cbs_iterate.c"
diff --git a/menu/menu_common_list.c b/menu/menu_common_list.c
index e21d5a1430..a720c2c12e 100644
--- a/menu/menu_common_list.c
+++ b/menu/menu_common_list.c
@@ -67,7 +67,8 @@ void menu_common_list_delete(void *data, size_t idx,
cbs->action_start = NULL;
cbs->action_ok = NULL;
cbs->action_cancel = NULL;
- cbs->action_toggle = NULL;
+ cbs->action_left = NULL;
+ cbs->action_right = NULL;
cbs->action_deferred_push = NULL;
free(list->list[idx].actiondata);
}
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index 74b2d2a74b..4e2f9558a9 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -196,7 +196,8 @@ void menu_entries_cbs_init(void *data,
menu_entries_cbs_init_bind_content_list_switch(cbs, path, label, type, idx, elem0, elem1);
menu_entries_cbs_init_bind_up(cbs, path, label, type, idx, elem0, elem1);
menu_entries_cbs_init_bind_down(cbs, path, label, type, idx, elem0, elem1);
- menu_entries_cbs_init_bind_toggle(cbs, path, label, type, idx, elem0, elem1, menu_label);
+ menu_entries_cbs_init_bind_left(cbs, path, label, type, idx, elem0, elem1, menu_label);
+ menu_entries_cbs_init_bind_right(cbs, path, label, type, idx, elem0, elem1, menu_label);
menu_entries_cbs_init_bind_deferred_push(cbs, path, label, type, idx, elem0, elem1);
menu_entries_cbs_init_bind_refresh(cbs, path, label, type, idx, elem0, elem1);
menu_entries_cbs_init_bind_iterate(cbs, path, label, type, idx, elem0, elem1);
diff --git a/menu/menu_entries_cbs.h b/menu/menu_entries_cbs.h
index 2e034bc7d1..93a92269d5 100644
--- a/menu/menu_entries_cbs.h
+++ b/menu/menu_entries_cbs.h
@@ -33,7 +33,11 @@ void menu_entries_common_load_content(bool persist);
int menu_entries_common_is_settings_entry(const char *label);
-void menu_entries_cbs_init_bind_toggle(menu_file_list_cbs_t *cbs,
+void menu_entries_cbs_init_bind_left(menu_file_list_cbs_t *cbs,
+ const char *path, const char *label, unsigned type, size_t idx,
+ const char *elem0, const char *elem1, const char *menu_label);
+
+void menu_entries_cbs_init_bind_right(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
const char *elem0, const char *elem1, const char *menu_label);
diff --git a/menu/menu_entries_cbs_left.c b/menu/menu_entries_cbs_left.c
new file mode 100644
index 0000000000..60ceb780d5
--- /dev/null
+++ b/menu/menu_entries_cbs_left.c
@@ -0,0 +1,447 @@
+/* RetroArch - A frontend for libretro.
+ * Copyright (C) 2011-2015 - Daniel De Matteis
+ *
+ * RetroArch is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Found-
+ * ation, either version 3 of the License, or (at your option) any later version.
+ *
+ * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with RetroArch.
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <file/file_path.h>
+#include "menu.h"
+#include "menu_entries_cbs.h"
+#include "menu_setting.h"
+#include "menu_shader.h"
+#include "menu_navigation.h"
+
+#include "../retroarch.h"
+
+
+#ifdef HAVE_SHADER_MANAGER
+static void shader_action_parameter_left_common(
+ struct video_shader_parameter *param,
+ struct video_shader *shader)
+{
+ if (!shader)
+ return;
+
+ param->current -= param->step;
+ param->current = min(max(param->minimum, param->current), param->maximum);
+}
+#endif
+
+static int shader_action_parameter_left(unsigned type, const char *label,
+ bool wraparound)
+{
+#ifdef HAVE_SHADER_MANAGER
+ struct video_shader *shader = video_shader_driver_get_current_shader();
+ struct video_shader_parameter *param =
+ &shader->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0];
+
+ shader_action_parameter_left_common(param, shader);
+#endif
+ return 0;
+}
+
+static int shader_action_parameter_preset_left(unsigned type, const char *label,
+ bool wraparound)
+{
+#ifdef HAVE_SHADER_MANAGER
+ struct video_shader_parameter *param = NULL;
+ menu_handle_t *menu = menu_driver_get_ptr();
+ struct video_shader *shader = menu ? menu->shader : NULL;
+ if (!menu || !shader)
+ return -1;
+
+ param = &shader->parameters[type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0];
+
+ shader_action_parameter_left_common(param, shader);
+#endif
+ return 0;
+}
+
+static int action_left_cheat(unsigned type, const char *label,
+ bool wraparound)
+{
+ global_t *global = global_get_ptr();
+ cheat_manager_t *cheat = global->cheat;
+ size_t idx = type - MENU_SETTINGS_CHEAT_BEGIN;
+
+ if (!cheat)
+ return -1;
+
+ cheat->cheats[idx].state = !cheat->cheats[idx].state;
+ cheat_manager_update(cheat, idx);
+
+ return 0;
+}
+
+static int action_left_input_desc(unsigned type, const char *label,
+ bool wraparound)
+{
+ unsigned inp_desc_index_offset = type - MENU_SETTINGS_INPUT_DESC_BEGIN;
+ unsigned inp_desc_user = inp_desc_index_offset / RARCH_FIRST_META_KEY;
+ unsigned inp_desc_button_index_offset = inp_desc_index_offset - (inp_desc_user * RARCH_FIRST_META_KEY);
+ settings_t *settings = config_get_ptr();
+
+ if (settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset] > 0)
+ settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset]--;
+
+ return 0;
+}
+
+static int action_left_save_state(unsigned type, const char *label,
+ bool wraparound)
+{
+ settings_t *settings = config_get_ptr();
+
+ /* Slot -1 is (auto) slot. */
+ if (settings->state_slot >= 0)
+ settings->state_slot--;
+
+ return 0;
+}
+
+static int action_left_scroll(unsigned type, const char *label,
+ bool wraparound)
+{
+ unsigned scroll_speed = 0, fast_scroll_speed = 0;
+ menu_list_t *menu_list = menu_list_get_ptr();
+ menu_navigation_t *nav = menu_navigation_get_ptr();
+ if (!nav || !menu_list)
+ return -1;
+
+ scroll_speed = (max(nav->scroll.acceleration, 2) - 2) / 4 + 1;
+ fast_scroll_speed = 4 + 4 * scroll_speed;
+
+ if (nav->selection_ptr > fast_scroll_speed)
+ menu_navigation_set(nav, nav->selection_ptr - fast_scroll_speed, true);
+ else
+ menu_navigation_clear(nav, false);
+
+ return 0;
+}
+
+static int action_left_mainmenu(unsigned type, const char *label,
+ bool wraparound)
+{
+ menu_file_list_cbs_t *cbs = NULL;
+ unsigned push_list = 0;
+ driver_t *driver = driver_get_ptr();
+ menu_list_t *menu_list = menu_list_get_ptr();
+ menu_handle_t *menu = menu_driver_get_ptr();
+ unsigned action = MENU_ACTION_LEFT;
+ if (!menu)
+ return -1;
+
+ if (file_list_get_size(menu_list->menu_stack) == 1)
+ {
+
+ if (!strcmp(driver->menu_ctx->ident, "xmb"))
+ {
+ menu->navigation.selection_ptr = 0;
+ if (menu->categories.selection_ptr != 0)
+ {
+ push_list = 1;
+ }
+ }
+ }
+ else
+ push_list = 2;
+
+ cbs = menu_list_get_actiondata_at_offset(menu_list->selection_buf,
+ menu->navigation.selection_ptr);
+
+ switch (push_list)
+ {
+ case 1:
+ menu_driver_list_cache(true, action);
+
+ if (cbs && cbs->action_content_list_switch)
+ return cbs->action_content_list_switch(
+ menu_list->selection_buf, menu_list->menu_stack,
+ "", "", 0);
+ break;
+ case 2:
+ action_left_scroll(0, "", false);
+ break;
+ case 0:
+ default:
+ break;
+ }
+
+ return 0;
+}
+
+static int action_left_shader_scale_pass(unsigned type, const char *label,
+ bool wraparound)
+{
+#ifdef HAVE_SHADER_MANAGER
+ unsigned pass = type - MENU_SETTINGS_SHADER_PASS_SCALE_0;
+ struct video_shader *shader = NULL;
+ struct video_shader_pass *shader_pass = NULL;
+ menu_handle_t *menu = menu_driver_get_ptr();
+ if (!menu)
+ return -1;
+
+ shader = menu->shader;
+ if (!shader)
+ return -1;
+ shader_pass = &shader->pass[pass];
+ if (!shader_pass)
+ return -1;
+
+ {
+ unsigned current_scale = shader_pass->fbo.scale_x;
+ unsigned delta = 5;
+ current_scale = (current_scale + delta) % 6;
+
+ shader_pass->fbo.valid = current_scale;
+ shader_pass->fbo.scale_x = shader_pass->fbo.scale_y = current_scale;
+
+ }
+#endif
+ return 0;
+}
+
+static int action_left_shader_filter_pass(unsigned type, const char *label,
+ bool wraparound)
+{
+#ifdef HAVE_SHADER_MANAGER
+ unsigned pass = type - MENU_SETTINGS_SHADER_PASS_FILTER_0;
+ struct video_shader *shader = NULL;
+ struct video_shader_pass *shader_pass = NULL;
+ menu_handle_t *menu = menu_driver_get_ptr();
+ if (!menu)
+ return -1;
+
+ shader = menu->shader;
+ if (!shader)
+ return -1;
+ shader_pass = &shader->pass[pass];
+ if (!shader_pass)
+ return -1;
+
+ {
+ unsigned delta = 2;
+ shader_pass->filter = ((shader_pass->filter + delta) % 3);
+
+ }
+#endif
+ return 0;
+}
+
+static int action_left_shader_filter_default(unsigned type, const char *label,
+ bool wraparound)
+{
+#ifdef HAVE_SHADER_MANAGER
+ rarch_setting_t *setting = menu_setting_find("video_smooth");
+ unsigned action = MENU_ACTION_LEFT;
+ if (setting)
+ menu_setting_handler(setting, action);
+#endif
+ return 0;
+}
+
+static int action_left_cheat_num_passes(unsigned type, const char *label,
+ bool wraparound)
+{
+ unsigned new_size = 0;
+ global_t *global = global_get_ptr();
+ cheat_manager_t *cheat = global->cheat;
+ menu_handle_t *menu = menu_driver_get_ptr();
+ if (!menu)
+ return -1;
+
+ if (!cheat)
+ return -1;
+
+ if (cheat->size)
+ new_size = cheat->size - 1;
+ menu_set_refresh();
+
+ if (menu_needs_refresh())
+ cheat_manager_realloc(cheat, new_size);
+
+ return 0;
+}
+
+static int action_left_shader_num_passes(unsigned type, const char *label,
+ bool wraparound)
+{
+#ifdef HAVE_SHADER_MANAGER
+ struct video_shader *shader = NULL;
+ menu_handle_t *menu = menu_driver_get_ptr();
+ if (!menu)
+ return -1;
+
+ shader = menu->shader;
+ if (!shader)
+ return -1;
+
+ if (shader->passes)
+ shader->passes--;
+ menu_set_refresh();
+
+ if (menu_needs_refresh())
+ video_shader_resolve_parameters(NULL, menu->shader);
+
+#endif
+ return 0;
+}
+
+static int action_left_video_resolution(unsigned type, const char *label,
+ bool wraparound)
+{
+ global_t *global = global_get_ptr();
+
+ (void)global;
+
+#if defined(__CELLOS_LV2__)
+ if (global->console.screen.resolutions.current.idx)
+ {
+ global->console.screen.resolutions.current.idx--;
+ global->console.screen.resolutions.current.id =
+ global->console.screen.resolutions.list
+ [global->console.screen.resolutions.current.idx];
+ }
+#else
+ video_driver_get_video_output_prev();
+#endif
+
+ return 0;
+}
+
+static int core_setting_left(unsigned type, const char *label,
+ bool wraparound)
+{
+ unsigned idx = type - MENU_SETTINGS_CORE_OPTION_START;
+ global_t *global = global_get_ptr();
+
+ (void)label;
+
+ core_option_prev(global->system.core_options, idx);
+
+ return 0;
+}
+
+static int disk_options_disk_idx_left(unsigned type, const char *label,
+ bool wraparound)
+{
+ event_command(EVENT_CMD_DISK_PREV);
+
+ return 0;
+}
+
+static int bind_left_generic(unsigned type, const char *label,
+ bool wraparound)
+{
+ unsigned action = MENU_ACTION_LEFT;
+ return menu_setting_set(type, label, action, wraparound);
+}
+
+void menu_entries_cbs_init_bind_left(menu_file_list_cbs_t *cbs,
+ const char *path, const char *label, unsigned type, size_t idx,
+ const char *elem0, const char *elem1, const char *menu_label)
+{
+ int i;
+
+ if (!cbs)
+ return;
+
+ if (label)
+ {
+ if (menu_entries_common_is_settings_entry(elem0))
+ {
+ cbs->action_left = action_left_scroll;
+ return;
+ }
+ }
+
+ cbs->action_left = bind_left_generic;
+
+ switch (type)
+ {
+ case MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_INDEX:
+ cbs->action_left = disk_options_disk_idx_left;
+ break;
+ case MENU_FILE_PLAIN:
+ case MENU_FILE_DIRECTORY:
+ case MENU_FILE_CARCHIVE:
+ case MENU_FILE_CORE:
+ case MENU_FILE_RDB:
+ case MENU_FILE_RDB_ENTRY:
+ case MENU_FILE_CURSOR:
+ case MENU_FILE_SHADER:
+ case MENU_FILE_SHADER_PRESET:
+ case MENU_FILE_IMAGE:
+ case MENU_FILE_OVERLAY:
+ case MENU_FILE_VIDEOFILTER:
+ case MENU_FILE_AUDIOFILTER:
+ case MENU_FILE_CONFIG:
+ case MENU_FILE_USE_DIRECTORY:
+ case MENU_FILE_PLAYLIST_ENTRY:
+ case MENU_FILE_DOWNLOAD_CORE:
+ case MENU_FILE_CHEAT:
+ case MENU_FILE_REMAP:
+ case MENU_SETTING_GROUP:
+ if (!strcmp(menu_label, "Horizontal Menu")
+ || !strcmp(menu_label, "Main Menu"))
+ cbs->action_left = action_left_mainmenu;
+ else
+ cbs->action_left = action_left_scroll;
+ break;
+ case MENU_SETTING_ACTION:
+ case MENU_FILE_CONTENTLIST_ENTRY:
+ cbs->action_left = action_left_mainmenu;
+ break;
+ }
+
+ if (strstr(label, "rdb_entry"))
+ cbs->action_left = action_left_scroll;
+
+ else if (type >= MENU_SETTINGS_SHADER_PARAMETER_0
+ && type <= MENU_SETTINGS_SHADER_PARAMETER_LAST)
+ cbs->action_left = shader_action_parameter_left;
+ else if (type >= MENU_SETTINGS_SHADER_PRESET_PARAMETER_0
+ && type <= MENU_SETTINGS_SHADER_PRESET_PARAMETER_LAST)
+ cbs->action_left = shader_action_parameter_preset_left;
+ else if (type >= MENU_SETTINGS_CHEAT_BEGIN
+ && type <= MENU_SETTINGS_CHEAT_END)
+ cbs->action_left = action_left_cheat;
+ else if (type >= MENU_SETTINGS_INPUT_DESC_BEGIN
+ && type <= MENU_SETTINGS_INPUT_DESC_END)
+ cbs->action_left = action_left_input_desc;
+ else if (!strcmp(label, "savestate") ||
+ !strcmp(label, "loadstate"))
+ cbs->action_left = action_left_save_state;
+ else if (!strcmp(label, "video_shader_scale_pass"))
+ cbs->action_left = action_left_shader_scale_pass;
+ else if (!strcmp(label, "video_shader_filter_pass"))
+ cbs->action_left = action_left_shader_filter_pass;
+ else if (!strcmp(label, "video_shader_default_filter"))
+ cbs->action_left = action_left_shader_filter_default;
+ else if (!strcmp(label, "video_shader_num_passes"))
+ cbs->action_left = action_left_shader_num_passes;
+ else if (!strcmp(label, "cheat_num_passes"))
+ cbs->action_left = action_left_cheat_num_passes;
+ else if (type == MENU_SETTINGS_VIDEO_RESOLUTION)
+ cbs->action_left = action_left_video_resolution;
+ else if ((type >= MENU_SETTINGS_CORE_OPTION_START))
+ cbs->action_left = core_setting_left;
+
+ for (i = 0; i < MAX_USERS; i++)
+ {
+ char label_setting[PATH_MAX_LENGTH];
+ snprintf(label_setting, sizeof(label_setting), "input_player%d_joypad_index", i + 1);
+
+ if (!strcmp(label, label_setting))
+ cbs->action_left = bind_left_generic;
+ }
+}
diff --git a/menu/menu_entries_cbs_right.c b/menu/menu_entries_cbs_right.c
new file mode 100644
index 0000000000..0197693a36
--- /dev/null
+++ b/menu/menu_entries_cbs_right.c
@@ -0,0 +1,443 @@
+/* RetroArch - A frontend for libretro.
+ * Copyright (C) 2011-2015 - Daniel De Matteis
+ *
+ * RetroArch is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Found-
+ * ation, either version 3 of the License, or (at your option) any later version.
+ *
+ * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with RetroArch.
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <file/file_path.h>
+#include "menu.h"
+#include "menu_entries_cbs.h"
+#include "menu_setting.h"
+#include "menu_shader.h"
+#include "menu_navigation.h"
+
+#include "../retroarch.h"
+
+
+#ifdef HAVE_SHADER_MANAGER
+static void shader_action_parameter_right_common(
+ struct video_shader_parameter *param,
+ struct video_shader *shader)
+{
+ if (!shader)
+ return;
+
+ param->current += param->step;
+ param->current = min(max(param->minimum, param->current), param->maximum);
+}
+#endif
+
+static int shader_action_parameter_right(unsigned type, const char *label, bool wraparound)
+{
+#ifdef HAVE_SHADER_MANAGER
+ struct video_shader *shader = video_shader_driver_get_current_shader();
+ struct video_shader_parameter *param =
+ &shader->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0];
+
+ shader_action_parameter_right_common(param, shader);
+#endif
+ return 0;
+}
+
+static int shader_action_parameter_preset_right(unsigned type, const char *label,
+ bool wraparound)
+{
+#ifdef HAVE_SHADER_MANAGER
+ struct video_shader_parameter *param = NULL;
+ menu_handle_t *menu = menu_driver_get_ptr();
+ struct video_shader *shader = menu ? menu->shader : NULL;
+ if (!menu || !shader)
+ return -1;
+
+ param = &shader->parameters[type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0];
+
+ shader_action_parameter_right_common(param, shader);
+#endif
+ return 0;
+}
+
+static int action_right_cheat(unsigned type, const char *label,
+ bool wraparound)
+{
+ global_t *global = global_get_ptr();
+ cheat_manager_t *cheat = global->cheat;
+ size_t idx = type - MENU_SETTINGS_CHEAT_BEGIN;
+
+ if (!cheat)
+ return -1;
+
+ cheat->cheats[idx].state = !cheat->cheats[idx].state;
+ cheat_manager_update(cheat, idx);
+
+ return 0;
+}
+
+static int action_right_input_desc(unsigned type, const char *label,
+ bool wraparound)
+{
+ unsigned inp_desc_index_offset = type - MENU_SETTINGS_INPUT_DESC_BEGIN;
+ unsigned inp_desc_user = inp_desc_index_offset / RARCH_FIRST_META_KEY;
+ unsigned inp_desc_button_index_offset = inp_desc_index_offset - (inp_desc_user * RARCH_FIRST_META_KEY);
+ settings_t *settings = config_get_ptr();
+
+ if (settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset] < RARCH_FIRST_META_KEY)
+ settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset]++;
+
+ return 0;
+}
+
+static int action_right_save_state(unsigned type, const char *label,
+ bool wraparound)
+{
+ settings_t *settings = config_get_ptr();
+
+ settings->state_slot++;
+
+ return 0;
+}
+
+static int action_right_scroll(unsigned type, const char *label,
+ bool wraparound)
+{
+ unsigned scroll_speed = 0, fast_scroll_speed = 0;
+ menu_list_t *menu_list = menu_list_get_ptr();
+ menu_navigation_t *nav = menu_navigation_get_ptr();
+ if (!nav || !menu_list)
+ return -1;
+
+ scroll_speed = (max(nav->scroll.acceleration, 2) - 2) / 4 + 1;
+ fast_scroll_speed = 4 + 4 * scroll_speed;
+
+ if (nav->selection_ptr + fast_scroll_speed < (menu_list_get_size(menu_list)))
+ menu_navigation_set(nav, nav->selection_ptr + fast_scroll_speed, true);
+ else
+ {
+ if ((menu_list_get_size(menu_list) > 0))
+ menu_navigation_set_last(nav);
+ }
+
+ return 0;
+}
+
+static int action_right_mainmenu(unsigned type, const char *label,
+ bool wraparound)
+{
+ menu_file_list_cbs_t *cbs = NULL;
+ unsigned push_list = 0;
+ driver_t *driver = driver_get_ptr();
+ menu_list_t *menu_list = menu_list_get_ptr();
+ menu_handle_t *menu = menu_driver_get_ptr();
+ unsigned action = MENU_ACTION_RIGHT;
+ if (!menu)
+ return -1;
+
+ if (file_list_get_size(menu_list->menu_stack) == 1)
+ {
+
+ if (!strcmp(driver->menu_ctx->ident, "xmb"))
+ {
+ menu->navigation.selection_ptr = 0;
+ if (menu->categories.selection_ptr != (menu->categories.size - 1))
+ push_list = 1;
+ }
+ }
+ else
+ push_list = 2;
+
+ cbs = menu_list_get_actiondata_at_offset(menu_list->selection_buf,
+ menu->navigation.selection_ptr);
+
+ switch (push_list)
+ {
+ case 1:
+ menu_driver_list_cache(true, action);
+
+ if (cbs && cbs->action_content_list_switch)
+ return cbs->action_content_list_switch(
+ menu_list->selection_buf, menu_list->menu_stack,
+ "", "", 0);
+ break;
+ case 2:
+ action_right_scroll(0, "", false);
+ break;
+ case 0:
+ default:
+ break;
+ }
+
+ return 0;
+}
+
+static int action_right_shader_scale_pass(unsigned type, const char *label,
+ bool wraparound)
+{
+#ifdef HAVE_SHADER_MANAGER
+ unsigned pass = type - MENU_SETTINGS_SHADER_PASS_SCALE_0;
+ struct video_shader *shader = NULL;
+ struct video_shader_pass *shader_pass = NULL;
+ menu_handle_t *menu = menu_driver_get_ptr();
+ if (!menu)
+ return -1;
+
+ shader = menu->shader;
+ if (!shader)
+ return -1;
+ shader_pass = &shader->pass[pass];
+ if (!shader_pass)
+ return -1;
+
+ {
+ unsigned current_scale = shader_pass->fbo.scale_x;
+ unsigned delta = 1;
+ current_scale = (current_scale + delta) % 6;
+
+ shader_pass->fbo.valid = current_scale;
+ shader_pass->fbo.scale_x = shader_pass->fbo.scale_y = current_scale;
+
+ }
+#endif
+ return 0;
+}
+
+static int action_right_shader_filter_pass(unsigned type, const char *label,
+ bool wraparound)
+{
+#ifdef HAVE_SHADER_MANAGER
+ unsigned pass = type - MENU_SETTINGS_SHADER_PASS_FILTER_0;
+ struct video_shader *shader = NULL;
+ struct video_shader_pass *shader_pass = NULL;
+ menu_handle_t *menu = menu_driver_get_ptr();
+ if (!menu)
+ return -1;
+
+ shader = menu->shader;
+ if (!shader)
+ return -1;
+ shader_pass = &shader->pass[pass];
+ if (!shader_pass)
+ return -1;
+
+ unsigned delta = 1;
+ shader_pass->filter = ((shader_pass->filter + delta) % 3);
+#endif
+ return 0;
+}
+
+static int action_right_shader_filter_default(unsigned type, const char *label,
+ bool wraparound)
+{
+#ifdef HAVE_SHADER_MANAGER
+ unsigned action = MENU_ACTION_RIGHT;
+ rarch_setting_t *setting = menu_setting_find("video_smooth");
+ if (setting)
+ menu_setting_handler(setting, action);
+#endif
+ return 0;
+}
+
+static int action_right_cheat_num_passes(unsigned type, const char *label,
+ bool wraparound)
+{
+ unsigned new_size = 0;
+ global_t *global = global_get_ptr();
+ cheat_manager_t *cheat = global->cheat;
+ menu_handle_t *menu = menu_driver_get_ptr();
+ if (!menu)
+ return -1;
+
+ if (!cheat)
+ return -1;
+
+ new_size = cheat->size + 1;
+ menu_set_refresh();
+
+ if (menu_needs_refresh())
+ cheat_manager_realloc(cheat, new_size);
+
+ return 0;
+}
+
+static int action_right_shader_num_passes(unsigned type, const char *label,
+ bool wraparound)
+{
+#ifdef HAVE_SHADER_MANAGER
+ struct video_shader *shader = NULL;
+ menu_handle_t *menu = menu_driver_get_ptr();
+ if (!menu)
+ return -1;
+
+ shader = menu->shader;
+ if (!shader)
+ return -1;
+
+ if ((shader->passes < GFX_MAX_SHADERS))
+ shader->passes++;
+ menu_set_refresh();
+
+ if (menu_needs_refresh())
+ video_shader_resolve_parameters(NULL, menu->shader);
+
+#endif
+ return 0;
+}
+
+static int action_right_video_resolution(unsigned type, const char *label,
+ bool wraparound)
+{
+ global_t *global = global_get_ptr();
+
+ (void)global;
+
+#if defined(__CELLOS_LV2__)
+ if (global->console.screen.resolutions.current.idx + 1 <
+ global->console.screen.resolutions.count)
+ {
+ global->console.screen.resolutions.current.idx++;
+ global->console.screen.resolutions.current.id =
+ global->console.screen.resolutions.list
+ [global->console.screen.resolutions.current.idx];
+ }
+#else
+ video_driver_get_video_output_next();
+#endif
+
+ return 0;
+}
+
+static int core_setting_right(unsigned type, const char *label,
+ bool wraparound)
+{
+ unsigned idx = type - MENU_SETTINGS_CORE_OPTION_START;
+ global_t *global = global_get_ptr();
+
+ (void)label;
+
+ core_option_next(global->system.core_options, idx);
+
+ return 0;
+}
+
+static int disk_options_disk_idx_right(unsigned type, const char *label,
+ bool wraparound)
+{
+ event_command(EVENT_CMD_DISK_NEXT);
+
+ return 0;
+}
+
+static int bind_right_generic(unsigned type, const char *label,
+ bool wraparound)
+{
+ unsigned action = MENU_ACTION_RIGHT;
+ return menu_setting_set(type, label, action, wraparound);
+}
+
+
+void menu_entries_cbs_init_bind_right(menu_file_list_cbs_t *cbs,
+ const char *path, const char *label, unsigned type, size_t idx,
+ const char *elem0, const char *elem1, const char *menu_label)
+{
+ int i;
+
+ if (!cbs)
+ return;
+
+ if (label)
+ {
+ if (menu_entries_common_is_settings_entry(elem0))
+ {
+ cbs->action_right = action_right_scroll;
+ return;
+ }
+ }
+
+ cbs->action_right = bind_right_generic;
+
+ switch (type)
+ {
+ case MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_INDEX:
+ cbs->action_right = disk_options_disk_idx_right;
+ break;
+ case MENU_FILE_PLAIN:
+ case MENU_FILE_DIRECTORY:
+ case MENU_FILE_CARCHIVE:
+ case MENU_FILE_CORE:
+ case MENU_FILE_RDB:
+ case MENU_FILE_RDB_ENTRY:
+ case MENU_FILE_CURSOR:
+ case MENU_FILE_SHADER:
+ case MENU_FILE_SHADER_PRESET:
+ case MENU_FILE_IMAGE:
+ case MENU_FILE_OVERLAY:
+ case MENU_FILE_VIDEOFILTER:
+ case MENU_FILE_AUDIOFILTER:
+ case MENU_FILE_CONFIG:
+ case MENU_FILE_USE_DIRECTORY:
+ case MENU_FILE_PLAYLIST_ENTRY:
+ case MENU_FILE_DOWNLOAD_CORE:
+ case MENU_FILE_CHEAT:
+ case MENU_FILE_REMAP:
+ case MENU_SETTING_GROUP:
+ if (!strcmp(menu_label, "Horizontal Menu")
+ || !strcmp(menu_label, "Main Menu"))
+ cbs->action_right = action_right_mainmenu;
+ else
+ cbs->action_right = action_right_scroll;
+ break;
+ case MENU_SETTING_ACTION:
+ case MENU_FILE_CONTENTLIST_ENTRY:
+ cbs->action_right = action_right_mainmenu;
+ break;
+ }
+
+ if (strstr(label, "rdb_entry"))
+ cbs->action_right = action_right_scroll;
+
+ else if (type >= MENU_SETTINGS_SHADER_PARAMETER_0
+ && type <= MENU_SETTINGS_SHADER_PARAMETER_LAST)
+ cbs->action_right = shader_action_parameter_right;
+ else if (type >= MENU_SETTINGS_SHADER_PRESET_PARAMETER_0
+ && type <= MENU_SETTINGS_SHADER_PRESET_PARAMETER_LAST)
+ cbs->action_right = shader_action_parameter_preset_right;
+ else if (type >= MENU_SETTINGS_CHEAT_BEGIN
+ && type <= MENU_SETTINGS_CHEAT_END)
+ cbs->action_right = action_right_cheat;
+ else if (type >= MENU_SETTINGS_INPUT_DESC_BEGIN
+ && type <= MENU_SETTINGS_INPUT_DESC_END)
+ cbs->action_right = action_right_input_desc;
+ else if (!strcmp(label, "savestate") ||
+ !strcmp(label, "loadstate"))
+ cbs->action_right = action_right_save_state;
+ else if (!strcmp(label, "video_shader_scale_pass"))
+ cbs->action_right = action_right_shader_scale_pass;
+ else if (!strcmp(label, "video_shader_filter_pass"))
+ cbs->action_right = action_right_shader_filter_pass;
+ else if (!strcmp(label, "video_shader_default_filter"))
+ cbs->action_right = action_right_shader_filter_default;
+ else if (!strcmp(label, "video_shader_num_passes"))
+ cbs->action_right = action_right_shader_num_passes;
+ else if (!strcmp(label, "cheat_num_passes"))
+ cbs->action_right = action_right_cheat_num_passes;
+ else if (type == MENU_SETTINGS_VIDEO_RESOLUTION)
+ cbs->action_right = action_right_video_resolution;
+ else if ((type >= MENU_SETTINGS_CORE_OPTION_START))
+ cbs->action_right = core_setting_right;
+
+ for (i = 0; i < MAX_USERS; i++)
+ {
+ char label_setting[PATH_MAX_LENGTH];
+ snprintf(label_setting, sizeof(label_setting), "input_player%d_joypad_index", i + 1);
+
+ if (!strcmp(label, label_setting))
+ cbs->action_right = bind_right_generic;
+ }
+}
diff --git a/menu/menu_entries_cbs_toggle.c b/menu/menu_entries_cbs_toggle.c
deleted file mode 100644
index 7d93c5a35a..0000000000
--- a/menu/menu_entries_cbs_toggle.c
+++ /dev/null
@@ -1,572 +0,0 @@
-/* RetroArch - A frontend for libretro.
- * Copyright (C) 2011-2015 - Daniel De Matteis
- *
- * RetroArch is free software: you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software Found-
- * ation, either version 3 of the License, or (at your option) any later version.
- *
- * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with RetroArch.
- * If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <file/file_path.h>
-#include "menu.h"
-#include "menu_entries_cbs.h"
-#include "menu_setting.h"
-#include "menu_shader.h"
-#include "menu_navigation.h"
-
-#include "../retroarch.h"
-
-
-#ifdef HAVE_SHADER_MANAGER
-static void shader_action_parameter_toggle_common(
- struct video_shader_parameter *param,
- struct video_shader *shader,
- unsigned action)
-{
- if (!shader)
- return;
-
- switch (action)
- {
- case MENU_ACTION_LEFT:
- param->current -= param->step;
- break;
-
- case MENU_ACTION_RIGHT:
- param->current += param->step;
- break;
-
- default:
- break;
- }
-
- param->current = min(max(param->minimum, param->current), param->maximum);
-}
-#endif
-
-static int shader_action_parameter_toggle(unsigned type, const char *label,
- unsigned action, bool wraparound)
-{
-#ifdef HAVE_SHADER_MANAGER
- struct video_shader *shader = video_shader_driver_get_current_shader();
- struct video_shader_parameter *param =
- &shader->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0];
-
- shader_action_parameter_toggle_common(param, shader, action);
-#endif
- return 0;
-}
-
-static int shader_action_parameter_preset_toggle(unsigned type, const char *label,
- unsigned action, bool wraparound)
-{
-#ifdef HAVE_SHADER_MANAGER
- struct video_shader_parameter *param = NULL;
- menu_handle_t *menu = menu_driver_get_ptr();
- struct video_shader *shader = menu ? menu->shader : NULL;
- if (!menu || !shader)
- return -1;
-
- param = &shader->parameters[type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0];
-
- shader_action_parameter_toggle_common(param, shader, action);
-#endif
- return 0;
-}
-
-static int action_toggle_cheat(unsigned type, const char *label,
- unsigned action, bool wraparound)
-{
- global_t *global = global_get_ptr();
- cheat_manager_t *cheat = global->cheat;
- size_t idx = type - MENU_SETTINGS_CHEAT_BEGIN;
-
- if (!cheat)
- return -1;
-
- switch (action)
- {
- case MENU_ACTION_LEFT:
- case MENU_ACTION_RIGHT:
- cheat->cheats[idx].state = !cheat->cheats[idx].state;
- cheat_manager_update(cheat, idx);
- break;
- }
-
- return 0;
-}
-
-static int action_toggle_input_desc(unsigned type, const char *label,
- unsigned action, bool wraparound)
-{
- unsigned inp_desc_index_offset = type - MENU_SETTINGS_INPUT_DESC_BEGIN;
- unsigned inp_desc_user = inp_desc_index_offset / RARCH_FIRST_META_KEY;
- unsigned inp_desc_button_index_offset = inp_desc_index_offset - (inp_desc_user * RARCH_FIRST_META_KEY);
- settings_t *settings = config_get_ptr();
-
- switch (action)
- {
- case MENU_ACTION_LEFT:
- if (settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset] > 0)
- settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset]--;
- break;
- case MENU_ACTION_RIGHT:
- if (settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset] < RARCH_FIRST_META_KEY)
- settings->input.remap_ids[inp_desc_user][inp_desc_button_index_offset]++;
- break;
- }
-
- return 0;
-}
-
-static int action_toggle_save_state(unsigned type, const char *label,
- unsigned action, bool wraparound)
-{
- settings_t *settings = config_get_ptr();
-
- switch (action)
- {
- case MENU_ACTION_LEFT:
- /* Slot -1 is (auto) slot. */
- if (settings->state_slot >= 0)
- settings->state_slot--;
- break;
- case MENU_ACTION_RIGHT:
- settings->state_slot++;
- break;
- }
-
- return 0;
-}
-
-static int action_toggle_scroll(unsigned type, const char *label,
- unsigned action, bool wraparound)
-{
- unsigned scroll_speed = 0, fast_scroll_speed = 0;
- menu_list_t *menu_list = menu_list_get_ptr();
- menu_navigation_t *nav = menu_navigation_get_ptr();
- if (!nav || !menu_list)
- return -1;
-
- scroll_speed = (max(nav->scroll.acceleration, 2) - 2) / 4 + 1;
- fast_scroll_speed = 4 + 4 * scroll_speed;
-
- switch (action)
- {
- case MENU_ACTION_LEFT:
- if (nav->selection_ptr > fast_scroll_speed)
- menu_navigation_set(nav, nav->selection_ptr - fast_scroll_speed, true);
- else
- menu_navigation_clear(nav, false);
- break;
- case MENU_ACTION_RIGHT:
- if (nav->selection_ptr + fast_scroll_speed < (menu_list_get_size(menu_list)))
- menu_navigation_set(nav, nav->selection_ptr + fast_scroll_speed, true);
- else
- {
- if ((menu_list_get_size(menu_list) > 0))
- menu_navigation_set_last(nav);
- }
- break;
- }
-
- return 0;
-}
-
-static int action_toggle_mainmenu(unsigned type, const char *label,
- unsigned action, bool wraparound)
-{
- menu_file_list_cbs_t *cbs = NULL;
- unsigned push_list = 0;
- driver_t *driver = driver_get_ptr();
- menu_list_t *menu_list = menu_list_get_ptr();
- menu_handle_t *menu = menu_driver_get_ptr();
- if (!menu)
- return -1;
-
- if (file_list_get_size(menu_list->menu_stack) == 1)
- {
-
- if (!strcmp(driver->menu_ctx->ident, "xmb"))
- {
- menu->navigation.selection_ptr = 0;
- switch (action)
- {
- case MENU_ACTION_LEFT:
- if (menu->categories.selection_ptr == 0)
- break;
- push_list = 1;
- break;
- case MENU_ACTION_RIGHT:
- if (menu->categories.selection_ptr == (menu->categories.size - 1))
- break;
- push_list = 1;
- break;
- }
- }
- }
- else
- push_list = 2;
-
- cbs = menu_list_get_actiondata_at_offset(menu_list->selection_buf,
- menu->navigation.selection_ptr);
-
- switch (push_list)
- {
- case 1:
- menu_driver_list_cache(true, action);
-
- if (cbs && cbs->action_content_list_switch)
- return cbs->action_content_list_switch(
- menu_list->selection_buf, menu_list->menu_stack,
- "", "", 0);
- break;
- case 2:
- action_toggle_scroll(0, "", action, false);
- break;
- case 0:
- default:
- break;
- }
-
- return 0;
-}
-
-static int action_toggle_shader_scale_pass(unsigned type, const char *label,
- unsigned action, bool wraparound)
-{
-#ifdef HAVE_SHADER_MANAGER
- unsigned pass = type - MENU_SETTINGS_SHADER_PASS_SCALE_0;
- struct video_shader *shader = NULL;
- struct video_shader_pass *shader_pass = NULL;
- menu_handle_t *menu = menu_driver_get_ptr();
- if (!menu)
- return -1;
-
- shader = menu->shader;
- if (!shader)
- return -1;
- shader_pass = &shader->pass[pass];
- if (!shader_pass)
- return -1;
-
- switch (action)
- {
- case MENU_ACTION_LEFT:
- case MENU_ACTION_RIGHT:
- {
- unsigned current_scale = shader_pass->fbo.scale_x;
- unsigned delta = (action == MENU_ACTION_LEFT) ? 5 : 1;
- current_scale = (current_scale + delta) % 6;
-
- shader_pass->fbo.valid = current_scale;
- shader_pass->fbo.scale_x = shader_pass->fbo.scale_y = current_scale;
-
- }
- break;
- }
-#endif
- return 0;
-}
-
-static int action_toggle_shader_filter_pass(unsigned type, const char *label,
- unsigned action, bool wraparound)
-{
-#ifdef HAVE_SHADER_MANAGER
- unsigned pass = type - MENU_SETTINGS_SHADER_PASS_FILTER_0;
- struct video_shader *shader = NULL;
- struct video_shader_pass *shader_pass = NULL;
- menu_handle_t *menu = menu_driver_get_ptr();
- if (!menu)
- return -1;
-
- shader = menu->shader;
- if (!shader)
- return -1;
- shader_pass = &shader->pass[pass];
- if (!shader_pass)
- return -1;
-
- switch (action)
- {
- case MENU_ACTION_LEFT:
- case MENU_ACTION_RIGHT:
- {
- unsigned delta = (action == MENU_ACTION_LEFT) ? 2 : 1;
- shader_pass->filter = ((shader_pass->filter + delta) % 3);
-
- }
- break;
- }
-#endif
- return 0;
-}
-
-static int action_toggle_shader_filter_default(unsigned type, const char *label,
- unsigned action, bool wraparound)
-{
-#ifdef HAVE_SHADER_MANAGER
- rarch_setting_t *setting = menu_setting_find("video_smooth");
- if (setting)
- menu_setting_handler(setting, action);
-#endif
- return 0;
-}
-
-static int action_toggle_cheat_num_passes(unsigned type, const char *label,
- unsigned action, bool wraparound)
-{
- unsigned new_size = 0;
- global_t *global = global_get_ptr();
- cheat_manager_t *cheat = global->cheat;
- menu_handle_t *menu = menu_driver_get_ptr();
- if (!menu)
- return -1;
-
- if (!cheat)
- return -1;
-
- switch (action)
- {
- case MENU_ACTION_LEFT:
- if (cheat->size)
- new_size = cheat->size - 1;
- menu_set_refresh();
- break;
-
- case MENU_ACTION_RIGHT:
- new_size = cheat->size + 1;
- menu_set_refresh();
- break;
- }
-
- if (menu_needs_refresh())
- cheat_manager_realloc(cheat, new_size);
-
- return 0;
-}
-
-static int action_toggle_shader_num_passes(unsigned type, const char *label,
- unsigned action, bool wraparound)
-{
-#ifdef HAVE_SHADER_MANAGER
- struct video_shader *shader = NULL;
- menu_handle_t *menu = menu_driver_get_ptr();
- if (!menu)
- return -1;
-
- shader = menu->shader;
- if (!shader)
- return -1;
-
- switch (action)
- {
- case MENU_ACTION_LEFT:
- if (shader->passes)
- shader->passes--;
- menu_set_refresh();
- break;
-
- case MENU_ACTION_RIGHT:
- if ((shader->passes < GFX_MAX_SHADERS))
- shader->passes++;
- menu_set_refresh();
- break;
- }
-
- if (menu_needs_refresh())
- video_shader_resolve_parameters(NULL, menu->shader);
-
-#endif
- return 0;
-}
-
-static int action_toggle_video_resolution(unsigned type, const char *label,
- unsigned action, bool wraparound)
-{
- global_t *global = global_get_ptr();
-
- (void)global;
-
-#if defined(__CELLOS_LV2__)
- switch (action)
- {
- case MENU_ACTION_LEFT:
- if (global->console.screen.resolutions.current.idx)
- {
- global->console.screen.resolutions.current.idx--;
- global->console.screen.resolutions.current.id =
- global->console.screen.resolutions.list
- [global->console.screen.resolutions.current.idx];
- }
- break;
- case MENU_ACTION_RIGHT:
- if (global->console.screen.resolutions.current.idx + 1 <
- global->console.screen.resolutions.count)
- {
- global->console.screen.resolutions.current.idx++;
- global->console.screen.resolutions.current.id =
- global->console.screen.resolutions.list
- [global->console.screen.resolutions.current.idx];
- }
- break;
- }
-#else
- switch (action)
- {
- case MENU_ACTION_LEFT:
- video_driver_get_video_output_prev();
- break;
- case MENU_ACTION_RIGHT:
- video_driver_get_video_output_next();
- break;
- }
-#endif
-
- return 0;
-}
-
-static int core_setting_toggle(unsigned type, const char *label,
- unsigned action, bool wraparound)
-{
- unsigned idx = type - MENU_SETTINGS_CORE_OPTION_START;
- global_t *global = global_get_ptr();
-
- (void)label;
-
- switch (action)
- {
- case MENU_ACTION_LEFT:
- core_option_prev(global->system.core_options, idx);
- break;
-
- case MENU_ACTION_RIGHT:
- core_option_next(global->system.core_options, idx);
- break;
- }
-
- return 0;
-}
-
-static int disk_options_disk_idx_toggle(unsigned type, const char *label,
- unsigned action, bool wraparound)
-{
- switch (action)
- {
- case MENU_ACTION_LEFT:
- event_command(EVENT_CMD_DISK_PREV);
- break;
- case MENU_ACTION_RIGHT:
- event_command(EVENT_CMD_DISK_NEXT);
- break;
- }
-
- return 0;
-}
-
-
-void menu_entries_cbs_init_bind_toggle(menu_file_list_cbs_t *cbs,
- const char *path, const char *label, unsigned type, size_t idx,
- const char *elem0, const char *elem1, const char *menu_label)
-{
- int i;
-
- if (!cbs)
- return;
-
- if (label)
- {
- if (menu_entries_common_is_settings_entry(elem0))
- {
- cbs->action_toggle = action_toggle_scroll;
- return;
- }
- }
-
- cbs->action_toggle = menu_setting_set;
-
- switch (type)
- {
- case MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_INDEX:
- cbs->action_toggle = disk_options_disk_idx_toggle;
- break;
- case MENU_FILE_PLAIN:
- case MENU_FILE_DIRECTORY:
- case MENU_FILE_CARCHIVE:
- case MENU_FILE_CORE:
- case MENU_FILE_RDB:
- case MENU_FILE_RDB_ENTRY:
- case MENU_FILE_CURSOR:
- case MENU_FILE_SHADER:
- case MENU_FILE_SHADER_PRESET:
- case MENU_FILE_IMAGE:
- case MENU_FILE_OVERLAY:
- case MENU_FILE_VIDEOFILTER:
- case MENU_FILE_AUDIOFILTER:
- case MENU_FILE_CONFIG:
- case MENU_FILE_USE_DIRECTORY:
- case MENU_FILE_PLAYLIST_ENTRY:
- case MENU_FILE_DOWNLOAD_CORE:
- case MENU_FILE_CHEAT:
- case MENU_FILE_REMAP:
- case MENU_SETTING_GROUP:
- if (!strcmp(menu_label, "Horizontal Menu")
- || !strcmp(menu_label, "Main Menu"))
- cbs->action_toggle = action_toggle_mainmenu;
- else
- cbs->action_toggle = action_toggle_scroll;
- break;
- case MENU_SETTING_ACTION:
- case MENU_FILE_CONTENTLIST_ENTRY:
- cbs->action_toggle = action_toggle_mainmenu;
- break;
- }
-
- if (strstr(label, "rdb_entry"))
- cbs->action_toggle = action_toggle_scroll;
-
- else if (type >= MENU_SETTINGS_SHADER_PARAMETER_0
- && type <= MENU_SETTINGS_SHADER_PARAMETER_LAST)
- cbs->action_toggle = shader_action_parameter_toggle;
- else if (type >= MENU_SETTINGS_SHADER_PRESET_PARAMETER_0
- && type <= MENU_SETTINGS_SHADER_PRESET_PARAMETER_LAST)
- cbs->action_toggle = shader_action_parameter_preset_toggle;
- else if (type >= MENU_SETTINGS_CHEAT_BEGIN
- && type <= MENU_SETTINGS_CHEAT_END)
- cbs->action_toggle = action_toggle_cheat;
- else if (type >= MENU_SETTINGS_INPUT_DESC_BEGIN
- && type <= MENU_SETTINGS_INPUT_DESC_END)
- cbs->action_toggle = action_toggle_input_desc;
- else if (!strcmp(label, "savestate") ||
- !strcmp(label, "loadstate"))
- cbs->action_toggle = action_toggle_save_state;
- else if (!strcmp(label, "video_shader_scale_pass"))
- cbs->action_toggle = action_toggle_shader_scale_pass;
- else if (!strcmp(label, "video_shader_filter_pass"))
- cbs->action_toggle = action_toggle_shader_filter_pass;
- else if (!strcmp(label, "video_shader_default_filter"))
- cbs->action_toggle = action_toggle_shader_filter_default;
- else if (!strcmp(label, "video_shader_num_passes"))
- cbs->action_toggle = action_toggle_shader_num_passes;
- else if (!strcmp(label, "cheat_num_passes"))
- cbs->action_toggle = action_toggle_cheat_num_passes;
- else if (type == MENU_SETTINGS_VIDEO_RESOLUTION)
- cbs->action_toggle = action_toggle_video_resolution;
- else if ((type >= MENU_SETTINGS_CORE_OPTION_START))
- cbs->action_toggle = core_setting_toggle;
-
- for (i = 0; i < MAX_USERS; i++)
- {
- char label_setting[PATH_MAX_LENGTH];
- snprintf(label_setting, sizeof(label_setting), "input_player%d_joypad_index", i + 1);
-
- if (!strcmp(label, label_setting))
- cbs->action_toggle = menu_setting_set;
- }
-}
diff --git a/menu/menu_entry.c b/menu/menu_entry.c
index 6c7df3d2e8..dbc5036158 100644
--- a/menu/menu_entry.c
+++ b/menu/menu_entry.c
@@ -414,7 +414,7 @@ int menu_entry_select(uint32_t i)
{
if (cbs && cbs->action_start)
action = MENU_ACTION_START;
- if (cbs && cbs->action_toggle)
+ if (cbs && cbs->action_right)
action = MENU_ACTION_RIGHT;
}
@@ -487,9 +487,12 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action)
return cbs->action_start(entry->type, entry->label);
break;
case MENU_ACTION_LEFT:
+ if (cbs && cbs->action_left)
+ return cbs->action_left(entry->type, entry->label, false);
+ break;
case MENU_ACTION_RIGHT:
- if (cbs && cbs->action_toggle)
- return cbs->action_toggle(entry->type, entry->label, action, false);
+ if (cbs && cbs->action_right)
+ return cbs->action_right(entry->type, entry->label, false);
break;
case MENU_ACTION_SELECT:
if (cbs && cbs->action_select)
diff --git a/menu/menu_input.c b/menu/menu_input.c
index a419a095f9..636061d48e 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -768,7 +768,7 @@ static int menu_input_mouse_post_iterate(uint64_t *input_mouse,
return 0;
}
if (menu->mouse.ptr == nav->selection_ptr
- && cbs && cbs->action_toggle && setting &&
+ && cbs && cbs->action_right && setting &&
(setting->type == ST_BOOL || setting->type == ST_UINT || setting->type == ST_FLOAT
|| setting->type == ST_STRING))
{
@@ -823,7 +823,7 @@ static int pointer_tap(menu_file_list_cbs_t *cbs,
menu_list->selection_buf->list[nav->selection_ptr].label);
if (menu->pointer.ptr == menu->navigation.selection_ptr
- && cbs && cbs->action_toggle && setting &&
+ && cbs && cbs->action_right && setting &&
(setting->type == ST_BOOL || setting->type == ST_UINT
|| setting->type == ST_FLOAT || setting->type == ST_STRING))
return menu_entry_action(entry, menu->navigation.selection_ptr, MENU_ACTION_RIGHT);
diff --git a/menu/menu_list.h b/menu/menu_list.h
index 1fe42cc01b..53cb3cf6a5 100644
--- a/menu/menu_list.h
+++ b/menu/menu_list.h
@@ -44,8 +44,8 @@ typedef struct menu_file_list_cbs
int (*action_select)(unsigned type, const char *label);
int (*action_content_list_switch)(void *data, void *userdata, const char
*path, const char *label, unsigned type);
- int (*action_toggle)(unsigned type, const char *label, unsigned action,
- bool wraparound);
+ int (*action_left)(unsigned type, const char *label, bool wraparound);
+ int (*action_right)(unsigned type, const char *label, bool wraparound);
int (*action_refresh)(file_list_t *list, file_list_t *menu_list);
int (*action_up)(unsigned type, const char *label);
int (*action_down)(unsigned type, const char *label);