fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dependency injection for apu/gpu/hid.

Browse Source
This commit is contained in:
Ben Vanik
2015-11-08 15:02:24 -08:00
parent 9a6c5c5c74
commit 5834a42ef3
34 changed files with 217 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/xenia/hid/winkey/winkey_hid.cc
View File

@@ -15,8 +15,8 @@ namespace xe {
namespace hid {
namespace winkey {
std::unique_ptr<InputDriver> Create(InputSystem* input_system) {
return std::make_unique<WinKeyInputDriver>(input_system);
std::unique_ptr<InputDriver> Create(xe::ui::Window* window) {
return std::make_unique<WinKeyInputDriver>(window);
}
} // namespace winkey

2
src/xenia/hid/winkey/winkey_hid.h
View File

@@ -18,7 +18,7 @@ namespace xe {
namespace hid {
namespace winkey {
std::unique_ptr<InputDriver> Create(InputSystem* input_system);
std::unique_ptr<InputDriver> Create(xe::ui::Window* window);
} // namespace winkey
} // namespace hid

10
src/xenia/hid/winkey/winkey_input_driver.cc
View File

@@ -19,10 +19,10 @@ namespace xe {
namespace hid {
namespace winkey {
WinKeyInputDriver::WinKeyInputDriver(InputSystem* input_system)
: InputDriver(input_system), packet_number_(1) {
WinKeyInputDriver::WinKeyInputDriver(xe::ui::Window* window)
: InputDriver(window), packet_number_(1) {
// Register a key listener.
input_system_->window()->on_key_down.AddListener([this](ui::KeyEvent* evt) {
window_->on_key_down.AddListener([this](ui::KeyEvent* evt) {
auto global_lock = global_critical_region_.Acquire();
KeyEvent key;
@@ -32,7 +32,7 @@ WinKeyInputDriver::WinKeyInputDriver(InputSystem* input_system)
key.repeat_count = evt->repeat_count();
key_events_.push(key);
});
input_system_->window()->on_key_up.AddListener([this](ui::KeyEvent* evt) {
window_->on_key_up.AddListener([this](ui::KeyEvent* evt) {
auto global_lock = global_critical_region_.Acquire();
KeyEvent key;
@@ -89,7 +89,7 @@ X_RESULT WinKeyInputDriver::GetState(uint32_t user_index,
int16_t thumb_rx = 0;
int16_t thumb_ry = 0;
if (input_system_->window()->has_focus()) {
if (window_->has_focus()) {
if (IS_KEY_TOGGLED(VK_CAPITAL)) {
// dpad toggled
if (IS_KEY_DOWN(0x41)) {

2
src/xenia/hid/winkey/winkey_input_driver.h
View File

@@ -21,7 +21,7 @@ namespace winkey {
class WinKeyInputDriver : public InputDriver {
public:
explicit WinKeyInputDriver(InputSystem* input_system);
explicit WinKeyInputDriver(xe::ui::Window* window);
~WinKeyInputDriver() override;
X_STATUS Setup() override;