mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-23 22:01:31 +11:00
918430979f
Overhaul the keyboard API in winit to mimic the W3C specification to achieve better crossplatform parity. The `KeyboardInput` event is now uses `KeyEvent` which consists of: - `physical_key` - a cross platform way to refer to scancodes; - `logical_key` - keysym value, which shows your key respecting the layout; - `text` - the text produced by this keypress; - `location` - the location of the key on the keyboard; - `repeat` - whether the key was produced by the repeat. And also a `platform_specific` field which encapsulates extra information on desktop platforms, like key without modifiers and text with all modifiers. The `Modifiers` were also slightly reworked as in, the information whether the left or right modifier is pressed is now also exposed on platforms where it could be queried reliably. The support was also added for the web and orbital platforms finishing the API change. This change made the `OptionAsAlt` API on macOS redundant thus it was removed all together. Co-authored-by: Artúr Kovács <kovacs.artur.barnabas@gmail.com> Co-authored-by: Kirill Chibisov <contact@kchibisov.com> Co-authored-by: daxpedda <daxpedda@gmail.com> Fixes: #2631. Fixes: #2055. Fixes: #2032. Fixes: #1904. Fixes: #1810. Fixes: #1700. Fixes: #1443. Fixes: #1343. Fixes: #1208. Fixes: #1151. Fixes: #812. Fixes: #600. Fixes: #361. Fixes: #343.
86 lines
3.7 KiB
Rust
86 lines
3.7 KiB
Rust
#![allow(clippy::single_match)]
|
|
|
|
use simple_logger::SimpleLogger;
|
|
use winit::{
|
|
event::{ElementState, Event, KeyEvent, WindowEvent},
|
|
event_loop::EventLoop,
|
|
keyboard::Key,
|
|
window::WindowBuilder,
|
|
};
|
|
|
|
fn main() {
|
|
SimpleLogger::new().init().unwrap();
|
|
let event_loop = EventLoop::new();
|
|
|
|
let _window = WindowBuilder::new()
|
|
.with_title("Your faithful window")
|
|
.build(&event_loop)
|
|
.unwrap();
|
|
|
|
let mut close_requested = false;
|
|
|
|
event_loop.run(move |event, _, control_flow| {
|
|
control_flow.set_wait();
|
|
|
|
match event {
|
|
Event::WindowEvent { event, .. } => {
|
|
match event {
|
|
WindowEvent::CloseRequested => {
|
|
// `CloseRequested` is sent when the close button on the window is pressed (or
|
|
// through whatever other mechanisms the window manager provides for closing a
|
|
// window). If you don't handle this event, the close button won't actually do
|
|
// anything.
|
|
|
|
// A common thing to do here is prompt the user if they have unsaved work.
|
|
// Creating a proper dialog box for that is far beyond the scope of this
|
|
// example, so here we'll just respond to the Y and N keys.
|
|
println!("Are you ready to bid your window farewell? [Y/N]");
|
|
close_requested = true;
|
|
|
|
// In applications where you can safely close the window without further
|
|
// action from the user, this is generally where you'd handle cleanup before
|
|
// closing the window. How to close the window is detailed in the handler for
|
|
// the Y key.
|
|
}
|
|
WindowEvent::KeyboardInput {
|
|
event:
|
|
KeyEvent {
|
|
logical_key: key,
|
|
state: ElementState::Released,
|
|
..
|
|
},
|
|
..
|
|
} => {
|
|
// WARNING: Consider using `key_without_modifers()` if available on your platform.
|
|
// See the `key_binding` example
|
|
match key.as_ref() {
|
|
Key::Character("y") => {
|
|
if close_requested {
|
|
// This is where you'll want to do any cleanup you need.
|
|
println!("Buh-bye!");
|
|
|
|
// For a single-window application like this, you'd normally just
|
|
// break out of the event loop here. If you wanted to keep running the
|
|
// event loop (i.e. if it's a multi-window application), you need to
|
|
// drop the window. That closes it, and results in `Destroyed` being
|
|
// sent.
|
|
control_flow.set_exit();
|
|
}
|
|
}
|
|
Key::Character("n") => {
|
|
if close_requested {
|
|
println!("Your window will continue to stay by your side.");
|
|
close_requested = false;
|
|
}
|
|
}
|
|
_ => (),
|
|
}
|
|
}
|
|
_ => (),
|
|
}
|
|
}
|
|
_ => (),
|
|
}
|
|
});
|
|
}
|