mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 07:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly namespace menu_navigation.c functions

Browse Source
This commit is contained in:
twinaphex 2014-10-17 21:25:33 +02:00
parent 3164aebab7
commit 858d859d3d
6 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
frontend/menu/backend/menu_common_backend.c
View File

@ -205,18 +205,18 @@ static int menu_settings_iterate(unsigned action,
{ {
case MENU_ACTION_UP: case MENU_ACTION_UP:
if (driver.menu->selection_ptr > 0) if (driver.menu->selection_ptr > 0)
menu_decrement_navigation(driver.menu); menu_navigation_decrement(driver.menu);
else else
menu_set_navigation(driver.menu, menu_navigation_set(driver.menu,
file_list_get_size(driver.menu->selection_buf) - 1); file_list_get_size(driver.menu->selection_buf) - 1);
break; break;
case MENU_ACTION_DOWN: case MENU_ACTION_DOWN:
if ((driver.menu->selection_ptr + 1) < if ((driver.menu->selection_ptr + 1) <
file_list_get_size(driver.menu->selection_buf)) file_list_get_size(driver.menu->selection_buf))
menu_increment_navigation(driver.menu); menu_navigation_increment(driver.menu);
else else
menu_clear_navigation(driver.menu, false); menu_navigation_clear(driver.menu, false);
break; break;
case MENU_ACTION_CANCEL: case MENU_ACTION_CANCEL:
@ -584,44 +584,44 @@ static int menu_common_iterate(unsigned action)
{ {
case MENU_ACTION_UP: case MENU_ACTION_UP:
if (driver.menu->selection_ptr >= scroll_speed) if (driver.menu->selection_ptr >= scroll_speed)
menu_set_navigation(driver.menu, menu_navigation_set(driver.menu,
driver.menu->selection_ptr - scroll_speed); driver.menu->selection_ptr - scroll_speed);
else else
menu_set_navigation(driver.menu, menu_navigation_set(driver.menu,
file_list_get_size(driver.menu->selection_buf) - 1); file_list_get_size(driver.menu->selection_buf) - 1);
break; break;
case MENU_ACTION_DOWN: case MENU_ACTION_DOWN:
if (driver.menu->selection_ptr + scroll_speed < if (driver.menu->selection_ptr + scroll_speed <
file_list_get_size(driver.menu->selection_buf)) file_list_get_size(driver.menu->selection_buf))
menu_set_navigation(driver.menu, menu_navigation_set(driver.menu,
driver.menu->selection_ptr + scroll_speed); driver.menu->selection_ptr + scroll_speed);
else else
menu_clear_navigation(driver.menu, false); menu_navigation_clear(driver.menu, false);
break; break;
case MENU_ACTION_LEFT: case MENU_ACTION_LEFT:
if (driver.menu->selection_ptr > fast_scroll_speed) if (driver.menu->selection_ptr > fast_scroll_speed)
menu_set_navigation(driver.menu, menu_navigation_set(driver.menu,
driver.menu->selection_ptr - fast_scroll_speed); driver.menu->selection_ptr - fast_scroll_speed);
else else
menu_clear_navigation(driver.menu, false); menu_navigation_clear(driver.menu, false);
break; break;
case MENU_ACTION_RIGHT: case MENU_ACTION_RIGHT:
if (driver.menu->selection_ptr + fast_scroll_speed < if (driver.menu->selection_ptr + fast_scroll_speed <
file_list_get_size(driver.menu->selection_buf)) file_list_get_size(driver.menu->selection_buf))
menu_set_navigation(driver.menu, menu_navigation_set(driver.menu,
driver.menu->selection_ptr + fast_scroll_speed); driver.menu->selection_ptr + fast_scroll_speed);
else else
menu_set_navigation_last(driver.menu); menu_navigation_set_last(driver.menu);
break; break;
case MENU_ACTION_SCROLL_UP: case MENU_ACTION_SCROLL_UP:
menu_descend_alphabet(driver.menu, &driver.menu->selection_ptr); menu_navigation_descend_alphabet(driver.menu, &driver.menu->selection_ptr);
break; break;
case MENU_ACTION_SCROLL_DOWN: case MENU_ACTION_SCROLL_DOWN:
menu_ascend_alphabet(driver.menu, &driver.menu->selection_ptr); menu_navigation_ascend_alphabet(driver.menu, &driver.menu->selection_ptr);
break; break;
case MENU_ACTION_CANCEL: case MENU_ACTION_CANCEL:

8
frontend/menu/menu_entries.c
View File

@ -31,9 +31,9 @@ void menu_entries_refresh(file_list_t *list)
if (driver.menu->selection_ptr >= file_list_get_size(list) if (driver.menu->selection_ptr >= file_list_get_size(list)
&& file_list_get_size(list)) && file_list_get_size(list))
menu_set_navigation(driver.menu, file_list_get_size(list) - 1); menu_navigation_set(driver.menu, file_list_get_size(list) - 1);
else if (!file_list_get_size(list)) else if (!file_list_get_size(list))
menu_clear_navigation(driver.menu, true); menu_navigation_clear(driver.menu, true);
} }
static inline bool entries_list_elem_is_dir(file_list_t *buf, static inline bool entries_list_elem_is_dir(file_list_t *buf,
@ -125,7 +125,7 @@ void menu_entries_push(
size_t directory_ptr) size_t directory_ptr)
{ {
menu_list_push(list, path, label, type, directory_ptr); menu_list_push(list, path, label, type, directory_ptr);
menu_clear_navigation(driver.menu, true); menu_navigation_clear(driver.menu, true);
driver.menu->need_refresh = true; driver.menu->need_refresh = true;
} }
@ -415,7 +415,7 @@ bool menu_entries_init(menu_handle_t *menu)
menu->list_settings = setting_data_new(SL_FLAG_ALL_SETTINGS); menu->list_settings = setting_data_new(SL_FLAG_ALL_SETTINGS);
menu_list_push_stack(menu->menu_stack, "", "Main Menu", MENU_SETTINGS, 0); menu_list_push_stack(menu->menu_stack, "", "Main Menu", MENU_SETTINGS, 0);
menu_clear_navigation(menu, true); menu_navigation_clear(menu, true);
entries_push_main_menu_list(menu, menu->selection_buf, entries_push_main_menu_list(menu, menu->selection_buf,
"", "Main Menu", 0); "", "Main Menu", 0);

2
frontend/menu/menu_entries_cbs.c
View File

@ -373,7 +373,7 @@ static int action_ok_config_load(const char *path,
driver.menu->msg_force = true; driver.menu->msg_force = true;
if (rarch_replace_config(config)) if (rarch_replace_config(config))
{ {
menu_clear_navigation(driver.menu, false); menu_navigation_clear(driver.menu, false);
return -1; return -1;
} }

2
frontend/menu/menu_input_line_cb.c
View File

@ -66,7 +66,7 @@ static void menu_search_callback(void *userdata, const char *str)
size_t index; size_t index;
if (str && *str && file_list_search(menu->selection_buf, str, &index)) if (str && *str && file_list_search(menu->selection_buf, str, &index))
menu_set_navigation(menu, index); menu_navigation_set(menu, index);
menu_key_end_line(menu); menu_key_end_line(menu);
} }

14
frontend/menu/menu_navigation.c
View File

@ -23,7 +23,7 @@
#include "menu_common.h" #include "menu_common.h"
#include "menu_navigation.h" #include "menu_navigation.h"
void menu_clear_navigation(menu_handle_t *menu, bool pending_push) void menu_navigation_clear(menu_handle_t *menu, bool pending_push)
{ {
menu->selection_ptr = 0; menu->selection_ptr = 0;
@ -31,7 +31,7 @@ void menu_clear_navigation(menu_handle_t *menu, bool pending_push)
driver.menu_ctx->navigation_clear(menu, pending_push); driver.menu_ctx->navigation_clear(menu, pending_push);
} }
void menu_decrement_navigation(menu_handle_t *menu) void menu_navigation_decrement(menu_handle_t *menu)
{ {
menu->selection_ptr--; menu->selection_ptr--;
@ -39,7 +39,7 @@ void menu_decrement_navigation(menu_handle_t *menu)
driver.menu_ctx->navigation_decrement(menu); driver.menu_ctx->navigation_decrement(menu);
} }
void menu_increment_navigation(menu_handle_t *menu) void menu_navigation_increment(menu_handle_t *menu)
{ {
menu->selection_ptr++; menu->selection_ptr++;
@ -47,7 +47,7 @@ void menu_increment_navigation(menu_handle_t *menu)
driver.menu_ctx->navigation_increment(menu); driver.menu_ctx->navigation_increment(menu);
} }
void menu_set_navigation(menu_handle_t *menu, size_t i) void menu_navigation_set(menu_handle_t *menu, size_t i)
{ {
menu->selection_ptr = i; menu->selection_ptr = i;
@ -55,7 +55,7 @@ void menu_set_navigation(menu_handle_t *menu, size_t i)
driver.menu_ctx->navigation_set(menu); driver.menu_ctx->navigation_set(menu);
} }
void menu_set_navigation_last(menu_handle_t *menu) void menu_navigation_set_last(menu_handle_t *menu)
{ {
menu->selection_ptr = file_list_get_size(menu->selection_buf) - 1; menu->selection_ptr = file_list_get_size(menu->selection_buf) - 1;
@ -63,7 +63,7 @@ void menu_set_navigation_last(menu_handle_t *menu)
driver.menu_ctx->navigation_set_last(menu); driver.menu_ctx->navigation_set_last(menu);
} }
void menu_descend_alphabet(menu_handle_t *menu, size_t *ptr_out) void menu_navigation_descend_alphabet(menu_handle_t *menu, size_t *ptr_out)
{ {
size_t i = 0; size_t i = 0;
size_t ptr = *ptr_out; size_t ptr = *ptr_out;
@ -84,7 +84,7 @@ void menu_descend_alphabet(menu_handle_t *menu, size_t *ptr_out)
driver.menu_ctx->navigation_descend_alphabet(menu, ptr_out); driver.menu_ctx->navigation_descend_alphabet(menu, ptr_out);
} }
void menu_ascend_alphabet(menu_handle_t *menu, size_t *ptr_out) void menu_navigation_ascend_alphabet(menu_handle_t *menu, size_t *ptr_out)
{ {
size_t i = 0; size_t i = 0;
size_t ptr = *ptr_out; size_t ptr = *ptr_out;

14
frontend/menu/menu_navigation.h
View File

@ -23,19 +23,19 @@
extern "C" { extern "C" {
#endif #endif
void menu_clear_navigation(menu_handle_t *menu, bool pending_push); void menu_navigation_clear(menu_handle_t *menu, bool pending_push);
void menu_decrement_navigation(menu_handle_t *menu); void menu_navigation_decrement(menu_handle_t *menu);
void menu_increment_navigation(menu_handle_t *menu); void menu_navigation_increment(menu_handle_t *menu);
void menu_set_navigation(menu_handle_t *menu, size_t i); void menu_navigation_set(menu_handle_t *menu, size_t i);
void menu_set_navigation_last(menu_handle_t *menu); void menu_navigation_set_last(menu_handle_t *menu);
void menu_descend_alphabet(menu_handle_t *menu, size_t *ptr_out); void menu_navigation_descend_alphabet(menu_handle_t *menu, size_t *ptr_out);
void menu_ascend_alphabet(menu_handle_t *menu, size_t *ptr_out); void menu_navigation_ascend_alphabet(menu_handle_t *menu, size_t *ptr_out);
#ifdef __cplusplus #ifdef __cplusplus
} }