mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-23 13:51:30 +11:00
0d366ffbda
This re-works the portable `run()` API that consumes the `EventLoop` and runs the loop on the calling thread until the app exits. This can be supported across _all_ platforms and compared to the previous `run() -> !` API is now able to return a `Result` status on all platforms except iOS and Web. Fixes: #2709 By moving away from `run() -> !` we stop calling `std::process::exit()` internally as a means to kill the process without returning which means it's possible to return an exit status and applications can return from their `main()` function normally. This also fixes Android support where an Activity runs in a thread but we can't assume to have full ownership of the process (other services could be running in separate threads). Additionally all examples have generally been updated so that `main()` returns a `Result` from `run()` Fixes: #2709
71 lines
2.2 KiB
Rust
71 lines
2.2 KiB
Rust
#![allow(clippy::single_match)]
|
|
|
|
use std::collections::HashMap;
|
|
|
|
use simple_logger::SimpleLogger;
|
|
use winit::{
|
|
event::{ElementState, Event, KeyEvent, WindowEvent},
|
|
event_loop::EventLoop,
|
|
keyboard::Key,
|
|
window::Window,
|
|
};
|
|
|
|
#[path = "util/fill.rs"]
|
|
mod fill;
|
|
|
|
fn main() -> Result<(), impl std::error::Error> {
|
|
SimpleLogger::new().init().unwrap();
|
|
let event_loop = EventLoop::new();
|
|
|
|
let mut windows = HashMap::new();
|
|
for _ in 0..3 {
|
|
let window = Window::new(&event_loop).unwrap();
|
|
println!("Opened a new window: {:?}", window.id());
|
|
windows.insert(window.id(), window);
|
|
}
|
|
|
|
println!("Press N to open a new window.");
|
|
|
|
event_loop.run(move |event, event_loop, control_flow| {
|
|
control_flow.set_wait();
|
|
|
|
match event {
|
|
Event::WindowEvent { event, window_id } => {
|
|
match event {
|
|
WindowEvent::CloseRequested => {
|
|
println!("Window {window_id:?} has received the signal to close");
|
|
|
|
// This drops the window, causing it to close.
|
|
windows.remove(&window_id);
|
|
|
|
if windows.is_empty() {
|
|
control_flow.set_exit();
|
|
}
|
|
}
|
|
WindowEvent::KeyboardInput {
|
|
event:
|
|
KeyEvent {
|
|
state: ElementState::Pressed,
|
|
logical_key: Key::Character(c),
|
|
..
|
|
},
|
|
is_synthetic: false,
|
|
..
|
|
} if matches!(c.as_ref(), "n" | "N") => {
|
|
let window = Window::new(event_loop).unwrap();
|
|
println!("Opened a new window: {:?}", window.id());
|
|
windows.insert(window.id(), window);
|
|
}
|
|
_ => (),
|
|
}
|
|
}
|
|
Event::RedrawRequested(window_id) => {
|
|
if let Some(window) = windows.get(&window_id) {
|
|
fill::fill_window(window);
|
|
}
|
|
}
|
|
_ => (),
|
|
}
|
|
})
|
|
}
|