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

(PS3) Added extra buttons for PS3 port

Browse Source
This commit is contained in:
Twinaphex 2012-05-07 22:25:56 +02:00
parent 34553627b2
commit 9351ac9fd9
5 changed files with 77 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
console/console_ext.c
View File

@ -228,6 +228,10 @@ char rarch_default_libretro_keybind_name_lut[RARCH_FIRST_META_KEY][256] = {
"X Button", /* RETRO_DEVICE_ID_JOYPAD_X */
"L Button", /* RETRO_DEVICE_ID_JOYPAD_L */
"R Button", /* RETRO_DEVICE_ID_JOYPAD_R */
"L2 Button", /* RETRO_DEVICE_ID_JOYPAD_L2 */
"R2 Button", /* RETRO_DEVICE_ID_JOYPAD_R2 */
"L3 Button", /* RETRO_DEVICE_ID_JOYPAD_L3 */
"R3 Button", /* RETRO_DEVICE_ID_JOYPAD_R3 */
};
#if defined(__CELLOS_LV2__)

4
ps3/main.c
View File

@ -111,6 +111,10 @@ static void set_default_settings(void)
rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_X] = platform_keys[PS3_DEVICE_ID_JOYPAD_TRIANGLE].joykey;
rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L] = platform_keys[PS3_DEVICE_ID_JOYPAD_L1].joykey;
rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R] = platform_keys[PS3_DEVICE_ID_JOYPAD_R1].joykey;
rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R2] = platform_keys[PS3_DEVICE_ID_JOYPAD_R2].joykey;
rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_R3] = platform_keys[PS3_DEVICE_ID_JOYPAD_R3].joykey;
rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L2] = platform_keys[PS3_DEVICE_ID_JOYPAD_L2].joykey;
rarch_default_keybind_lut[RETRO_DEVICE_ID_JOYPAD_L3] = platform_keys[PS3_DEVICE_ID_JOYPAD_L3].joykey;
for(uint32_t x = 0; x < MAX_PLAYERS; x++)
rarch_input_set_default_keybinds(x);

52
ps3/menu-entries.h
View File

@ -711,6 +711,58 @@ static item items_generalsettings[MAX_NO_OF_CONTROLS_SETTINGS] =
0.09f,
0.83f,
},
{
SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_L2,
"L2 Button",
"",
0.0f,
0.0f,
YELLOW,
"",
WHITE,
0.91f,
0.09f,
0.83f,
},
{
SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_R2,
"R2 Button",
"",
0.0f,
0.0f,
YELLOW,
"",
WHITE,
0.91f,
0.09f,
0.83f,
},
{
SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_L3,
"L3 Button",
"",
0.0f,
0.0f,
YELLOW,
"",
WHITE,
0.91f,
0.09f,
0.83f,
},
{
SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_R3,
"R3 Button",
"",
0.0f,
0.0f,
YELLOW,
"",
WHITE,
0.91f,
0.09f,
0.83f,
},
{
SETTING_CONTROLS_SAVE_CUSTOM_CONTROLS,
"SAVE CUSTOM CONTROLS",

13
ps3/menu.c
View File

@ -730,6 +730,10 @@ static void set_setting_label(menu * menu_obj, uint64_t currentsetting)
case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_X:
case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_L:
case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_R:
case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_L2:
case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_R2:
case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_L3:
case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_R3:
{
if(g_settings.input.binds[currently_selected_controller_menu][currentsetting-(FIRST_CONTROL_BIND)].joykey == rarch_default_keybind_lut[currentsetting-FIRST_CONTROL_BIND])
menu_obj->items[currentsetting].text_color = GREEN;
@ -1775,6 +1779,15 @@ static void producesettingentry(menu * menu_obj, uint64_t switchvalue)
case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_R:
set_keybind_digital(state, RETRO_DEVICE_ID_JOYPAD_R);
break;
case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_L2:
set_keybind_digital(state, RETRO_DEVICE_ID_JOYPAD_L2);
case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_R2:
set_keybind_digital(state, RETRO_DEVICE_ID_JOYPAD_R2);
case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_L3:
set_keybind_digital(state, RETRO_DEVICE_ID_JOYPAD_L3);
case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_R3:
set_keybind_digital(state, RETRO_DEVICE_ID_JOYPAD_R3);
break;
case SETTING_CONTROLS_SAVE_CUSTOM_CONTROLS:
if(CTRL_LEFT(state) || CTRL_LSTICK_LEFT(state) || CTRL_RIGHT(state) || CTRL_LSTICK_RIGHT(state) || CTRL_CROSS(state) || CTRL_START(state))
{

4
ps3/menu.h
View File

@ -129,6 +129,10 @@ enum
SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_X,
SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_L,
SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_R,
SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_L2,
SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_R2,
SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_L3,
SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_R3,
SETTING_CONTROLS_SAVE_CUSTOM_CONTROLS,
SETTING_CONTROLS_DEFAULT_ALL
};