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
78 lines
2.8 KiB
Rust
78 lines
2.8 KiB
Rust
#![allow(clippy::single_match)]
|
|
|
|
use simple_logger::SimpleLogger;
|
|
use winit::{
|
|
event::{DeviceEvent, ElementState, Event, KeyEvent, WindowEvent},
|
|
event_loop::EventLoop,
|
|
keyboard::{Key, ModifiersState},
|
|
window::{CursorGrabMode, WindowBuilder},
|
|
};
|
|
|
|
#[path = "util/fill.rs"]
|
|
mod fill;
|
|
|
|
fn main() -> Result<(), impl std::error::Error> {
|
|
SimpleLogger::new().init().unwrap();
|
|
let event_loop = EventLoop::new();
|
|
|
|
let window = WindowBuilder::new()
|
|
.with_title("Super Cursor Grab'n'Hide Simulator 9000")
|
|
.build(&event_loop)
|
|
.unwrap();
|
|
|
|
let mut modifiers = ModifiersState::default();
|
|
|
|
event_loop.run(move |event, _, control_flow| {
|
|
control_flow.set_wait();
|
|
|
|
match event {
|
|
Event::WindowEvent { event, .. } => match event {
|
|
WindowEvent::CloseRequested => control_flow.set_exit(),
|
|
WindowEvent::KeyboardInput {
|
|
event:
|
|
KeyEvent {
|
|
logical_key: key,
|
|
state: ElementState::Released,
|
|
..
|
|
},
|
|
..
|
|
} => {
|
|
let result = match key {
|
|
Key::Escape => {
|
|
control_flow.set_exit();
|
|
Ok(())
|
|
}
|
|
Key::Character(ch) => match ch.to_lowercase().as_str() {
|
|
"g" => window.set_cursor_grab(CursorGrabMode::Confined),
|
|
"l" => window.set_cursor_grab(CursorGrabMode::Locked),
|
|
"a" => window.set_cursor_grab(CursorGrabMode::None),
|
|
"h" => {
|
|
window.set_cursor_visible(modifiers.shift_key());
|
|
Ok(())
|
|
}
|
|
_ => Ok(()),
|
|
},
|
|
_ => Ok(()),
|
|
};
|
|
|
|
if let Err(err) = result {
|
|
println!("error: {err}");
|
|
}
|
|
}
|
|
WindowEvent::ModifiersChanged(new) => modifiers = new.state(),
|
|
_ => (),
|
|
},
|
|
Event::DeviceEvent { event, .. } => match event {
|
|
DeviceEvent::MouseMotion { delta } => println!("mouse moved: {delta:?}"),
|
|
DeviceEvent::Button { button, state } => match state {
|
|
ElementState::Pressed => println!("mouse button {button} pressed"),
|
|
ElementState::Released => println!("mouse button {button} released"),
|
|
},
|
|
_ => (),
|
|
},
|
|
Event::RedrawRequested(_) => fill::fill_window(&window),
|
|
_ => (),
|
|
}
|
|
})
|
|
}
|