piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

HotKey: Allow more than one hotkey at the same time.

Browse Source
This commit is contained in:
degasus
2015-05-29 18:11:26 +02:00
parent 4eef805270
commit 19f753de6b
1 changed files with 113 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
Source/Core/DolphinWX/Frame.cpp
View File

@ -932,9 +932,6 @@ void CFrame::OnGameListCtrlItemActivated(wxListEvent& WXUNUSED(event))
static bool IsHotkey(wxKeyEvent &event, int id, bool held = false) static bool IsHotkey(wxKeyEvent &event, int id, bool held = false)
{ {
if (Core::GetState() == Core::CORE_UNINITIALIZED)
return false;
// Input event hotkey // Input event hotkey
if (event.GetKeyCode() == WXK_NONE) if (event.GetKeyCode() == WXK_NONE)
{ {
@ -1084,9 +1081,16 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
{ {
if (Core::GetState() != Core::CORE_UNINITIALIZED && if (Core::GetState() != Core::CORE_UNINITIALIZED &&
(RendererHasFocus() || TASInputHasFocus())) (RendererHasFocus() || TASInputHasFocus()))
{
if (IsHotkey(event, HK_TOGGLE_THROTTLE))
{
Core::SetIsFramelimiterTempDisabled(true);
}
else
{ {
ParseHotkeys(event); ParseHotkeys(event);
} }
}
else else
{ {
event.Skip(); event.Skip();
@ -1297,138 +1301,134 @@ void CFrame::PollHotkeys(wxTimerEvent& event)
{ {
HotkeyManagerEmu::GetStatus(); HotkeyManagerEmu::GetStatus();
wxKeyEvent keyevent = 0; wxKeyEvent keyevent = 0;
if (IsHotkey(keyevent, HK_TOGGLE_THROTTLE))
{
Core::SetIsFramelimiterTempDisabled(false);
}
else
{
ParseHotkeys(keyevent); ParseHotkeys(keyevent);
} }
} }
}
void CFrame::ParseHotkeys(wxKeyEvent &event) void CFrame::ParseHotkeys(wxKeyEvent &event)
{ {
if (Core::GetState() == Core::CORE_UNINITIALIZED)
{
event.Skip();
return;
}
int WiimoteId = -1; int WiimoteId = -1;
// Toggle fullscreen // Toggle fullscreen
if (IsHotkey(event, HK_FULLSCREEN)) if (IsHotkey(event, HK_FULLSCREEN))
DoFullscreen(!RendererIsFullscreen()); DoFullscreen(!RendererIsFullscreen());
// Send Debugger keys to CodeWindow
else if (g_pCodeWindow && (event.GetKeyCode() >= WXK_F9 && event.GetKeyCode() <= WXK_F11))
event.Skip();
// Pause and Unpause // Pause and Unpause
else if (IsHotkey(event, HK_PLAY_PAUSE)) if (IsHotkey(event, HK_PLAY_PAUSE))
DoPause(); DoPause();
// Stop // Stop
else if (IsHotkey(event, HK_STOP)) if (IsHotkey(event, HK_STOP))
DoStop(); DoStop();
// Screenshot hotkey // Screenshot hotkey
else if (IsHotkey(event, HK_SCREENSHOT)) if (IsHotkey(event, HK_SCREENSHOT))
Core::SaveScreenShot(); Core::SaveScreenShot();
else if (IsHotkey(event, HK_EXIT)) if (IsHotkey(event, HK_EXIT))
wxPostEvent(this, wxCommandEvent(wxID_EXIT)); wxPostEvent(this, wxCommandEvent(wxID_EXIT));
else if (IsHotkey(event, HK_VOLUME_DOWN)) if (IsHotkey(event, HK_VOLUME_DOWN))
AudioCommon::DecreaseVolume(3); AudioCommon::DecreaseVolume(3);
else if (IsHotkey(event, HK_VOLUME_UP)) if (IsHotkey(event, HK_VOLUME_UP))
AudioCommon::IncreaseVolume(3); AudioCommon::IncreaseVolume(3);
else if (IsHotkey(event, HK_VOLUME_TOGGLE_MUTE)) if (IsHotkey(event, HK_VOLUME_TOGGLE_MUTE))
AudioCommon::ToggleMuteVolume(); AudioCommon::ToggleMuteVolume();
// Wiimote connect and disconnect hotkeys // Wiimote connect and disconnect hotkeys
else if (IsHotkey(event, HK_WIIMOTE1_CONNECT)) if (IsHotkey(event, HK_WIIMOTE1_CONNECT))
WiimoteId = 0; WiimoteId = 0;
else if (IsHotkey(event, HK_WIIMOTE2_CONNECT)) if (IsHotkey(event, HK_WIIMOTE2_CONNECT))
WiimoteId = 1; WiimoteId = 1;
else if (IsHotkey(event, HK_WIIMOTE3_CONNECT)) if (IsHotkey(event, HK_WIIMOTE3_CONNECT))
WiimoteId = 2; WiimoteId = 2;
else if (IsHotkey(event, HK_WIIMOTE4_CONNECT)) if (IsHotkey(event, HK_WIIMOTE4_CONNECT))
WiimoteId = 3; WiimoteId = 3;
else if (IsHotkey(event, HK_BALANCEBOARD_CONNECT)) if (IsHotkey(event, HK_BALANCEBOARD_CONNECT))
WiimoteId = 4; WiimoteId = 4;
else if (IsHotkey(event, HK_TOGGLE_IR)) if (IsHotkey(event, HK_TOGGLE_IR))
{ {
OSDChoice = 1; OSDChoice = 1;
// Toggle native resolution // Toggle native resolution
if (++g_Config.iEFBScale > SCALE_4X) if (++g_Config.iEFBScale > SCALE_4X)
g_Config.iEFBScale = SCALE_AUTO; g_Config.iEFBScale = SCALE_AUTO;
} }
else if (IsHotkey(event, HK_INCREASE_IR)) if (IsHotkey(event, HK_INCREASE_IR))
{ {
OSDChoice = 1; OSDChoice = 1;
if (++g_Config.iEFBScale > SCALE_4X) ++g_Config.iEFBScale;
g_Config.iEFBScale = SCALE_4X;
} }
else if (IsHotkey(event, HK_DECREASE_IR)) if (IsHotkey(event, HK_DECREASE_IR))
{ {
OSDChoice = 1; OSDChoice = 1;
if (--g_Config.iEFBScale < SCALE_1X) if (--g_Config.iEFBScale < SCALE_1X)
g_Config.iEFBScale = SCALE_1X; g_Config.iEFBScale = SCALE_1X;
} }
else if (IsHotkey(event, HK_TOGGLE_AR)) if (IsHotkey(event, HK_TOGGLE_AR))
{ {
OSDChoice = 2; OSDChoice = 2;
// Toggle aspect ratio // Toggle aspect ratio
g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3; g_Config.iAspectRatio = (g_Config.iAspectRatio + 1) & 3;
} }
else if (IsHotkey(event, HK_TOGGLE_EFBCOPIES)) if (IsHotkey(event, HK_TOGGLE_EFBCOPIES))
{ {
OSDChoice = 3; OSDChoice = 3;
// Toggle EFB copies between EFB2RAM and EFB2Texture // Toggle EFB copies between EFB2RAM and EFB2Texture
g_Config.bSkipEFBCopyToRam = !g_Config.bSkipEFBCopyToRam; g_Config.bSkipEFBCopyToRam = !g_Config.bSkipEFBCopyToRam;
} }
else if (IsHotkey(event, HK_TOGGLE_FOG)) if (IsHotkey(event, HK_TOGGLE_FOG))
{ {
OSDChoice = 4; OSDChoice = 4;
g_Config.bDisableFog = !g_Config.bDisableFog; g_Config.bDisableFog = !g_Config.bDisableFog;
} }
if (IsHotkey(event, HK_TOGGLE_THROTTLE, false))
{
Core::SetIsFramelimiterTempDisabled(false);
}
else if (IsHotkey(event, HK_TOGGLE_THROTTLE, true)) else if (IsHotkey(event, HK_TOGGLE_THROTTLE, true))
{ {
Core::SetIsFramelimiterTempDisabled(true); Core::SetIsFramelimiterTempDisabled(true);
} }
else if (IsHotkey(event, HK_DECREASE_FRAME_LIMIT)) if (IsHotkey(event, HK_DECREASE_FRAME_LIMIT))
{ {
if (--SConfig::GetInstance().m_Framelimit > 0x19) if (--SConfig::GetInstance().m_Framelimit > 0x19)
SConfig::GetInstance().m_Framelimit = 0x19; SConfig::GetInstance().m_Framelimit = 0x19;
} }
else if (IsHotkey(event, HK_INCREASE_FRAME_LIMIT)) if (IsHotkey(event, HK_INCREASE_FRAME_LIMIT))
{ {
if (++SConfig::GetInstance().m_Framelimit > 0x19) if (++SConfig::GetInstance().m_Framelimit > 0x19)
SConfig::GetInstance().m_Framelimit = 0; SConfig::GetInstance().m_Framelimit = 0;
} }
else if (IsHotkey(event, HK_SAVE_STATE_SLOT_SELECTED)) if (IsHotkey(event, HK_SAVE_STATE_SLOT_SELECTED))
{ {
State::Save(g_saveSlot); State::Save(g_saveSlot);
} }
else if (IsHotkey(event, HK_LOAD_STATE_SLOT_SELECTED)) if (IsHotkey(event, HK_LOAD_STATE_SLOT_SELECTED))
{ {
State::Load(g_saveSlot); State::Load(g_saveSlot);
} }
else if (IsHotkey(event, HK_DECREASE_DEPTH, true)) if (IsHotkey(event, HK_DECREASE_DEPTH, true))
{ {
if (--g_Config.iStereoDepth < 0) if (--g_Config.iStereoDepth < 0)
g_Config.iStereoDepth = 0; g_Config.iStereoDepth = 0;
} }
else if (IsHotkey(event, HK_INCREASE_DEPTH, true)) if (IsHotkey(event, HK_INCREASE_DEPTH, true))
{ {
if (++g_Config.iStereoDepth > 100) if (++g_Config.iStereoDepth > 100)
g_Config.iStereoDepth = 100; g_Config.iStereoDepth = 100;
} }
else if (IsHotkey(event, HK_DECREASE_CONVERGENCE, true)) if (IsHotkey(event, HK_DECREASE_CONVERGENCE, true))
{ {
g_Config.iStereoConvergence -= 5; g_Config.iStereoConvergence -= 5;
if (g_Config.iStereoConvergence < 0) if (g_Config.iStereoConvergence < 0)
g_Config.iStereoConvergence = 0; g_Config.iStereoConvergence = 0;
} }
else if (IsHotkey(event, HK_INCREASE_CONVERGENCE, true)) if (IsHotkey(event, HK_INCREASE_CONVERGENCE, true))
{ {
g_Config.iStereoConvergence += 5; g_Config.iStereoConvergence += 5;
if (g_Config.iStereoConvergence > 500) if (g_Config.iStereoConvergence > 500)
g_Config.iStereoConvergence = 500; g_Config.iStereoConvergence = 500;
} }
else
{
for (int i = HK_SELECT_STATE_SLOT_1; i < HK_SELECT_STATE_SLOT_10; ++i) for (int i = HK_SELECT_STATE_SLOT_1; i < HK_SELECT_STATE_SLOT_10; ++i)
{ {
if (IsHotkey(event, i)) if (IsHotkey(event, i))
@ -1474,11 +1474,8 @@ void CFrame::ParseHotkeys(wxKeyEvent &event)
if (i == NUM_HOTKEYS) if (i == NUM_HOTKEYS)
event.Skip(); event.Skip();
#endif #endif
}
// Actually perform the Wiimote connection or disconnection // Actually perform the Wiimote connection or disconnection
if (Core::GetState() != Core::CORE_UNINITIALIZED)
{
if (WiimoteId >= 0 && SConfig::GetInstance().m_LocalCoreStartupParameter.bWii) if (WiimoteId >= 0 && SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
{ {
wxCommandEvent evt; wxCommandEvent evt;
@ -1487,26 +1484,24 @@ void CFrame::ParseHotkeys(wxKeyEvent &event)
} }
static float debugSpeed = 1.0f; static float debugSpeed = 1.0f;
if (IsHotkey(event, HK_FREELOOK_DECREASE_SPEED, true)) if (IsHotkey(event, HK_FREELOOK_DECREASE_SPEED, true))
debugSpeed /= 1.1f; debugSpeed /= 1.1f;
else if (IsHotkey(event, HK_FREELOOK_INCREASE_SPEED, true)) if (IsHotkey(event, HK_FREELOOK_INCREASE_SPEED, true))
debugSpeed *= 1.1f; debugSpeed *= 1.1f;
else if (IsHotkey(event, HK_FREELOOK_RESET_SPEED, true)) if (IsHotkey(event, HK_FREELOOK_RESET_SPEED, true))
debugSpeed = 1.0f; debugSpeed = 1.0f;
else if (IsHotkey(event, HK_FREELOOK_UP, true)) if (IsHotkey(event, HK_FREELOOK_UP, true))
VertexShaderManager::TranslateView(0.0f, 0.0f, -debugSpeed); VertexShaderManager::TranslateView(0.0f, 0.0f, -debugSpeed);
else if (IsHotkey(event, HK_FREELOOK_DOWN, true)) if (IsHotkey(event, HK_FREELOOK_DOWN, true))
VertexShaderManager::TranslateView(0.0f, 0.0f, debugSpeed); VertexShaderManager::TranslateView(0.0f, 0.0f, debugSpeed);
else if (IsHotkey(event, HK_FREELOOK_LEFT, true)) if (IsHotkey(event, HK_FREELOOK_LEFT, true))
VertexShaderManager::TranslateView(debugSpeed, 0.0f); VertexShaderManager::TranslateView(debugSpeed, 0.0f);
else if (IsHotkey(event, HK_FREELOOK_RIGHT, true)) if (IsHotkey(event, HK_FREELOOK_RIGHT, true))
VertexShaderManager::TranslateView(-debugSpeed, 0.0f); VertexShaderManager::TranslateView(-debugSpeed, 0.0f);
else if (IsHotkey(event, HK_FREELOOK_ZOOM_IN, true)) if (IsHotkey(event, HK_FREELOOK_ZOOM_IN, true))
VertexShaderManager::TranslateView(0.0f, debugSpeed); VertexShaderManager::TranslateView(0.0f, debugSpeed);
else if (IsHotkey(event, HK_FREELOOK_ZOOM_OUT, true)) if (IsHotkey(event, HK_FREELOOK_ZOOM_OUT, true))
VertexShaderManager::TranslateView(0.0f, -debugSpeed); VertexShaderManager::TranslateView(0.0f, -debugSpeed);
else if (IsHotkey(event, HK_FREELOOK_RESET, true)) if (IsHotkey(event, HK_FREELOOK_RESET, true))
VertexShaderManager::ResetView(); VertexShaderManager::ResetView();
} }
}