diff options
| author | Stenzek <stenzek@gmail.com> | 2018-10-03 17:34:27 +1000 |
|---|---|---|
| committer | Stenzek <stenzek@gmail.com> | 2018-10-29 11:46:06 +1000 |
| commit | a7f334dc2a3eec0119d8b77ec3ff35bbc8aae5f9 (patch) | |
| tree | d26810619b5fdefa7526619f3ae1dbd8155b9685 /Source/Core/InputCommon | |
| parent | 2b905eb06a806bc654281910d92693e2dcb6f201 (diff) | |
ControllerInterface: Don't crash on non-X11 QPA
Diffstat (limited to 'Source/Core/InputCommon')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 20 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.h | 7 |
2 files changed, 17 insertions, 10 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 0e6857c137..7be22d4a8d 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -41,12 +41,12 @@ ControllerInterface g_controller_interface; // // Detect devices and inputs outputs / will make refresh function later // -void ControllerInterface::Initialize(void* const hwnd) +void ControllerInterface::Initialize(const WindowSystemInfo& wsi) { if (m_is_init) return; - m_hwnd = hwnd; + m_wsi = wsi; m_is_populating_devices = true; #ifdef CIFACE_USE_DINPUT @@ -59,7 +59,8 @@ void ControllerInterface::Initialize(void* const hwnd) // nothing needed #endif #ifdef CIFACE_USE_OSX - ciface::OSX::Init(hwnd); + if (m_wsi.type == WindowSystemType::MacOS) + ciface::OSX::Init(wsi.render_surface); // nothing needed for Quartz #endif #ifdef CIFACE_USE_SDL @@ -92,17 +93,22 @@ void ControllerInterface::RefreshDevices() m_is_populating_devices = true; #ifdef CIFACE_USE_DINPUT - ciface::DInput::PopulateDevices(reinterpret_cast<HWND>(m_hwnd)); + if (m_wsi.type == WindowSystemType::Windows) + ciface::DInput::PopulateDevices(reinterpret_cast<HWND>(m_wsi.render_surface)); #endif #ifdef CIFACE_USE_XINPUT ciface::XInput::PopulateDevices(); #endif #ifdef CIFACE_USE_XLIB - ciface::XInput2::PopulateDevices(m_hwnd); + if (m_wsi.type == WindowSystemType::X11) + ciface::XInput2::PopulateDevices(m_wsi.render_surface); #endif #ifdef CIFACE_USE_OSX - ciface::OSX::PopulateDevices(m_hwnd); - ciface::Quartz::PopulateDevices(m_hwnd); + if (m_wsi.type == WindowSystemType::MacOS) + { + ciface::OSX::PopulateDevices(m_wsi.render_surface); + ciface::Quartz::PopulateDevices(m_wsi.render_surface); + } #endif #ifdef CIFACE_USE_SDL ciface::SDL::PopulateDevices(); diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h index c576b20fb3..2e078e8934 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h @@ -10,6 +10,7 @@ #include <mutex> #include <vector> +#include "Common/WindowSystemInfo.h" #include "InputCommon/ControllerInterface/Device.h" // enable disable sources @@ -39,8 +40,8 @@ class ControllerInterface : public ciface::Core::DeviceContainer { public: - ControllerInterface() : m_is_init(false), m_hwnd(nullptr) {} - void Initialize(void* const hwnd); + ControllerInterface() : m_is_init(false) {} + void Initialize(const WindowSystemInfo& wsi); void RefreshDevices(); void Shutdown(); void AddDevice(std::shared_ptr<ciface::Core::Device> device); @@ -56,7 +57,7 @@ private: mutable std::mutex m_callbacks_mutex; bool m_is_init; std::atomic<bool> m_is_populating_devices{false}; - void* m_hwnd; + WindowSystemInfo m_wsi; }; extern ControllerInterface g_controller_interface; |