piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 05:40:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

SDL: handle SDL_QUIT event

Browse Source 
Using SDL_INIT_JOYSTICK implies SDL_INIT_EVENTS which installs a signal
handler for SIGINT and SIGTERM. There will be a way to prevent this in
2.0.4 but for now we'll need to handle SDL_QUIT.
This commit is contained in:
Tillmann Karras
2015-06-05 19:34:06 +02:00
parent 2f2e514b54
commit 9ec5a4544f
6 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
View File

@ -134,6 +134,11 @@ void ControllerInterface::Shutdown()
//
void ControllerInterface::UpdateInput()
{
#ifdef CIFACE_USE_SDL
// SDL currently also handles SIGINT and SIGTERM,
// so make sure to update it even if there is no SDL device.
ciface::SDL::UpdateInput();
#endif
for (ciface::Core::Device* d : m_devices)
d->UpdateInput();
}

20
Source/Core/InputCommon/ControllerInterface/SDL/SDL.cpp
View File

@ -7,6 +7,7 @@
#include <sstream>
#include "Common/StringUtil.h"
#include "Core/Host.h"
#include "InputCommon/ControllerInterface/SDL/SDL.h"
#ifdef _WIN32
@ -67,6 +68,19 @@ void Init( std::vector<Core::Device*>& devices )
}
}
void UpdateInput()
{
// Using SDL_INIT_JOYSTICK implies SDL_INIT_EVENT which installs a signal handler for SIGINT and SIGTERM.
// In the future, we will be able to prevent this from happening:
// SDL_SetHint(SDL_HINT_NO_SIGNAL_HANDLERS, "1");
// but this was added after SDL 2.0.3 and is scheduled to be included in 2.0.4.
// Until then, handle SDL_QUIT events here and tell Dolphin to exit.
if (SDL_QuitRequested())
Host_Message(WM_USER_QUIT);
SDL_JoystickUpdate();
}
Joystick::Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index)
: m_joystick(joystick)
, m_sdl_index(sdl_index)
@ -283,12 +297,6 @@ void Joystick::LeftRightEffect::SetSDLHapticEffect(ControlState state)
}
#endif
void Joystick::UpdateInput()
{
// each joystick is doin this, o well
SDL_JoystickUpdate();
}
std::string Joystick::GetName() const
{
return StripSpaces(GetJoystickName(m_sdl_index));

3
Source/Core/InputCommon/ControllerInterface/SDL/SDL.h
View File

@ -25,6 +25,7 @@ namespace SDL
{
void Init( std::vector<Core::Device*>& devices );
void UpdateInput();
class Joystick : public Core::Device
{
@ -130,8 +131,6 @@ private:
#endif
public:
void UpdateInput() override;
Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index);
~Joystick();