Files
bevy_cef/src/keyboard.rs
elm 40a3455f55 Fix IME input handling (#20)
bevy_winit does not call `set_ime_allowed()` during initial window
creation when `Window::ime_enabled` is `true`. The `changed_windows`
system only fires when the value differs from cache, but the cache
is initialized from the window itself so they start equal. Since
winit 0.27+ requires explicit `set_ime_allowed(true)`, no Ime events
were ever generated.
2026-02-06 23:52:05 +09:00

113 lines
3.7 KiB
Rust

use crate::common::CefWebviewUri;
use bevy::input::keyboard::KeyboardInput;
use bevy::prelude::*;
use bevy_cef_core::prelude::{Browsers, create_cef_key_event, keyboard_modifiers};
use serde::{Deserialize, Serialize};
/// The plugin to handle keyboard inputs.
///
/// To use IME, you need to set [`Window::ime_enabled`](bevy::prelude::Window) to `true`.
pub(super) struct KeyboardPlugin;
impl Plugin for KeyboardPlugin {
fn build(&self, app: &mut App) {
app.init_resource::<IsImeCommiting>().add_systems(
Update,
(
// Workaround for bevy_winit not calling `set_ime_allowed` on initial window
// creation when `Window::ime_enabled` is `true` from the start.
activate_ime,
ime_event.run_if(on_message::<Ime>),
send_key_event.run_if(on_message::<KeyboardInput>),
)
.chain(),
);
}
}
/// Workaround: bevy_winit does not call `winit::Window::set_ime_allowed()` during initial window
/// creation when `Window::ime_enabled` is `true`. This means `Ime` events are never generated.
///
/// To trigger bevy_winit's own `changed_windows` system, we temporarily toggle `ime_enabled` off
/// then back on over two frames, which causes the change detection to fire and call
/// `set_ime_allowed(true)` internally.
fn activate_ime(mut windows: Query<&mut Window>, mut state: Local<ImeActivationState>) {
match *state {
ImeActivationState::Pending => {
for mut window in windows.iter_mut() {
if window.ime_enabled {
window.ime_enabled = false;
*state = ImeActivationState::Toggled;
}
}
}
ImeActivationState::Toggled => {
for mut window in windows.iter_mut() {
if !window.ime_enabled {
window.ime_enabled = true;
*state = ImeActivationState::Done;
}
}
}
ImeActivationState::Done => {}
}
}
#[derive(Default)]
enum ImeActivationState {
#[default]
Pending,
Toggled,
Done,
}
#[derive(Resource, Default, Serialize, Deserialize, Reflect)]
#[reflect(Default, Serialize, Deserialize)]
struct IsImeCommiting(bool);
fn send_key_event(
mut er: MessageReader<KeyboardInput>,
mut is_ime_commiting: ResMut<IsImeCommiting>,
input: Res<ButtonInput<KeyCode>>,
browsers: NonSend<Browsers>,
webviews: Query<Entity, With<CefWebviewUri>>,
) {
let modifiers = keyboard_modifiers(&input);
for event in er.read() {
if event.key_code == KeyCode::Enter && is_ime_commiting.0 {
// If the IME is committing, we don't want to send the Enter key event.
// This is to prevent sending the Enter key event when the IME is committing.
is_ime_commiting.0 = false;
continue;
}
let Some(key_event) = create_cef_key_event(modifiers, &input, event) else {
continue;
};
for webview in webviews.iter() {
browsers.send_key(&webview, key_event.clone());
}
}
}
fn ime_event(
mut er: MessageReader<Ime>,
mut is_ime_commiting: ResMut<IsImeCommiting>,
browsers: NonSend<Browsers>,
) {
for event in er.read() {
match event {
Ime::Preedit { value, cursor, .. } => {
browsers.set_ime_composition(value, cursor.map(|(_, e)| e as u32))
}
Ime::Commit { value, .. } => {
browsers.set_ime_commit_text(value);
is_ime_commiting.0 = true;
}
Ime::Disabled { .. } => {
browsers.ime_cancel_composition();
}
_ => {}
}
}
}