mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-22 03:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

(PS3) Get rid of QUICKMENU_TOGGLE define - was surpassing 64 entries

Browse Source 
on PS3 - now going to do 'menu toggle behavior' logic instead -
menu toggle now triggers ingame menu - will be configurable
This commit is contained in:
twinaphex 2013-03-30 07:19:42 +01:00
parent 4e86a05225
commit 39c0ed745c
6 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
driver.h
View File

@ -110,7 +110,6 @@ enum // RetroArch specific bind IDs.
RARCH_GRAB_MOUSE_TOGGLE, RARCH_GRAB_MOUSE_TOGGLE,
RARCH_MENU_TOGGLE, RARCH_MENU_TOGGLE,
RARCH_MENU_QUICKMENU_TOGGLE,
RARCH_BIND_LIST_END, RARCH_BIND_LIST_END,
RARCH_BIND_LIST_END_NULL RARCH_BIND_LIST_END_NULL

1
general.h
View File

@ -623,6 +623,7 @@ struct global
bool error_in_init; bool error_in_init;
char error_string[1024]; char error_string[1024];
jmp_buf error_sjlj_context; jmp_buf error_sjlj_context;
unsigned menu_toggle_behavior;
}; };
struct rarch_main_wrap struct rarch_main_wrap

3
gx/gx_input.c
View File

@ -686,8 +686,7 @@ static void gx_input_poll(void *data)
(1ULL << RARCH_STATE_SLOT_MINUS) | (1ULL << RARCH_STATE_SLOT_MINUS) |
(1ULL << RARCH_REWIND) | (1ULL << RARCH_REWIND) |
(1ULL << RARCH_QUIT_KEY) | (1ULL << RARCH_QUIT_KEY) |
(1ULL << RARCH_MENU_TOGGLE) | (1ULL << RARCH_MENU_TOGGLE));
(1ULL << RARCH_MENU_QUICKMENU_TOGGLE));
if (dpad_emulation) if (dpad_emulation)
{ {

8
ps3/ps3_input.c
View File

@ -198,8 +198,7 @@ static void ps3_input_poll(void *data)
(1ULL << RARCH_STATE_SLOT_MINUS) | (1ULL << RARCH_STATE_SLOT_MINUS) |
(1ULL << RARCH_REWIND) | (1ULL << RARCH_REWIND) |
(1ULL << RARCH_QUIT_KEY) | (1ULL << RARCH_QUIT_KEY) |
(1ULL << RARCH_MENU_TOGGLE) | (1ULL << RARCH_MENU_TOGGLE));
(1ULL << RARCH_MENU_QUICKMENU_TOGGLE));
if (dpad_emulation) if (dpad_emulation)
{ {
@ -221,11 +220,6 @@ static void ps3_input_poll(void *data)
{ {
if ((*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3))) if ((*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3)))
*lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE); *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE);
if (!(*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3)))
{
*lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE);
*lifecycle_state |= (1ULL << RARCH_MENU_QUICKMENU_TOGGLE);
}
} }
cellPadGetInfo2(&pad_info); cellPadGetInfo2(&pad_info);

2
retroarch.c
View File

@ -2881,7 +2881,7 @@ static inline bool check_enter_rgui(void)
bool rmenu_toggle = input_key_pressed_func(RARCH_MENU_TOGGLE); bool rmenu_toggle = input_key_pressed_func(RARCH_MENU_TOGGLE);
if (rmenu_toggle && !old_rmenu_toggle) if (rmenu_toggle && !old_rmenu_toggle)
{ {
if (input_key_pressed_func(RARCH_MENU_QUICKMENU_TOGGLE)) if (g_extern.menu_toggle_behavior == 0)
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME);
g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU); g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU);

8
xdk/xdk_xinput_input.c
View File

@ -220,8 +220,7 @@ static void xdk_input_poll(void *data)
(1ULL << RARCH_STATE_SLOT_MINUS) | (1ULL << RARCH_STATE_SLOT_MINUS) |
(1ULL << RARCH_REWIND) | (1ULL << RARCH_REWIND) |
(1ULL << RARCH_QUIT_KEY) | (1ULL << RARCH_QUIT_KEY) |
(1ULL << RARCH_MENU_TOGGLE) | (1ULL << RARCH_MENU_TOGGLE));
(1ULL << RARCH_MENU_QUICKMENU_TOGGLE));
if (dpad_emulation) if (dpad_emulation)
{ {
@ -243,11 +242,6 @@ static void xdk_input_poll(void *data)
{ {
if((*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3))) if((*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3)))
*lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE); *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE);
if(!(*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_L3)) && (*state_p1 & (1ULL << RETRO_DEVICE_ID_JOYPAD_R3)))
{
*lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE);
*lifecycle_state |= (1ULL << RARCH_MENU_QUICKMENU_TOGGLE);
}
} }
} }