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.
104 lines
3.4 KiB
Rust
104 lines
3.4 KiB
Rust
#![allow(clippy::single_match)]
|
|
|
|
use log::LevelFilter;
|
|
use simple_logger::SimpleLogger;
|
|
use winit::{
|
|
dpi::PhysicalPosition,
|
|
event::{ElementState, Event, Ime, WindowEvent},
|
|
event_loop::{ControlFlow, EventLoop},
|
|
keyboard::{Key, KeyCode},
|
|
window::{ImePurpose, WindowBuilder},
|
|
};
|
|
|
|
fn main() {
|
|
SimpleLogger::new()
|
|
.with_level(LevelFilter::Trace)
|
|
.init()
|
|
.unwrap();
|
|
|
|
println!("IME position will system default");
|
|
println!("Click to set IME position to cursor's");
|
|
println!("Press F2 to toggle IME. See the documentation of `set_ime_allowed` for more info");
|
|
println!("Press F3 to cycle through IME purposes.");
|
|
|
|
let event_loop = EventLoop::new();
|
|
|
|
let window = WindowBuilder::new()
|
|
.with_inner_size(winit::dpi::LogicalSize::new(256f64, 128f64))
|
|
.build(&event_loop)
|
|
.unwrap();
|
|
|
|
let mut ime_purpose = ImePurpose::Normal;
|
|
let mut ime_allowed = true;
|
|
window.set_ime_allowed(ime_allowed);
|
|
|
|
let mut may_show_ime = false;
|
|
let mut cursor_position = PhysicalPosition::new(0.0, 0.0);
|
|
let mut ime_pos = PhysicalPosition::new(0.0, 0.0);
|
|
|
|
event_loop.run(move |event, _, control_flow| {
|
|
*control_flow = ControlFlow::Wait;
|
|
match event {
|
|
Event::WindowEvent {
|
|
event: WindowEvent::CloseRequested,
|
|
..
|
|
} => *control_flow = ControlFlow::Exit,
|
|
Event::WindowEvent {
|
|
event: WindowEvent::CursorMoved { position, .. },
|
|
..
|
|
} => {
|
|
cursor_position = position;
|
|
}
|
|
Event::WindowEvent {
|
|
event:
|
|
WindowEvent::MouseInput {
|
|
state: ElementState::Released,
|
|
..
|
|
},
|
|
..
|
|
} => {
|
|
println!(
|
|
"Setting ime position to {}, {}",
|
|
cursor_position.x, cursor_position.y
|
|
);
|
|
ime_pos = cursor_position;
|
|
if may_show_ime {
|
|
window.set_ime_position(ime_pos);
|
|
}
|
|
}
|
|
Event::WindowEvent {
|
|
event: WindowEvent::Ime(event),
|
|
..
|
|
} => {
|
|
println!("{event:?}");
|
|
may_show_ime = event != Ime::Disabled;
|
|
if may_show_ime {
|
|
window.set_ime_position(ime_pos);
|
|
}
|
|
}
|
|
Event::WindowEvent {
|
|
event: WindowEvent::KeyboardInput { event, .. },
|
|
..
|
|
} => {
|
|
println!("key: {event:?}");
|
|
|
|
if event.state == ElementState::Pressed && event.physical_key == KeyCode::F2 {
|
|
ime_allowed = !ime_allowed;
|
|
window.set_ime_allowed(ime_allowed);
|
|
println!("\nIME allowed: {ime_allowed}\n");
|
|
}
|
|
if event.state == ElementState::Pressed && event.logical_key == Key::F3 {
|
|
ime_purpose = match ime_purpose {
|
|
ImePurpose::Normal => ImePurpose::Password,
|
|
ImePurpose::Password => ImePurpose::Terminal,
|
|
_ => ImePurpose::Normal,
|
|
};
|
|
window.set_ime_purpose(ime_purpose);
|
|
println!("\nIME purpose: {ime_purpose:?}\n");
|
|
}
|
|
}
|
|
_ => (),
|
|
}
|
|
});
|
|
}
|