diff options
| author | 2022-11-29 18:45:25 -0500 | |
|---|---|---|
| committer | 2022-11-29 18:45:25 -0500 | |
| commit | cafca891ea7c02a3e298675b070aef86773220b7 (patch) | |
| tree | 8a7180b59abdea9ea1ade1b2fdc6b03ae8fcd012 /src/input_common/main.cpp | |
| parent | Merge pull request #9352 from lioncash/vidcast (diff) | |
| parent | input_common: Pump sdl events from main thread (diff) | |
| download | yuzu-cafca891ea7c02a3e298675b070aef86773220b7.tar.gz yuzu-cafca891ea7c02a3e298675b070aef86773220b7.tar.xz yuzu-cafca891ea7c02a3e298675b070aef86773220b7.zip | |
Merge pull request #9322 from german77/pump_events
input_common: Pump SDL events from main thread
Diffstat (limited to 'src/input_common/main.cpp')
| -rw-r--r-- | src/input_common/main.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp index baeed2e02..942a13535 100644 --- a/src/input_common/main.cpp +++ b/src/input_common/main.cpp | |||
| @@ -318,6 +318,12 @@ struct InputSubsystem::Impl { | |||
| 318 | #endif | 318 | #endif |
| 319 | } | 319 | } |
| 320 | 320 | ||
| 321 | void PumpEvents() const { | ||
| 322 | #ifdef HAVE_SDL2 | ||
| 323 | sdl->PumpEvents(); | ||
| 324 | #endif | ||
| 325 | } | ||
| 326 | |||
| 321 | void RegisterInput(const MappingData& data) { | 327 | void RegisterInput(const MappingData& data) { |
| 322 | mapping_factory->RegisterInput(data); | 328 | mapping_factory->RegisterInput(data); |
| 323 | } | 329 | } |
| @@ -466,6 +472,10 @@ void InputSubsystem::StopMapping() const { | |||
| 466 | impl->mapping_factory->StopMapping(); | 472 | impl->mapping_factory->StopMapping(); |
| 467 | } | 473 | } |
| 468 | 474 | ||
| 475 | void InputSubsystem::PumpEvents() const { | ||
| 476 | impl->PumpEvents(); | ||
| 477 | } | ||
| 478 | |||
| 469 | std::string GenerateKeyboardParam(int key_code) { | 479 | std::string GenerateKeyboardParam(int key_code) { |
| 470 | Common::ParamPackage param; | 480 | Common::ParamPackage param; |
| 471 | param.Set("engine", "keyboard"); | 481 | param.Set("engine", "keyboard"); |