diff options
| author | 2018-09-11 03:29:59 +0200 | |
|---|---|---|
| committer | 2018-09-10 21:29:59 -0400 | |
| commit | 804115b2a46d25408b34e3e08e83d3f926fd9968 (patch) | |
| tree | e34636fd7928333756ef2d1282a2e2ef9c908069 /src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | |
| parent | Merge pull request #1286 from bunnei/multi-clear (diff) | |
| download | yuzu-804115b2a46d25408b34e3e08e83d3f926fd9968.tar.gz yuzu-804115b2a46d25408b34e3e08e83d3f926fd9968.tar.xz yuzu-804115b2a46d25408b34e3e08e83d3f926fd9968.zip | |
Port #4141 from citra: Joystick hotplug support (#1275)
* Joystick hotplug support (#4141)
* use SDL_PollEvent instead of SDL_JoystickUpdate
Register hot plugged controller by GUID if they were configured in a previous session
* Move SDL_PollEvent into its own thread
* Don't store SDLJoystick pointer in Input Device; Get pointer on each GetStatus call
* Fix that joystick_list gets cleared after SDL_Quit
* Add VirtualJoystick for InputDevices thats never nullptr
* fixup! Add VirtualJoystick for InputDevices thats never nullptr
* fixup! fixup! Add VirtualJoystick for InputDevices thats never nullptr
* Remove SDL_GameController, make SDL_Joystick* unique_ptr
* fixup! Remove SDL_GameController, make SDL_Joystick* unique_ptr
* Adressed feedback; fixed handling of same guid reconnects
* fixup! Adressed feedback; fixed handling of same guid reconnects
* merge the two joystick_lists into one
* make SDLJoystick a member of VirtualJoystick
* fixup! make SDLJoystick a member of VirtualJoystick
* fixup! make SDLJoystick a member of VirtualJoystick
* fixup! fixup! make SDLJoystick a member of VirtualJoystick
* SDLJoystick: Addressed review comments
* Address one missed review comment
Diffstat (limited to 'src/yuzu_cmd/emu_window/emu_window_sdl2.cpp')
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index 2f7916256..1c4717123 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include "input_common/keyboard.h" | 16 | #include "input_common/keyboard.h" |
| 17 | #include "input_common/main.h" | 17 | #include "input_common/main.h" |
| 18 | #include "input_common/motion_emu.h" | 18 | #include "input_common/motion_emu.h" |
| 19 | #include "input_common/sdl/sdl.h" | ||
| 19 | #include "yuzu_cmd/emu_window/emu_window_sdl2.h" | 20 | #include "yuzu_cmd/emu_window/emu_window_sdl2.h" |
| 20 | 21 | ||
| 21 | void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) { | 22 | void EmuWindow_SDL2::OnMouseMotion(s32 x, s32 y) { |
| @@ -116,7 +117,7 @@ EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) { | |||
| 116 | SDL_SetMainReady(); | 117 | SDL_SetMainReady(); |
| 117 | 118 | ||
| 118 | // Initialize the window | 119 | // Initialize the window |
| 119 | if (SDL_Init(SDL_INIT_VIDEO) < 0) { | 120 | if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) { |
| 120 | LOG_CRITICAL(Frontend, "Failed to initialize SDL2! Exiting..."); | 121 | LOG_CRITICAL(Frontend, "Failed to initialize SDL2! Exiting..."); |
| 121 | exit(1); | 122 | exit(1); |
| 122 | } | 123 | } |
| @@ -176,6 +177,7 @@ EmuWindow_SDL2::EmuWindow_SDL2(bool fullscreen) { | |||
| 176 | } | 177 | } |
| 177 | 178 | ||
| 178 | EmuWindow_SDL2::~EmuWindow_SDL2() { | 179 | EmuWindow_SDL2::~EmuWindow_SDL2() { |
| 180 | InputCommon::SDL::CloseSDLJoysticks(); | ||
| 179 | SDL_GL_DeleteContext(gl_context); | 181 | SDL_GL_DeleteContext(gl_context); |
| 180 | SDL_Quit(); | 182 | SDL_Quit(); |
| 181 | 183 | ||
| @@ -220,6 +222,9 @@ void EmuWindow_SDL2::PollEvents() { | |||
| 220 | case SDL_QUIT: | 222 | case SDL_QUIT: |
| 221 | is_open = false; | 223 | is_open = false; |
| 222 | break; | 224 | break; |
| 225 | default: | ||
| 226 | InputCommon::SDL::HandleGameControllerEvent(event); | ||
| 227 | break; | ||
| 223 | } | 228 | } |
| 224 | } | 229 | } |
| 225 | } | 230 | } |