mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-23 22:01:31 +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
66 lines
2.3 KiB
Rust
66 lines
2.3 KiB
Rust
#![allow(clippy::single_match)]
|
|
|
|
#[cfg(any(target_os = "macos", target_os = "windows", target_os = "linux"))]
|
|
use winit::{
|
|
dpi::LogicalSize,
|
|
event::{ElementState, Event, WindowEvent},
|
|
event_loop::{ControlFlow, EventLoop},
|
|
keyboard::{Key, ModifiersState},
|
|
// WARNING: This is not available on all platforms (for example on the web).
|
|
platform::modifier_supplement::KeyEventExtModifierSupplement,
|
|
window::WindowBuilder,
|
|
};
|
|
|
|
#[cfg(not(any(target_os = "macos", target_os = "windows", target_os = "linux")))]
|
|
fn main() {
|
|
println!("This example is not supported on this platform");
|
|
}
|
|
|
|
#[cfg(any(target_os = "macos", target_os = "windows", target_os = "linux"))]
|
|
fn main() -> Result<(), impl std::error::Error> {
|
|
#[path = "util/fill.rs"]
|
|
mod fill;
|
|
|
|
simple_logger::SimpleLogger::new().init().unwrap();
|
|
let event_loop = EventLoop::new();
|
|
|
|
let window = WindowBuilder::new()
|
|
.with_inner_size(LogicalSize::new(400.0, 200.0))
|
|
.build(&event_loop)
|
|
.unwrap();
|
|
|
|
let mut modifiers = ModifiersState::default();
|
|
|
|
event_loop.run(move |event, _, control_flow| {
|
|
*control_flow = ControlFlow::Wait;
|
|
|
|
match event {
|
|
Event::WindowEvent { event, .. } => match event {
|
|
WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,
|
|
WindowEvent::ModifiersChanged(new) => {
|
|
modifiers = new.state();
|
|
}
|
|
WindowEvent::KeyboardInput { event, .. } => {
|
|
if event.state == ElementState::Pressed && !event.repeat {
|
|
match event.key_without_modifiers().as_ref() {
|
|
Key::Character("1") => {
|
|
if modifiers.shift_key() {
|
|
println!("Shift + 1 | logical_key: {:?}", event.logical_key);
|
|
} else {
|
|
println!("1");
|
|
}
|
|
}
|
|
_ => (),
|
|
}
|
|
}
|
|
}
|
|
_ => (),
|
|
},
|
|
Event::RedrawRequested(_) => {
|
|
fill::fill_window(&window);
|
|
}
|
|
_ => (),
|
|
};
|
|
})
|
|
}
|