From 7db5256b720c3ecbe7c1cce7a1b47fd03151e03a Mon Sep 17 00:00:00 2001
From: KENZ <KENZ.gelsoft@gmail.com>
Date: Fri, 10 Jan 2025 07:12:31 +0900
Subject: Draft `input_method` support

---
 winit/src/conversion.rs | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'winit/src/conversion.rs')

diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index 462be65b..a289f060 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -2,6 +2,7 @@
 //!
 //! [`winit`]: https://github.com/rust-windowing/winit
 //! [`iced_runtime`]: https://github.com/iced-rs/iced/tree/0.13/runtime
+use crate::core::input_method;
 use crate::core::keyboard;
 use crate::core::mouse;
 use crate::core::touch;
@@ -283,6 +284,16 @@ pub fn window_event(
                 self::modifiers(new_modifiers.state()),
             )))
         }
+        WindowEvent::Ime(ime) => {
+            use winit::event::Ime;
+            println!("ime event: {:?}", ime);
+            Some(Event::InputMethod(match ime {
+                Ime::Enabled => input_method::Event::Enabled,
+                Ime::Preedit(s, size) => input_method::Event::Preedit(s, size),
+                Ime::Commit(s) => input_method::Event::Commit(s),
+                Ime::Disabled => input_method::Event::Disabled,
+            }))
+        }
         WindowEvent::Focused(focused) => Some(Event::Window(if focused {
             window::Event::Focused
         } else {
-- 
cgit 


From d5ee9c27955e6dfeb645e2641f3d24b006685484 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sun, 2 Feb 2025 17:55:16 +0100
Subject: Copy `winit` docs for `input_method::Event`

---
 winit/src/conversion.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'winit/src/conversion.rs')

diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index a289f060..c7f9aaaf 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -289,7 +289,10 @@ pub fn window_event(
             println!("ime event: {:?}", ime);
             Some(Event::InputMethod(match ime {
                 Ime::Enabled => input_method::Event::Enabled,
-                Ime::Preedit(s, size) => input_method::Event::Preedit(s, size),
+                Ime::Preedit(s, size) => input_method::Event::Preedit(
+                    s,
+                    size.map(|(start, end)| (start..end)),
+                ),
                 Ime::Commit(s) => input_method::Event::Commit(s),
                 Ime::Disabled => input_method::Event::Disabled,
             }))
-- 
cgit 


From ae10adda74320e8098bfeb401f12a278e1e7b3e2 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sun, 2 Feb 2025 20:45:29 +0100
Subject: Refactor and simplify `input_method` API

---
 winit/src/conversion.rs | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

(limited to 'winit/src/conversion.rs')

diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index c7f9aaaf..ab84afff 100644
--- a/winit/src/conversion.rs
+++ b/winit/src/conversion.rs
@@ -141,6 +141,7 @@ pub fn window_event(
     scale_factor: f64,
     modifiers: winit::keyboard::ModifiersState,
 ) -> Option<Event> {
+    use winit::event::Ime;
     use winit::event::WindowEvent;
 
     match event {
@@ -284,19 +285,15 @@ pub fn window_event(
                 self::modifiers(new_modifiers.state()),
             )))
         }
-        WindowEvent::Ime(ime) => {
-            use winit::event::Ime;
-            println!("ime event: {:?}", ime);
-            Some(Event::InputMethod(match ime {
-                Ime::Enabled => input_method::Event::Enabled,
-                Ime::Preedit(s, size) => input_method::Event::Preedit(
-                    s,
-                    size.map(|(start, end)| (start..end)),
-                ),
-                Ime::Commit(s) => input_method::Event::Commit(s),
-                Ime::Disabled => input_method::Event::Disabled,
-            }))
-        }
+        WindowEvent::Ime(event) => Some(Event::InputMethod(match event {
+            Ime::Enabled => input_method::Event::Opened,
+            Ime::Preedit(content, size) => input_method::Event::Preedit(
+                content,
+                size.map(|(start, end)| (start..end)),
+            ),
+            Ime::Commit(content) => input_method::Event::Commit(content),
+            Ime::Disabled => input_method::Event::Closed,
+        })),
         WindowEvent::Focused(focused) => Some(Event::Window(if focused {
             window::Event::Focused
         } else {
@@ -1174,7 +1171,7 @@ pub fn resize_direction(
     }
 }
 
-/// Converts some [`window::Icon`] into it's `winit` counterpart.
+/// Converts some [`window::Icon`] into its `winit` counterpart.
 ///
 /// Returns `None` if there is an error during the conversion.
 pub fn icon(icon: window::Icon) -> Option<winit::window::Icon> {
@@ -1183,6 +1180,17 @@ pub fn icon(icon: window::Icon) -> Option<winit::window::Icon> {
     winit::window::Icon::from_rgba(pixels, size.width, size.height).ok()
 }
 
+/// Convertions some [`input_method::Purpose`] to its `winit` counterpart.
+pub fn ime_purpose(
+    purpose: input_method::Purpose,
+) -> winit::window::ImePurpose {
+    match purpose {
+        input_method::Purpose::Normal => winit::window::ImePurpose::Normal,
+        input_method::Purpose::Secure => winit::window::ImePurpose::Password,
+        input_method::Purpose::Terminal => winit::window::ImePurpose::Terminal,
+    }
+}
+
 // See: https://en.wikipedia.org/wiki/Private_Use_Areas
 fn is_private_use(c: char) -> bool {
     ('\u{E000}'..='\u{F8FF}').contains(&c)
-- 
cgit