piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2565 from dolphin-emu/revert-2530-sdl_quit

Browse Source 
Revert "SDL: handle SDL_QUIT event"
This commit is contained in:
Matthew Parlane 2015-06-08 12:09:52 +10:00
commit bfeb79620d
6 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/Common.h
View File

@ -136,7 +136,6 @@ enum HOST_COMM
WM_USER_STOP = 10,
WM_USER_CREATE,
WM_USER_SETCURSOR,
WM_USER_QUIT,
};
// Used for notification on emulation state

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

@ -777,10 +777,6 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
case IDM_STOPPED:
OnStopped();
break;
case WM_USER_QUIT:
Close(true);
break;
}
}

2
Source/Core/DolphinWX/MainNoGUI.cpp
View File

@ -49,7 +49,7 @@ void Host_RefreshDSPDebuggerWindow() {}
static Common::Event updateMainFrameEvent;
void Host_Message(int Id)
{
if (Id == WM_USER_STOP || Id == WM_USER_QUIT)
if (Id == WM_USER_STOP)
running = false;
}

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

@ -134,11 +134,6 @@ 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,7 +7,6 @@
#include <sstream>
#include "Common/StringUtil.h"
#include "Core/Host.h"
#include "InputCommon/ControllerInterface/SDL/SDL.h"
#ifdef _WIN32
@ -68,19 +67,6 @@ 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)
@ -297,6 +283,12 @@ 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,7 +25,6 @@ namespace SDL
{
void Init( std::vector<Core::Device*>& devices );
void UpdateInput();
class Joystick : public Core::Device
{
@ -131,6 +130,8 @@ private:
#endif
public:
void UpdateInput() override;
Joystick(SDL_Joystick* const joystick, const int sdl_index, const unsigned int index);
~Joystick();