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
96 lines
2.5 KiB
Rust
96 lines
2.5 KiB
Rust
#![allow(clippy::single_match)]
|
|
|
|
use simple_logger::SimpleLogger;
|
|
use winit::{
|
|
event::{ElementState, Event, KeyEvent, WindowEvent},
|
|
event_loop::EventLoop,
|
|
window::{CursorIcon, 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().build(&event_loop).unwrap();
|
|
window.set_title("A fantastic window!");
|
|
|
|
let mut cursor_idx = 0;
|
|
|
|
event_loop.run(move |event, _, control_flow| {
|
|
control_flow.set_wait();
|
|
|
|
match event {
|
|
Event::WindowEvent {
|
|
event:
|
|
WindowEvent::KeyboardInput {
|
|
event:
|
|
KeyEvent {
|
|
state: ElementState::Pressed,
|
|
..
|
|
},
|
|
..
|
|
},
|
|
..
|
|
} => {
|
|
println!("Setting cursor to \"{:?}\"", CURSORS[cursor_idx]);
|
|
window.set_cursor_icon(CURSORS[cursor_idx]);
|
|
if cursor_idx < CURSORS.len() - 1 {
|
|
cursor_idx += 1;
|
|
} else {
|
|
cursor_idx = 0;
|
|
}
|
|
}
|
|
Event::WindowEvent {
|
|
event: WindowEvent::CloseRequested,
|
|
..
|
|
} => {
|
|
control_flow.set_exit();
|
|
}
|
|
Event::RedrawRequested(_) => {
|
|
fill::fill_window(&window);
|
|
}
|
|
_ => (),
|
|
}
|
|
})
|
|
}
|
|
|
|
const CURSORS: &[CursorIcon] = &[
|
|
CursorIcon::Default,
|
|
CursorIcon::Crosshair,
|
|
CursorIcon::Pointer,
|
|
CursorIcon::Move,
|
|
CursorIcon::Text,
|
|
CursorIcon::Wait,
|
|
CursorIcon::Help,
|
|
CursorIcon::Progress,
|
|
CursorIcon::NotAllowed,
|
|
CursorIcon::ContextMenu,
|
|
CursorIcon::Cell,
|
|
CursorIcon::VerticalText,
|
|
CursorIcon::Alias,
|
|
CursorIcon::Copy,
|
|
CursorIcon::NoDrop,
|
|
CursorIcon::Grab,
|
|
CursorIcon::Grabbing,
|
|
CursorIcon::AllScroll,
|
|
CursorIcon::ZoomIn,
|
|
CursorIcon::ZoomOut,
|
|
CursorIcon::EResize,
|
|
CursorIcon::NResize,
|
|
CursorIcon::NeResize,
|
|
CursorIcon::NwResize,
|
|
CursorIcon::SResize,
|
|
CursorIcon::SeResize,
|
|
CursorIcon::SwResize,
|
|
CursorIcon::WResize,
|
|
CursorIcon::EwResize,
|
|
CursorIcon::NsResize,
|
|
CursorIcon::NeswResize,
|
|
CursorIcon::NwseResize,
|
|
CursorIcon::ColResize,
|
|
CursorIcon::RowResize,
|
|
];
|