From 9bf43a16b4dcb5a59902e90a22d8447884a252bf Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Wed, 9 Jul 2025 22:07:38 +0200 Subject: [PATCH] Move SDL_PumpEvents (#482) * Move SDL_PumpEvents * more --- parallel-rdp/wsi_platform.cpp | 1 - src/ui/input.rs | 2 ++ src/ui/vru.rs | 4 +--- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/parallel-rdp/wsi_platform.cpp b/parallel-rdp/wsi_platform.cpp index e991187..a543b80 100644 --- a/parallel-rdp/wsi_platform.cpp +++ b/parallel-rdp/wsi_platform.cpp @@ -56,7 +56,6 @@ bool SDL_WSIPlatform::alive(Vulkan::WSI &wsi) void SDL_WSIPlatform::poll_input() { - SDL_PumpEvents(); } void SDL_WSIPlatform::poll_input_async(Granite::InputTrackerHandler *handler) diff --git a/src/ui/input.rs b/src/ui/input.rs index a42d78a..a7b2b7b 100644 --- a/src/ui/input.rs +++ b/src/ui/input.rs @@ -363,6 +363,8 @@ pub fn get_controller_paths(game_ui: &ui::Ui) -> Vec> { } pub fn get(ui: &ui::Ui, channel: usize) -> InputData { + unsafe { sdl3_sys::events::SDL_PumpEvents() }; + let profile_name = ui.config.input.input_profile_binding[channel].clone(); let profile = ui.config.input.input_profiles.get(&profile_name).unwrap(); let mut keys = 0; diff --git a/src/ui/vru.rs b/src/ui/vru.rs index 5cfc8cc..50a93ce 100644 --- a/src/ui/vru.rs +++ b/src/ui/vru.rs @@ -1,5 +1,3 @@ -use crate::ui; - pub fn prompt_for_match( words: &[String], window_notifier: &tokio::sync::mpsc::Sender>>, @@ -13,7 +11,7 @@ pub fn prompt_for_match( while result.is_err() { result = word_index_receiver.try_recv(); std::thread::sleep(std::time::Duration::from_secs_f64(1.0 / 60.0)); - ui::video::update_screen(); // so the OS doesn't complain about the game window being frozen + unsafe { sdl3_sys::events::SDL_PumpEvents() }; // so the OS doesn't complain about the game window being frozen } for (i, v) in words.iter().enumerate() { if *v == *result.as_ref().unwrap() {