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
62 lines
1.7 KiB
Rust
62 lines
1.7 KiB
Rust
#![allow(clippy::single_match)]
|
|
|
|
#[cfg(not(wasm_platform))]
|
|
fn main() -> Result<(), impl std::error::Error> {
|
|
use simple_logger::SimpleLogger;
|
|
use winit::{
|
|
event::{Event, WindowEvent},
|
|
event_loop::EventLoopBuilder,
|
|
window::WindowBuilder,
|
|
};
|
|
|
|
#[path = "util/fill.rs"]
|
|
mod fill;
|
|
|
|
#[derive(Debug, Clone, Copy)]
|
|
enum CustomEvent {
|
|
Timer,
|
|
}
|
|
|
|
SimpleLogger::new().init().unwrap();
|
|
let event_loop = EventLoopBuilder::<CustomEvent>::with_user_event().build();
|
|
|
|
let window = WindowBuilder::new()
|
|
.with_title("A fantastic window!")
|
|
.build(&event_loop)
|
|
.unwrap();
|
|
|
|
// `EventLoopProxy` allows you to dispatch custom events to the main Winit event
|
|
// loop from any thread.
|
|
let event_loop_proxy = event_loop.create_proxy();
|
|
|
|
std::thread::spawn(move || {
|
|
// Wake up the `event_loop` once every second and dispatch a custom event
|
|
// from a different thread.
|
|
loop {
|
|
std::thread::sleep(std::time::Duration::from_secs(1));
|
|
event_loop_proxy.send_event(CustomEvent::Timer).ok();
|
|
}
|
|
});
|
|
|
|
event_loop.run(move |event, _, control_flow| {
|
|
control_flow.set_wait();
|
|
|
|
match event {
|
|
Event::UserEvent(event) => println!("user event: {event:?}"),
|
|
Event::WindowEvent {
|
|
event: WindowEvent::CloseRequested,
|
|
..
|
|
} => control_flow.set_exit(),
|
|
Event::RedrawRequested(_) => {
|
|
fill::fill_window(&window);
|
|
}
|
|
_ => (),
|
|
}
|
|
})
|
|
}
|
|
|
|
#[cfg(wasm_platform)]
|
|
fn main() {
|
|
panic!("This example is not supported on web.");
|
|
}
|