migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-08-29 04:40:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

orbital: Merge TextInputEvent and KeyEvent together (#4663)

Browse Source 
They were split at some point for whatever reason, yet should result in
a single application level event. The current hack of emitting an IME
event for TextInputEvent breaks with applications that don't handle IME
and it would cause applications that both handle physical key events and
IME events to get double key presses.

Co-authored-by: Jeremy Soller <jackpot51@gmail.com>
This commit is contained in:
bjorn3
2026-08-08 22:16:03 +02:00
committed by GitHub
parent 332224c92f
commit f5e20bd7da
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
winit-orbital/src/event_loop.rs
View File

@@ -17,7 +17,7 @@ use smol_str::SmolStr;
use winit_core::application::ApplicationHandler;
use winit_core::cursor::{CustomCursor, CustomCursorSource};
use winit_core::error::{EventLoopError, NotSupportedError, RequestError};
use winit_core::event::{self, Ime, Modifiers, StartCause};
use winit_core::event::{self, Modifiers, StartCause};
use winit_core::event_loop::pump_events::PumpStatus;
use winit_core::event_loop::{
ActiveEventLoop as RootActiveEventLoop, ControlFlow, DeviceEvents, EventLoopProvider,
@@ -204,6 +204,7 @@ struct EventState {
mouse: MouseButtonState,
mouse_pos: (i32, i32),
resize_opt: Option<(u32, u32)>,
text_input_event: Option<TextInputEvent>,
}
impl EventState {
@@ -361,8 +362,13 @@ impl EventLoop {
window_target: &ActiveEventLoop,
app: &mut A,
) {
let text_input_event = event_state.text_input_event.take();
if text_input_event.is_some() && !matches!(event_option, EventOption::Key(_)) {
tracing::warn!("got TextInput event without following Key event");
}
match event_option {
EventOption::Key(KeyEvent { character, scancode, pressed }) => {
EventOption::Key(KeyEvent { character: _, scancode, pressed }) => {
// Convert scancode
let (physical_key, named_key_opt) = convert_scancode(scancode);
@@ -377,6 +383,7 @@ impl EventLoop {
let mut text_with_all_modifiers = None;
// Set key and text based on character
let character = text_input_event.map_or('\0', |event| event.character);
if character != '\0' {
let mut tmp = [0u8; 4];
let character_str = character.encode_utf8(&mut tmp);
@@ -428,17 +435,8 @@ impl EventLoop {
);
}
},
EventOption::TextInput(TextInputEvent { character }) => {
app.window_event(
window_target,
window_id,
event::WindowEvent::Ime(Ime::Preedit("".into(), None)),
);
app.window_event(
window_target,
window_id,
event::WindowEvent::Ime(Ime::Commit(character.into())),
);
EventOption::TextInput(event) => {
event_state.text_input_event = Some(event);
},
EventOption::Mouse(MouseEvent { x, y }) => {
event_state.mouse_pos = (x, y);