diff --git a/ps3/frontend/menu.c b/ps3/frontend/menu.c index 5055738f71..d34a906eeb 100644 --- a/ps3/frontend/menu.c +++ b/ps3/frontend/menu.c @@ -638,10 +638,14 @@ static void control_update_wrap(void) input_state |= (1 << RETRO_DEVICE_ID_JOYPAD_R); else if (CTRL_R2(trigger_state)) input_state |= (1 << RETRO_DEVICE_ID_JOYPAD_R2); - else if (CTRL_L2(trigger_state)) - input_state |= (1 << RETRO_DEVICE_ID_JOYPAD_L2); + else if (CTRL_R3(trigger_state)) + input_state |= (1 << RETRO_DEVICE_ID_JOYPAD_R3); else if (CTRL_L1(trigger_state)) input_state |= (1 << RETRO_DEVICE_ID_JOYPAD_L); + else if (CTRL_L2(trigger_state)) + input_state |= (1 << RETRO_DEVICE_ID_JOYPAD_L2); + else if (CTRL_L3(trigger_state)) + input_state |= (1 << RETRO_DEVICE_ID_JOYPAD_L3); else if (CTRL_SQUARE(trigger_state)) input_state |= (1 << RETRO_DEVICE_ID_JOYPAD_Y); else if (CTRL_TRIANGLE(trigger_state)) @@ -715,8 +719,6 @@ static void browser_render(filebrowser_t * b) gl_render_msg_post(gl); } - - static void apply_scaling (unsigned init_mode) { gl_t *gl = driver.video_data; @@ -851,7 +853,7 @@ static void select_directory(void) { browser_update(&tmpBrowser, "empty"); - if (CTRL_SQUARE(trigger_state)) + if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_Y)) { if(filebrowser_get_current_path_isdir(&tmpBrowser)) { @@ -874,7 +876,7 @@ static void select_directory(void) menu_stack_decrement(); } } - else if (CTRL_TRIANGLE(trigger_state)) + else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_X)) { strlcpy(path, usrDirPath, sizeof(path)); switch(menu_id) @@ -894,7 +896,7 @@ static void select_directory(void) } menu_stack_decrement(); } - else if (CTRL_CROSS(trigger_state)) + else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { if(filebrowser_get_current_path_isdir(&tmpBrowser)) { @@ -1020,9 +1022,9 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) switch(switchvalue) { case SETTING_CHANGE_RESOLUTION: - if(CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) ) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) rarch_settings_change(S_RESOLUTION_NEXT); - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) ) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) rarch_settings_change(S_RESOLUTION_PREVIOUS); if(CTRL_CROSS(trigger_state)) { @@ -1043,7 +1045,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) break; /* case SETTING_PAL60_MODE: - if(CTRL_RIGHT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_CROSS(trigger_state) || CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { if (Graphics->GetCurrentResolution() == CELL_VIDEO_OUT_RESOLUTION_576) { @@ -1059,7 +1061,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) break; */ case SETTING_SHADER_PRESETS: - if((CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_CROSS(trigger_state))) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { if(g_console.emulator_initialized) { @@ -1067,17 +1069,17 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) menu_stack_push(menuStackindex, PRESET_CHOICE); } } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) strlcpy(g_console.cgp_path, "", sizeof(g_console.cgp_path)); break; case SETTING_SHADER: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { menu_stack_increment(); menu_stack_push(menuStackindex, SHADER_CHOICE); set_shader = 0; } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_load_shader(1, NULL); strlcpy(g_settings.video.cg_shader_path, DEFAULT_SHADER_FILE, sizeof(g_settings.video.cg_shader_path)); @@ -1085,13 +1087,13 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } break; case SETTING_SHADER_2: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { menu_stack_increment(); menu_stack_push(menuStackindex, SHADER_CHOICE); set_shader = 1; } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_load_shader(2, NULL); strlcpy(g_settings.video.second_pass_shader, DEFAULT_SHADER_FILE, sizeof(g_settings.video.second_pass_shader)); @@ -1099,7 +1101,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } break; case SETTING_FONT_SIZE: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_CROSS(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) { if(g_console.menu_font_size > 0) g_console.menu_font_size -= 0.01f; @@ -1109,57 +1111,57 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) if((g_console.menu_font_size < 2.0f)) g_console.menu_font_size += 0.01f; } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) g_console.menu_font_size = 1.0f; break; case SETTING_KEEP_ASPECT_RATIO: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) { rarch_settings_change(S_ASPECT_RATIO_DECREMENT); gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index); } - if(CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) { rarch_settings_change(S_ASPECT_RATIO_INCREMENT); gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_settings_default(S_DEF_ASPECT_RATIO); gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index); } break; case SETTING_HW_TEXTURE_FILTER: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { rarch_settings_change(S_HW_TEXTURE_FILTER); gfx_ctx_set_filtering(1, g_settings.video.smooth); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_settings_change(S_DEF_HW_TEXTURE_FILTER); gfx_ctx_set_filtering(1, g_settings.video.smooth); } break; case SETTING_HW_TEXTURE_FILTER_2: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { rarch_settings_change(S_HW_TEXTURE_FILTER_2); gfx_ctx_set_filtering(2, g_settings.video.second_pass_smooth); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_settings_change(S_DEF_HW_TEXTURE_FILTER_2); gfx_ctx_set_filtering(2, g_settings.video.second_pass_smooth); } break; case SETTING_SCALE_ENABLED: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { rarch_settings_change(S_SCALE_ENABLED); gfx_ctx_set_fbo(g_console.fbo_enabled); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_settings_default(S_DEF_SCALE_ENABLED); apply_scaling(FBO_DEINIT); @@ -1167,7 +1169,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } break; case SETTING_SCALE_FACTOR: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) { if(g_console.fbo_enabled) { @@ -1191,7 +1193,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } } } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_settings_default(S_DEF_SCALE_FACTOR); apply_scaling(FBO_DEINIT); @@ -1199,7 +1201,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } break; case SETTING_HW_OVERSCAN_AMOUNT: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_CROSS(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) { rarch_settings_change(S_OVERSCAN_DECREMENT); gfx_ctx_set_overscan(); @@ -1209,31 +1211,31 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) rarch_settings_change(S_OVERSCAN_INCREMENT); gfx_ctx_set_overscan(); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_settings_default(S_DEF_OVERSCAN); gfx_ctx_set_overscan(); } break; case SETTING_THROTTLE_MODE: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { rarch_settings_change(S_THROTTLE); gfx_ctx_set_swap_interval(g_console.throttle_enable, true); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_settings_default(S_DEF_THROTTLE); gfx_ctx_set_swap_interval(g_console.throttle_enable, true); } break; case SETTING_TRIPLE_BUFFERING: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { rarch_settings_change(S_TRIPLE_BUFFERING); video_gl.restart(); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { bool old_buffer_trigger_state = g_console.triple_buffering_enable; rarch_settings_default(S_DEF_TRIPLE_BUFFERING); @@ -1243,7 +1245,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } break; case SETTING_ENABLE_SCREENSHOTS: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { #if(CELL_SDK_VERSION > 0x340000) g_console.screenshots_enable = !g_console.screenshots_enable; @@ -1264,7 +1266,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } #endif } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { #if(CELL_SDK_VERSION > 0x340000) g_console.screenshots_enable = true; @@ -1272,7 +1274,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) } break; case SETTING_SAVE_SHADER_PRESET: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) | CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) rarch_filename_input_and_save(SHADER_PRESET_FILE); break; case SETTING_APPLY_SHADER_PRESET_ON_STARTUP: @@ -1280,7 +1282,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) case SETTING_DEFAULT_VIDEO_ALL: break; case SETTING_SOUND_MODE: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) { if(g_console.sound_mode != SOUND_MODE_NORMAL) g_console.sound_mode--; @@ -1297,14 +1299,14 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) else rarch_console_rsound_start(g_settings.audio.device); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { g_console.sound_mode = SOUND_MODE_NORMAL; rarch_console_rsound_stop(); } break; case SETTING_RSOUND_SERVER_IP_ADDRESS: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_CROSS(trigger_state) | CTRL_LSTICK_RIGHT(trigger_state) ) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { oskutil_write_initial_message(&g_console.oskutil_handle, L"192.168.1.1"); oskutil_write_message(&g_console.oskutil_handle, L"Enter IP address for the RSound Server."); @@ -1321,7 +1323,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) if(g_console.oskutil_handle.text_can_be_fetched) strlcpy(g_settings.audio.device, OUTPUT_TEXT_STRING(g_console.oskutil_handle), sizeof(g_settings.audio.device)); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) strlcpy(g_settings.audio.device, "0.0.0.0", sizeof(g_settings.audio.device)); break; case SETTING_DEFAULT_AUDIO_ALL: @@ -1332,47 +1334,47 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) if(CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) rarch_settings_change(S_SAVESTATE_INCREMENT); - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) rarch_settings_default(S_DEF_SAVE_STATE); break; case SETTING_EMU_SHOW_INFO_MSG: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) g_console.info_msg_enable = !g_console.info_msg_enable; - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) g_console.info_msg_enable = true; break; case SETTING_EMU_REWIND_ENABLED: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { rarch_settings_change(S_REWIND); if(g_console.info_msg_enable) rarch_settings_msg(S_MSG_RESTART_RARCH, S_DELAY_180); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) g_settings.rewind_enable = false; break; case SETTING_RARCH_DEFAULT_EMU: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { menu_stack_increment(); menu_stack_push(menuStackindex, LIBRETRO_CHOICE); set_libretro_core_as_launch = false; } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { } break; case SETTING_EMU_AUDIO_MUTE: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { g_extern.audio_data.mute = !g_extern.audio_data.mute; } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) g_extern.audio_data.mute = false; break; case SETTING_ENABLE_CUSTOM_BGM: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { #if(CELL_SDK_VERSION > 0x340000) g_console.custom_bgm_enable = !g_console.custom_bgm_enable; @@ -1383,7 +1385,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) #endif } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { #if(CELL_SDK_VERSION > 0x340000) g_console.custom_bgm_enable = true; @@ -1395,75 +1397,75 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) case SETTING_EMU_AUDIO_DEFAULT_ALL: break; case SETTING_PATH_DEFAULT_ROM_DIRECTORY: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { menu_stack_increment(); menu_stack_push(menuStackindex, PATH_DEFAULT_ROM_DIR_CHOICE); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) strlcpy(g_console.default_rom_startup_dir, "/", sizeof(g_console.default_rom_startup_dir)); break; case SETTING_PATH_SAVESTATES_DIRECTORY: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { menu_stack_increment(); menu_stack_push(menuStackindex, PATH_SAVESTATES_DIR_CHOICE); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) strlcpy(g_console.default_savestate_dir, usrDirPath, sizeof(g_console.default_savestate_dir)); break; case SETTING_PATH_SRAM_DIRECTORY: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { menu_stack_increment(); menu_stack_push(menuStackindex, PATH_SRAM_DIR_CHOICE); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) strlcpy(g_console.default_sram_dir, "", sizeof(g_console.default_sram_dir)); break; case SETTING_PATH_CHEATS: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { menu_stack_increment(); menu_stack_push(menuStackindex, PATH_CHEATS_DIR_CHOICE); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) strlcpy(g_settings.cheat_database, usrDirPath, sizeof(g_settings.cheat_database)); break; case SETTING_PATH_SYSTEM: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B))) { menu_stack_increment(); menu_stack_push(menuStackindex, PATH_SYSTEM_DIR_CHOICE); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) strlcpy(g_settings.system_directory, systemDirPath, sizeof(g_settings.system_directory)); break; case SETTING_ENABLE_SRAM_PATH: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT))) { g_console.default_sram_dir_enable = !g_console.default_sram_dir_enable; menu_stack_refresh(items_generalsettings, menuStackindex); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { g_console.default_sram_dir_enable = true; menu_stack_refresh(items_generalsettings, menuStackindex); } break; case SETTING_ENABLE_STATE_PATH: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT))) { g_console.default_savestate_dir_enable = !g_console.default_savestate_dir_enable; menu_stack_refresh(items_generalsettings, menuStackindex); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { g_console.default_savestate_dir_enable = true; menu_stack_refresh(items_generalsettings, menuStackindex); @@ -1486,7 +1488,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) menu_stack_increment(); menu_stack_push(menuStackindex, INPUT_PRESET_CHOICE); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) menu_stack_refresh(items_generalsettings, menuStackindex); break; case SETTING_CONTROLS_NUMBER: @@ -1504,7 +1506,7 @@ static void producesettingentry(menu * menu_obj, unsigned switchvalue) menu_stack_refresh(items_generalsettings, menuStackindex); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) currently_selected_controller_menu = 0; break; case SETTING_CONTROLS_RETRO_DEVICE_ID_JOYPAD_UP: @@ -1624,13 +1626,13 @@ static void select_setting(void) settings_action_t action = SETTINGS_ACTION_NOOP; /* back to ROM menu if CIRCLE is pressed */ - if (CTRL_L1(trigger_state) || CTRL_CIRCLE(trigger_state)) + if ((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_L)) || (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_A))) action = SETTINGS_ACTION_TAB_PREVIOUS; - else if (CTRL_R1(trigger_state)) + else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_R)) action = SETTINGS_ACTION_TAB_NEXT; - else if (CTRL_DOWN(trigger_state) || CTRL_LSTICK_DOWN(trigger_state)) + else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN)) action = SETTINGS_ACTION_DOWN; - else if (CTRL_UP(trigger_state) || CTRL_LSTICK_UP(trigger_state)) + else if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_UP)) action = SETTINGS_ACTION_UP; if(action != SETTINGS_ACTION_NOOP) @@ -1748,14 +1750,14 @@ static void ingame_menu_resize(void) g_console.aspect_ratio_index = ASPECT_RATIO_CUSTOM; gfx_ctx_set_aspect_ratio(NULL, g_console.aspect_ratio_index); - if(CTRL_LSTICK_LEFT(state) || CTRL_LEFT(state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) g_console.viewports.custom_vp.x -= 1; - else if (CTRL_LSTICK_RIGHT(state) || CTRL_RIGHT(state)) + else if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) g_console.viewports.custom_vp.x += 1; - if (CTRL_LSTICK_UP(state) || CTRL_UP(state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_UP)) g_console.viewports.custom_vp.y += 1; - else if (CTRL_LSTICK_DOWN(state) || CTRL_DOWN(state)) + else if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN)) g_console.viewports.custom_vp.y -= 1; if (CTRL_RSTICK_LEFT(state) || CTRL_L1(state)) @@ -1768,7 +1770,7 @@ static void ingame_menu_resize(void) else if (CTRL_RSTICK_DOWN(state) || CTRL_R2(state)) g_console.viewports.custom_vp.height -= 1; - if (CTRL_TRIANGLE(trigger_state)) + if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_X)) { g_console.viewports.custom_vp.x = 0; g_console.viewports.custom_vp.y = 0; @@ -1776,7 +1778,7 @@ static void ingame_menu_resize(void) g_console.viewports.custom_vp.height = gl->win_height; } - if(CTRL_CIRCLE(trigger_state)) + if (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_A)) menu_stack_decrement(); if(CTRL_SQUARE(~trigger_state)) @@ -1847,7 +1849,7 @@ static void ingame_menu_screenshot(void) if(g_console.ingame_menu_enable) { - if(CTRL_CIRCLE(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_A)) { menu_stack_decrement(); gl->menu_render = true; @@ -1872,33 +1874,33 @@ static void ingame_menu(void) menuitem_colors[g_console.ingame_menu_item] = RED; - if(CTRL_CIRCLE(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_A)) rarch_settings_change(S_RETURN_TO_GAME); switch(g_console.ingame_menu_item) { case MENU_ITEM_LOAD_STATE: - if(CTRL_CROSS(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { rarch_load_state(); rarch_settings_change(S_RETURN_TO_GAME); } - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) rarch_state_slot_decrease(); - if(CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) rarch_state_slot_increase(); strlcpy(comment, "Press LEFT or RIGHT to change the current save state slot.\nPress CROSS to load the state from the currently selected save state slot.", sizeof(comment)); break; case MENU_ITEM_SAVE_STATE: - if(CTRL_CROSS(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { rarch_save_state(); rarch_settings_change(S_RETURN_TO_GAME); } - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) rarch_state_slot_decrease(); - if(CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) rarch_state_slot_increase(); strlcpy(comment, "Press LEFT or RIGHT to change the current save state slot.\nPress CROSS to save the state to the currently selected save state slot.", sizeof(comment)); @@ -1912,19 +1914,19 @@ static void ingame_menu(void) strlcpy(comment, "Press LEFT or RIGHT to change the [Overscan] settings.\nPress START to reset back to default values.", sizeof(comment)); break; case MENU_ITEM_ORIENTATION: - if(CTRL_LEFT(trigger_state) || CTRL_LSTICK_LEFT(trigger_state) || CTRL_CROSS(trigger_state) || CTRL_LSTICK_LEFT(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) { rarch_settings_change(S_ROTATION_DECREMENT); video_gl.set_rotation(NULL, g_console.screen_orientation); } - if(CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state)) + if(CTRL_RIGHT(trigger_state) || CTRL_LSTICK_RIGHT(trigger_state) || CTRL_CROSS(trigger_state)) { rarch_settings_change(S_ROTATION_INCREMENT); video_gl.set_rotation(NULL, g_console.screen_orientation); } - if(CTRL_START(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_START)) { rarch_settings_default(S_DEF_ROTATION); video_gl.set_rotation(NULL, g_console.screen_orientation); @@ -1944,7 +1946,7 @@ static void ingame_menu(void) strlcpy(comment, "Press 'CROSS', 'L2' or 'R2' button to step one frame. Pressing the button\nrapidly will advance the frame more slowly.", sizeof(comment)); break; case MENU_ITEM_RESIZE_MODE: - if(CTRL_CROSS(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { menu_stack_increment(); menu_stack_push(menuStackindex, INGAME_MENU_RESIZE); @@ -1952,7 +1954,7 @@ static void ingame_menu(void) strlcpy(comment, "Allows you to resize the screen by moving around the two analog sticks.\nPress TRIANGLE to reset to default values, and CIRCLE to go back.", sizeof(comment)); break; case MENU_ITEM_SCREENSHOT_MODE: - if(CTRL_CROSS(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { menu_stack_increment(); menu_stack_push(menuStackindex, INGAME_MENU_SCREENSHOT); @@ -1960,13 +1962,13 @@ static void ingame_menu(void) strlcpy(comment, "Allows you to take a screenshot without any text clutter.\nPress CIRCLE to go back to the in-game menu while in 'Screenshot Mode'.", sizeof(comment)); break; case MENU_ITEM_RETURN_TO_GAME: - if(CTRL_CROSS(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) rarch_settings_change(S_RETURN_TO_GAME); strlcpy(comment, "Press 'CROSS' to return back to the game.", sizeof(comment)); break; case MENU_ITEM_RESET: - if(CTRL_CROSS(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { rarch_settings_change(S_RETURN_TO_GAME); rarch_game_reset(); @@ -1974,14 +1976,14 @@ static void ingame_menu(void) strlcpy(comment, "Press 'CROSS' to reset the game.", sizeof(comment)); break; case MENU_ITEM_RETURN_TO_MENU: - if(CTRL_CROSS(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { rarch_settings_change(S_RETURN_TO_MENU); } strlcpy(comment, "Press 'CROSS' to return to the ROM Browser menu.", sizeof(comment)); break; case MENU_ITEM_CHANGE_LIBRETRO: - if(CTRL_CROSS(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { menu_stack_increment(); menu_stack_push(menuStackindex, LIBRETRO_CHOICE); @@ -1991,37 +1993,40 @@ static void ingame_menu(void) break; #ifdef HAVE_MULTIMAN case MENU_ITEM_RETURN_TO_MULTIMAN: - if(CTRL_CROSS(trigger_state) && path_file_exists(MULTIMAN_EXECUTABLE)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) { - strlcpy(g_console.launch_app_on_exit, MULTIMAN_EXECUTABLE, + if(path_file_exists(MULTIMAN_EXECUTABLE)) + { + strlcpy(g_console.launch_app_on_exit, MULTIMAN_EXECUTABLE, sizeof(g_console.launch_app_on_exit)); - rarch_settings_change(S_RETURN_TO_DASHBOARD); + rarch_settings_change(S_RETURN_TO_DASHBOARD); + } } strlcpy(comment, "Press 'CROSS' to quit the emulator and return to multiMAN.", sizeof(comment)); break; #endif case MENU_ITEM_RETURN_TO_DASHBOARD: - if(CTRL_CROSS(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_B)) rarch_settings_change(S_RETURN_TO_DASHBOARD); strlcpy(comment, "Press 'CROSS' to quit the emulator and return to the XMB.", sizeof(comment)); break; } - if(CTRL_UP(trigger_state) || CTRL_LSTICK_UP(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_UP)) { if(g_console.ingame_menu_item > 0) g_console.ingame_menu_item--; } - if(CTRL_DOWN(trigger_state) || CTRL_LSTICK_DOWN(trigger_state)) + if(trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN)) { if(g_console.ingame_menu_item < (MENU_ITEM_LAST-1)) g_console.ingame_menu_item++; } - if(CTRL_L3(trigger_state) && CTRL_R3(trigger_state)) + if((trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_L3)) && (trigger_st & (1 << RETRO_DEVICE_ID_JOYPAD_R3))) rarch_settings_change(S_RETURN_TO_GAME); display_menubar();