fix: ignore the controller while another window is in front
remus reads the controller from the device, whichever window has focus, so presses meant for a game in front also skipped tracks and paused in remus. It now follows winit's focus events, through slint's unstable-winit-030 feature since Slint does not expose window activation itself, and drops controller presses while the window is not in front. It assumes focus until told otherwise, so a window manager that never reports focus keeps the controller working.
This commit is contained in:
+24
@@ -289,6 +289,9 @@ pub struct App {
|
||||
volume_save_timer: Timer,
|
||||
/// Keyboard keys or the buttons of the controller used last.
|
||||
prompts: Prompts,
|
||||
/// Whether the window has focus. True until the windowing system says
|
||||
/// otherwise, so a system that never says still gets controller input.
|
||||
window_active: bool,
|
||||
/// Decoded hint icons, so a selection move does not parse SVG again.
|
||||
icons: RefCell<HashMap<(Prompts, Control), Vec<Image>>>,
|
||||
settings: Settings,
|
||||
@@ -383,6 +386,7 @@ impl App {
|
||||
art_waiting: false,
|
||||
flip_timer: Timer::default(),
|
||||
prompts: Prompts::Keyboard,
|
||||
window_active: true,
|
||||
icons: RefCell::default(),
|
||||
settings: config::load_settings(),
|
||||
fade: Fade {
|
||||
@@ -701,10 +705,30 @@ impl App {
|
||||
|
||||
/// A button pressed on a controller of this family.
|
||||
pub fn pad_action(&mut self, a: Action, family: Family) {
|
||||
// Meant for whatever is in front: a game, Steam, another app.
|
||||
if !self.window_active {
|
||||
return;
|
||||
}
|
||||
self.set_prompts(Prompts::Pad(family));
|
||||
self.action(a);
|
||||
}
|
||||
|
||||
/// The window gained or lost focus. Only the controller cares: keys only
|
||||
/// arrive while it has focus anyway.
|
||||
pub fn set_window_active(&mut self, active: bool) {
|
||||
if active != self.window_active {
|
||||
log::info!(
|
||||
"window {}",
|
||||
if active {
|
||||
"in front, controller on"
|
||||
} else {
|
||||
"in the background, controller off"
|
||||
}
|
||||
);
|
||||
self.window_active = active;
|
||||
}
|
||||
}
|
||||
|
||||
/// A controller connected (its family) or the last one disconnected.
|
||||
pub fn pad_present(&mut self, family: Option<Family>) {
|
||||
self.set_prompts(family.map_or(Prompts::Keyboard, Prompts::Pad));
|
||||
|
||||
+12
@@ -28,6 +28,18 @@ fn main() -> anyhow::Result<()> {
|
||||
let ui = AppWindow::new()?;
|
||||
ui.set_version(env!("CARGO_PKG_VERSION").into());
|
||||
app::install(&ui, rt.handle().clone());
|
||||
// The controller is read from the device, whichever window is in front, so
|
||||
// the app needs to know when another one is, to leave the presses to it.
|
||||
{
|
||||
use slint::winit_030::{EventResult, WinitWindowAccessor, winit::event::WindowEvent};
|
||||
ui.window().on_winit_window_event(|_, event| {
|
||||
if let WindowEvent::Focused(focused) = *event {
|
||||
log::debug!("window focused: {focused}");
|
||||
app::with_app(move |app| app.set_window_active(focused));
|
||||
}
|
||||
EventResult::Propagate
|
||||
});
|
||||
}
|
||||
input::spawn_gamepad(|ev| {
|
||||
let _ = slint::invoke_from_event_loop(move || {
|
||||
app::with_app(move |app| match ev {
|
||||
|
||||
Reference in New Issue
Block a user