mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-04-14 12:56:37 +02:00
parent f5005cac96
commit 930913ee8b
4 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
menu/menu.c
View File

@ -88,11 +88,12 @@ static void menu_environment_get(int *argc, char *argv[],
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
if (!wrap_args) if (!wrap_args)
return; return;
wrap_args->no_content = driver->menu->load_no_content; wrap_args->no_content = menu->load_no_content;
if (!global->has_set_verbosity) if (!global->has_set_verbosity)
wrap_args->verbose = global->verbosity; wrap_args->verbose = global->verbosity;
@ -140,12 +141,13 @@ static void push_to_history_playlist(void)
**/ **/
bool menu_load_content(void) bool menu_load_content(void)
{ {
menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
/* redraw menu frame */ /* redraw menu frame */
if (driver->menu) if (menu)
driver->menu->msg_force = true; menu->msg_force = true;
menu_driver_entry_iterate(MENU_ACTION_NOOP); menu_driver_entry_iterate(MENU_ACTION_NOOP);
@ -160,17 +162,17 @@ bool menu_load_content(void)
snprintf(msg, sizeof(msg), "Failed to load %s.\n", name); snprintf(msg, sizeof(msg), "Failed to load %s.\n", name);
rarch_main_msg_queue_push(msg, 1, 90, false); rarch_main_msg_queue_push(msg, 1, 90, false);
if (driver->menu) if (menu)
driver->menu->msg_force = true; menu->msg_force = true;
return false; return false;
} }
menu_shader_manager_init(driver->menu); menu_shader_manager_init(menu);
event_command(EVENT_CMD_HISTORY_INIT); event_command(EVENT_CMD_HISTORY_INIT);
if (*global->fullpath || (driver->menu && driver->menu->load_no_content)) if (*global->fullpath || (menu && menu->load_no_content))
push_to_history_playlist(); push_to_history_playlist();
event_command(EVENT_CMD_VIDEO_SET_ASPECT_RATIO); event_command(EVENT_CMD_VIDEO_SET_ASPECT_RATIO);

10
menu/menu_input.c
View File

@ -180,7 +180,7 @@ void menu_input_search_start(void)
menu->keyboard.display = true; menu->keyboard.display = true;
menu->keyboard.label = "Search: "; menu->keyboard.label = "Search: ";
menu->keyboard.buffer = menu->keyboard.buffer =
input_keyboard_start_line(driver->menu, menu_input_search_callback); input_keyboard_start_line(menu, menu_input_search_callback);
} }
void menu_input_key_event(bool down, unsigned keycode, void menu_input_key_event(bool down, unsigned keycode,
@ -683,8 +683,8 @@ static int menu_input_mouse_post_iterate(menu_file_list_cbs_t *cbs,
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
rarch_setting_t *setting = rarch_setting_t *setting =
(rarch_setting_t*)setting_find_setting (rarch_setting_t*)setting_find_setting
(driver->menu->list_settings, (menu->list_settings,
driver->menu->menu_list->selection_buf->list[menu->navigation.selection_ptr].label); menu->menu_list->selection_buf->list[menu->navigation.selection_ptr].label);
menu->mouse.oldleft = true; menu->mouse.oldleft = true;
#if 0 #if 0
@ -768,8 +768,8 @@ static int menu_input_pointer_post_iterate(menu_file_list_cbs_t *cbs,
menu->pointer.oldpressed[0] = false; menu->pointer.oldpressed[0] = false;
setting = (rarch_setting_t*)setting_find_setting setting = (rarch_setting_t*)setting_find_setting
(driver->menu->list_settings, (menu->list_settings,
driver->menu->menu_list->selection_buf->list[menu->navigation.selection_ptr].label); menu->menu_list->selection_buf->list[menu->navigation.selection_ptr].label);
if (menu->mouse.ptr == menu->navigation.selection_ptr && !menu->pointer.cancel if (menu->mouse.ptr == menu->navigation.selection_ptr && !menu->pointer.cancel
&& cbs && cbs->action_toggle && setting && && cbs && cbs->action_toggle && setting &&

8
menu/menu_navigation.c
View File

@ -46,6 +46,7 @@ void menu_navigation_clear(menu_navigation_t *nav, bool pending_push)
void menu_navigation_decrement(menu_navigation_t *nav, unsigned scroll_speed) void menu_navigation_decrement(menu_navigation_t *nav, unsigned scroll_speed)
{ {
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (!nav) if (!nav)
@ -58,7 +59,7 @@ void menu_navigation_decrement(menu_navigation_t *nav, unsigned scroll_speed)
{ {
if (settings->menu.navigation.wraparound.vertical_enable) if (settings->menu.navigation.wraparound.vertical_enable)
menu_navigation_set(nav, menu_navigation_set(nav,
menu_list_get_size(driver->menu->menu_list) - 1, true); menu_list_get_size(menu->menu_list) - 1, true);
else else
menu_navigation_set(nav, 0, true); menu_navigation_set(nav, 0, true);
} }
@ -75,11 +76,12 @@ void menu_navigation_increment(menu_navigation_t *nav, unsigned scroll_speed)
{ {
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
if (!nav) if (!nav)
return; return;
if (nav->selection_ptr + scroll_speed < (menu_list_get_size(driver->menu->menu_list))) if (nav->selection_ptr + scroll_speed < (menu_list_get_size(menu->menu_list)))
menu_navigation_set(nav, menu_navigation_set(nav,
nav->selection_ptr + scroll_speed, true); nav->selection_ptr + scroll_speed, true);
else else
@ -88,7 +90,7 @@ void menu_navigation_increment(menu_navigation_t *nav, unsigned scroll_speed)
menu_navigation_clear(nav, false); menu_navigation_clear(nav, false);
else else
menu_navigation_set(nav, menu_navigation_set(nav,
menu_list_get_size(driver->menu->menu_list) - 1, true); menu_list_get_size(menu->menu_list) - 1, true);
} }
menu_driver_navigation_increment(); menu_driver_navigation_increment();

19
menu/menu_setting.c
View File

@ -99,7 +99,9 @@ int menu_setting_handler(rarch_setting_t *setting, unsigned action)
static int menu_action_handle_setting(rarch_setting_t *setting, static int menu_action_handle_setting(rarch_setting_t *setting,
unsigned type, unsigned action, bool wraparound) unsigned type, unsigned action, bool wraparound)
{ {
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
if (!setting) if (!setting)
return -1; return -1;
@ -108,11 +110,11 @@ static int menu_action_handle_setting(rarch_setting_t *setting,
case ST_PATH: case ST_PATH:
if (action == MENU_ACTION_OK) if (action == MENU_ACTION_OK)
menu_list_push_stack_refresh( menu_list_push_stack_refresh(
driver->menu->menu_list, menu->menu_list,
setting->default_value.string, setting->default_value.string,
setting->name, setting->name,
type, type,
driver->menu->navigation.selection_ptr); menu->navigation.selection_ptr);
/* fall-through. */ /* fall-through. */
case ST_BOOL: case ST_BOOL:
case ST_INT: case ST_INT:
@ -133,11 +135,13 @@ static int menu_action_handle_setting(rarch_setting_t *setting,
rarch_setting_t *menu_setting_find(const char *label) rarch_setting_t *menu_setting_find(const char *label)
{ {
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
if (!driver) if (!driver)
return NULL; return NULL;
return (rarch_setting_t*)setting_find_setting( return (rarch_setting_t*)setting_find_setting(
driver->menu->list_settings, label); menu->list_settings, label);
} }
int menu_setting_set(unsigned type, const char *label, int menu_setting_set(unsigned type, const char *label,
@ -146,13 +150,14 @@ int menu_setting_set(unsigned type, const char *label,
int ret = 0; int ret = 0;
rarch_setting_t *setting = NULL; rarch_setting_t *setting = NULL;
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr();
if (!driver) if (!driver)
return 0; return 0;
setting = menu_setting_find( setting = menu_setting_find(
driver->menu->menu_list->selection_buf->list menu->menu_list->selection_buf->list
[driver->menu->navigation.selection_ptr].label); [menu->navigation.selection_ptr].label);
if (!setting) if (!setting)
return 0; return 0;