feat: IME Support

marc2332 · Jan 7, 2024 · 3668bb8 · 3668bb8
1 parent 1cd0d37
commit 3668bb8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/crates/renderer/src/event_loop.rs b/crates/renderer/src/event_loop.rs
@@ -8,7 +8,7 @@ use freya_elements::events::keyboard::{
 use torin::geometry::CursorPoint;
 use winit::event::{
     ElementState, Event, KeyboardInput, ModifiersState, MouseScrollDelta, StartCause, Touch,
-    TouchPhase, VirtualKeyCode, WindowEvent,
+    TouchPhase, VirtualKeyCode, WindowEvent, Ime,
 };
 use winit::event_loop::{ControlFlow, EventLoop, EventLoopProxy};
 
@@ -83,6 +83,19 @@ pub fn run_event_loop<State: Clone>(
             }
             Event::WindowEvent { event, .. } if app.on_window_event(&event) => {
                 match event {
+                    WindowEvent::Ime(e) => {
+                        match e {
+                            Ime::Commit(text) => {
+                                app.send_event(FreyaEvent::Keyboard {
+                                    name: "keydown".to_string(),
+                                    key: Key::Character(text),
+                                    code: last_code,
+                                    modifiers: get_modifiers(modifiers_state),
+                                });
+                            }
+                            _ => {}
+                        }
+                    }
                     WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,
                     WindowEvent::MouseInput { state, button, .. } => {
                         let event_name = match state {

diff --git a/crates/renderer/src/window.rs b/crates/renderer/src/window.rs
@@ -312,6 +312,8 @@ impl<T: Clone> WindowEnv<T> {
         if let Some(on_setup) = on_setup {
             (on_setup)(self.window_mut())
         }
+
+        self.window.set_ime_allowed(true);
     }
 
     /// Run the `on_exit` callback that was passed to the launch function