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.
138 lines
4.8 KiB
Rust
138 lines
4.8 KiB
Rust
#![allow(clippy::single_match)]
|
|
|
|
// This example is used by developers to test various window functions.
|
|
|
|
use simple_logger::SimpleLogger;
|
|
use winit::{
|
|
dpi::{LogicalSize, PhysicalSize},
|
|
event::{DeviceEvent, ElementState, Event, KeyEvent, RawKeyEvent, WindowEvent},
|
|
event_loop::{DeviceEventFilter, EventLoop},
|
|
keyboard::{Key, KeyCode},
|
|
window::{Fullscreen, WindowBuilder},
|
|
};
|
|
|
|
fn main() {
|
|
SimpleLogger::new().init().unwrap();
|
|
let event_loop = EventLoop::new();
|
|
|
|
let window = WindowBuilder::new()
|
|
.with_title("A fantastic window!")
|
|
.with_inner_size(LogicalSize::new(100.0, 100.0))
|
|
.build(&event_loop)
|
|
.unwrap();
|
|
|
|
eprintln!("debugging keys:");
|
|
eprintln!(" (E) Enter exclusive fullscreen");
|
|
eprintln!(" (F) Toggle borderless fullscreen");
|
|
eprintln!(" (P) Toggle borderless fullscreen on system's preffered monitor");
|
|
eprintln!(" (M) Toggle minimized");
|
|
eprintln!(" (Q) Quit event loop");
|
|
eprintln!(" (V) Toggle visibility");
|
|
eprintln!(" (X) Toggle maximized");
|
|
|
|
let mut minimized = false;
|
|
let mut visible = true;
|
|
|
|
event_loop.set_device_event_filter(DeviceEventFilter::Never);
|
|
|
|
event_loop.run(move |event, _, control_flow| {
|
|
control_flow.set_wait();
|
|
|
|
match event {
|
|
// This used to use the virtual key, but the new API
|
|
// only provides the `physical_key` (`Code`).
|
|
Event::DeviceEvent {
|
|
event:
|
|
DeviceEvent::Key(RawKeyEvent {
|
|
physical_key,
|
|
state: ElementState::Released,
|
|
..
|
|
}),
|
|
..
|
|
} => match physical_key {
|
|
KeyCode::KeyM => {
|
|
if minimized {
|
|
minimized = !minimized;
|
|
window.set_minimized(minimized);
|
|
window.focus_window();
|
|
}
|
|
}
|
|
KeyCode::KeyV => {
|
|
if !visible {
|
|
visible = !visible;
|
|
window.set_visible(visible);
|
|
}
|
|
}
|
|
_ => (),
|
|
},
|
|
Event::WindowEvent {
|
|
event:
|
|
WindowEvent::KeyboardInput {
|
|
event:
|
|
KeyEvent {
|
|
logical_key: Key::Character(key_str),
|
|
state: ElementState::Pressed,
|
|
..
|
|
},
|
|
..
|
|
},
|
|
..
|
|
} => match key_str.as_ref() {
|
|
// WARNING: Consider using `key_without_modifers()` if available on your platform.
|
|
// See the `key_binding` example
|
|
"e" => {
|
|
fn area(size: PhysicalSize<u32>) -> u32 {
|
|
size.width * size.height
|
|
}
|
|
|
|
let monitor = window.current_monitor().unwrap();
|
|
if let Some(mode) = monitor
|
|
.video_modes()
|
|
.max_by(|a, b| area(a.size()).cmp(&area(b.size())))
|
|
{
|
|
window.set_fullscreen(Some(Fullscreen::Exclusive(mode)));
|
|
} else {
|
|
eprintln!("no video modes available");
|
|
}
|
|
}
|
|
"f" => {
|
|
if window.fullscreen().is_some() {
|
|
window.set_fullscreen(None);
|
|
} else {
|
|
let monitor = window.current_monitor();
|
|
window.set_fullscreen(Some(Fullscreen::Borderless(monitor)));
|
|
}
|
|
}
|
|
"p" => {
|
|
if window.fullscreen().is_some() {
|
|
window.set_fullscreen(None);
|
|
} else {
|
|
window.set_fullscreen(Some(Fullscreen::Borderless(None)));
|
|
}
|
|
}
|
|
"m" => {
|
|
minimized = !minimized;
|
|
window.set_minimized(minimized);
|
|
}
|
|
"q" => {
|
|
control_flow.set_exit();
|
|
}
|
|
"v" => {
|
|
visible = !visible;
|
|
window.set_visible(visible);
|
|
}
|
|
"x" => {
|
|
let is_maximized = window.is_maximized();
|
|
window.set_maximized(!is_maximized);
|
|
}
|
|
_ => (),
|
|
},
|
|
Event::WindowEvent {
|
|
event: WindowEvent::CloseRequested,
|
|
window_id,
|
|
} if window_id == window.id() => control_flow.set_exit(),
|
|
_ => (),
|
|
}
|
|
});
|
|
}
|