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

(RMenu) Start rewriting input code to be uniform to RGUI

Browse Source
This commit is contained in:
twinaphex 2013-09-26 22:34:06 +02:00
parent b11895ec4c
commit f74c698822
5 changed files with 972 additions and 878 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
frontend/menu/menu_common.c
View File

@ -252,40 +252,49 @@ bool filebrowser_iterate(void *data, unsigned action)
return ret; return ret;
} }
void filebrowser_update(void *data, uint64_t input, const char *extensions) void filebrowser_update(void *data, uint64_t action_ori, const char *extensions)
{ {
filebrowser_action_t action = FILEBROWSER_ACTION_NOOP; filebrowser_action_t action = FILEBROWSER_ACTION_NOOP;
bool ret = true; bool ret = true;
if (input & (1ULL << DEVICE_NAV_DOWN)) switch (action_ori)
action = FILEBROWSER_ACTION_DOWN;
else if (input & (1ULL << DEVICE_NAV_UP))
action = FILEBROWSER_ACTION_UP;
else if (input & (1ULL << DEVICE_NAV_RIGHT))
action = FILEBROWSER_ACTION_RIGHT;
else if (input & (1ULL << DEVICE_NAV_LEFT))
action = FILEBROWSER_ACTION_LEFT;
else if (input & (1ULL << DEVICE_NAV_R1))
action = FILEBROWSER_ACTION_SCROLL_DOWN;
else if (input & (1ULL << DEVICE_NAV_L1))
action = FILEBROWSER_ACTION_SCROLL_UP;
else if (input & (1ULL << DEVICE_NAV_A))
{ {
char tmp_str[PATH_MAX]; case RGUI_ACTION_DOWN:
fill_pathname_parent_dir(tmp_str, rgui->browser->current_dir.directory_path, sizeof(tmp_str)); action = FILEBROWSER_ACTION_DOWN;
break;
case RGUI_ACTION_UP:
action = FILEBROWSER_ACTION_UP;
break;
case RGUI_ACTION_RIGHT:
action = FILEBROWSER_ACTION_RIGHT;
break;
case RGUI_ACTION_LEFT:
action = FILEBROWSER_ACTION_LEFT;
break;
case RGUI_ACTION_SCROLL_DOWN:
action = FILEBROWSER_ACTION_SCROLL_DOWN;
break;
case RGUI_ACTION_SCROLL_UP:
action = FILEBROWSER_ACTION_SCROLL_UP;
break;
case RGUI_ACTION_CANCEL:
{
char tmp_str[PATH_MAX];
fill_pathname_parent_dir(tmp_str, rgui->browser->current_dir.directory_path, sizeof(tmp_str));
if (tmp_str[0] != '\0') if (tmp_str[0] != '\0')
action = FILEBROWSER_ACTION_CANCEL; action = FILEBROWSER_ACTION_CANCEL;
} }
else if (input & (1ULL << DEVICE_NAV_START)) break;
{ case RGUI_ACTION_START:
action = FILEBROWSER_ACTION_RESET; action = FILEBROWSER_ACTION_RESET;
filebrowser_set_root_and_ext(rgui->browser, NULL, default_paths.filesystem_root_dir); filebrowser_set_root_and_ext(rgui->browser, NULL, default_paths.filesystem_root_dir);
strlcpy(rgui->browser->current_dir.extensions, extensions, strlcpy(rgui->browser->current_dir.extensions, extensions,
sizeof(rgui->browser->current_dir.extensions)); sizeof(rgui->browser->current_dir.extensions));
#ifdef HAVE_RMENU_XUI #ifdef HAVE_RMENU_XUI
filebrowser_fetch_directory_entries(1ULL << DEVICE_NAV_B); filebrowser_fetch_directory_entries(1ULL << DEVICE_NAV_B);
#endif #endif
break;
} }
if (action != FILEBROWSER_ACTION_NOOP) if (action != FILEBROWSER_ACTION_NOOP)
@ -764,6 +773,7 @@ static uint64_t rgui_input(void)
bool menu_iterate(void) bool menu_iterate(void)
{ {
rarch_time_t time, delta, target_msec, sleep_msec; rarch_time_t time, delta, target_msec, sleep_msec;
rgui_action_t action;
static bool initial_held = true; static bool initial_held = true;
static bool first_held = false; static bool first_held = false;
uint64_t input_state = 0; uint64_t input_state = 0;
@ -815,8 +825,32 @@ bool menu_iterate(void)
rgui->delay_count++; rgui->delay_count++;
rgui->old_input_state = input_state; rgui->old_input_state = input_state;
action = RGUI_ACTION_NOOP;
// don't run anything first frame, only capture held inputs for old_input_state
if (rgui->trigger_state & (1ULL << DEVICE_NAV_UP))
action = RGUI_ACTION_UP;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_DOWN))
action = RGUI_ACTION_DOWN;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_LEFT))
action = RGUI_ACTION_LEFT;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_RIGHT))
action = RGUI_ACTION_RIGHT;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_L))
action = RGUI_ACTION_SCROLL_UP;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_R))
action = RGUI_ACTION_SCROLL_DOWN;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_B))
action = RGUI_ACTION_CANCEL;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_A))
action = RGUI_ACTION_OK;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_SELECT))
action = RGUI_ACTION_START;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_START))
action = RGUI_ACTION_SETTINGS;
if (menu_ctx && menu_ctx->iterate) if (menu_ctx && menu_ctx->iterate)
input_entry_ret = menu_ctx->iterate(rgui); input_entry_ret = menu_ctx->iterate(rgui, action);
if (driver.video_poke && driver.video_poke->set_texture_enable) if (driver.video_poke && driver.video_poke->set_texture_enable)
driver.video_poke->set_texture_enable(driver.video_data, rgui->frame_buf_show, MENU_TEXTURE_FULLSCREEN); driver.video_poke->set_texture_enable(driver.video_data, rgui->frame_buf_show, MENU_TEXTURE_FULLSCREEN);

30
frontend/menu/menu_common.h
View File

@ -50,13 +50,13 @@ extern "C" {
#define RGUI_MAX_SHADERS 8 #define RGUI_MAX_SHADERS 8
#if defined(HAVE_RMENU) || defined(HAVE_RMENU_XUI)
enum enum
{ {
DEVICE_NAV_UP = 0, DEVICE_NAV_UP = 0,
DEVICE_NAV_DOWN, DEVICE_NAV_DOWN,
DEVICE_NAV_LEFT, DEVICE_NAV_LEFT,
DEVICE_NAV_RIGHT, DEVICE_NAV_RIGHT,
#if defined(HAVE_RMENU) || defined(HAVE_RMENU_XUI)
DEVICE_NAV_UP_ANALOG_L, DEVICE_NAV_UP_ANALOG_L,
DEVICE_NAV_DOWN_ANALOG_L, DEVICE_NAV_DOWN_ANALOG_L,
DEVICE_NAV_LEFT_ANALOG_L, DEVICE_NAV_LEFT_ANALOG_L,
@ -65,36 +65,20 @@ enum
DEVICE_NAV_DOWN_ANALOG_R, DEVICE_NAV_DOWN_ANALOG_R,
DEVICE_NAV_LEFT_ANALOG_R, DEVICE_NAV_LEFT_ANALOG_R,
DEVICE_NAV_RIGHT_ANALOG_R, DEVICE_NAV_RIGHT_ANALOG_R,
DEVICE_NAV_B, #endif
DEVICE_NAV_A,
DEVICE_NAV_X,
DEVICE_NAV_Y,
DEVICE_NAV_START,
DEVICE_NAV_SELECT,
DEVICE_NAV_L1,
DEVICE_NAV_R1,
DEVICE_NAV_L2,
DEVICE_NAV_R2,
DEVICE_NAV_MENU,
DEVICE_NAV_LAST
};
#elif defined(HAVE_RGUI)
enum
{
DEVICE_NAV_UP = 0,
DEVICE_NAV_DOWN,
DEVICE_NAV_LEFT,
DEVICE_NAV_RIGHT,
DEVICE_NAV_A, DEVICE_NAV_A,
DEVICE_NAV_B, DEVICE_NAV_B,
DEVICE_NAV_L, DEVICE_NAV_L,
DEVICE_NAV_R, DEVICE_NAV_R,
DEVICE_NAV_L2,
DEVICE_NAV_R2,
DEVICE_NAV_START, DEVICE_NAV_START,
DEVICE_NAV_SELECT, DEVICE_NAV_SELECT,
DEVICE_NAV_MENU, DEVICE_NAV_MENU,
DEVICE_NAV_X,
DEVICE_NAV_Y,
DEVICE_NAV_LAST DEVICE_NAV_LAST
}; };
#endif
typedef enum typedef enum
{ {
@ -226,6 +210,8 @@ typedef enum
RGUI_ACTION_MESSAGE, RGUI_ACTION_MESSAGE,
RGUI_ACTION_SCROLL_DOWN, RGUI_ACTION_SCROLL_DOWN,
RGUI_ACTION_SCROLL_UP, RGUI_ACTION_SCROLL_UP,
RGUI_ACTION_MAPPING_PREVIOUS,
RGUI_ACTION_MAPPING_NEXT,
RGUI_ACTION_NOOP RGUI_ACTION_NOOP
} rgui_action_t; } rgui_action_t;

2
frontend/menu/menu_context.h
View File

@ -28,7 +28,7 @@
typedef struct menu_ctx_driver typedef struct menu_ctx_driver
{ {
int (*iterate)(void*); int (*iterate)(void*, unsigned);
void* (*init)(void); void* (*init)(void);
void (*free)(void*); void (*free)(void*);

25
frontend/menu/rgui.c
View File

@ -2643,32 +2643,9 @@ static bool directory_parse(rgui_handle_t *rgui, const char *directory, unsigned
return true; return true;
} }
static int rgui_iterate(void *data) static int rgui_iterate(void *data, unsigned action)
{ {
rgui_handle_t *rgui = (rgui_handle_t*)data; rgui_handle_t *rgui = (rgui_handle_t*)data;
rgui_action_t action = RGUI_ACTION_NOOP;
// don't run anything first frame, only capture held inputs for old_input_state
if (rgui->trigger_state & (1ULL << DEVICE_NAV_UP))
action = RGUI_ACTION_UP;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_DOWN))
action = RGUI_ACTION_DOWN;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_LEFT))
action = RGUI_ACTION_LEFT;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_RIGHT))
action = RGUI_ACTION_RIGHT;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_L))
action = RGUI_ACTION_SCROLL_UP;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_R))
action = RGUI_ACTION_SCROLL_DOWN;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_B))
action = RGUI_ACTION_CANCEL;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_A))
action = RGUI_ACTION_OK;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_SELECT))
action = RGUI_ACTION_START;
else if (rgui->trigger_state & (1ULL << DEVICE_NAV_START))
action = RGUI_ACTION_SETTINGS;
const char *dir = 0; const char *dir = 0;
unsigned menu_type = 0; unsigned menu_type = 0;

1705
frontend/menu/rmenu.c
View File

File diff suppressed because it is too large Load Diff