|
|
|
@ -461,6 +461,7 @@ void CommonHostInterface::UpdateControllerInterface()
|
|
|
|
|
|
|
|
|
|
|
|
if (m_controller_interface)
|
|
|
|
if (m_controller_interface)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
ClearInputMap();
|
|
|
|
m_controller_interface->Shutdown();
|
|
|
|
m_controller_interface->Shutdown();
|
|
|
|
m_controller_interface.reset();
|
|
|
|
m_controller_interface.reset();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -938,14 +939,19 @@ bool CommonHostInterface::HandleHostMouseEvent(HostMouseButton button, bool pres
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void CommonHostInterface::UpdateInputMap(SettingsInterface& si)
|
|
|
|
void CommonHostInterface::UpdateInputMap(SettingsInterface& si)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
ClearInputMap();
|
|
|
|
|
|
|
|
UpdateControllerInputMap(si);
|
|
|
|
|
|
|
|
UpdateHotkeyInputMap(si);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void CommonHostInterface::ClearInputMap()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
m_keyboard_input_handlers.clear();
|
|
|
|
m_keyboard_input_handlers.clear();
|
|
|
|
m_mouse_input_handlers.clear();
|
|
|
|
m_mouse_input_handlers.clear();
|
|
|
|
|
|
|
|
m_controller_vibration_motors.clear();
|
|
|
|
if (m_controller_interface)
|
|
|
|
if (m_controller_interface)
|
|
|
|
m_controller_interface->ClearBindings();
|
|
|
|
m_controller_interface->ClearBindings();
|
|
|
|
|
|
|
|
|
|
|
|
UpdateControllerInputMap(si);
|
|
|
|
|
|
|
|
UpdateHotkeyInputMap(si);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void CommonHostInterface::AddControllerRumble(u32 controller_index, u32 num_motors, ControllerRumbleCallback callback)
|
|
|
|
void CommonHostInterface::AddControllerRumble(u32 controller_index, u32 num_motors, ControllerRumbleCallback callback)
|
|
|
|
|