rename CompostionEvent to IMEPreeditEvent

src/event.rs

@@ -271,7 +271,7 @@ pub enum WindowEvent<'a> {
     ModifiersChanged(ModifiersState),
 
     /// An event from IME
-    IME(IMEEvent),
+    IME(IME),
 
     /// The cursor has moved on the window.
     CursorMoved {
@@ -627,23 +627,25 @@ pub struct KeyboardInput {
     pub modifiers: ModifiersState,
 }
 
+/// Describes an event from input method.
 #[derive(Debug, Clone, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-pub enum IMEEvent {
-    /// The user enables IME
+pub enum IME {
+    /// Notifies when the IME was enabled.
     Enabled,
 
-    /// The user updates preedit status on IME.
+    /// Notifies when a new composing text should be set at the cursor position.
+    ///
+    /// The value represents a pair of the preedit string and the cursor begin position and end
+    /// position. When both indices are `None`, the cursor should be hidden.
     ///
-    /// The value represents a pair of the preedit string and the cursor begin position and end position.
-    /// When the cursor is hidden, both value will be None
     /// The cursor position is byte-wise indexed.
     Preedit(String, Option<usize>, Option<usize>),
 
-    /// The user completes the current IME session with the value.
+    /// Notifies when text should be inserted into the editor widget.
     Commit(String),
 
-    /// The user disables IME
+    /// Notifies when the IME was disabled.
     Disabled,
 }
 

src/platform_impl/linux/x11/event_processor.rs

@@ -16,8 +16,8 @@ use crate::platform_impl::platform::x11::ime::{ImeEvent, ImeEventReceiver};
 use crate::{
     dpi::{PhysicalPosition, PhysicalSize},
     event::{
-        DeviceEvent, ElementState, Event, IMEEvent, KeyboardInput, ModifiersState, TouchPhase,
-        WindowEvent,
+        DeviceEvent, ElementState, Event, KeyboardInput, ModifiersState, TouchPhase, WindowEvent,
+        IME,
     },
     event_loop::EventLoopWindowTarget as RootELW,
 };
@@ -1241,22 +1241,22 @@ impl<T: 'static> EventProcessor<T> {
                 ImeEvent::Enabled => {
                     callback(Event::WindowEvent {
                         window_id: mkwid(window),
-                        event: WindowEvent::IME(IMEEvent::Enabled),
+                        event: WindowEvent::IME(IME::Enabled),
                     });
                 }
                 ImeEvent::Start => {
                     self.is_composing = true;
                     self.composed_text = None;
                     callback(Event::WindowEvent {
                         window_id: mkwid(window),
-                        event: WindowEvent::IME(IMEEvent::Preedit("".to_owned(), None, None)),
+                        event: WindowEvent::IME(IME::Preedit("".to_owned(), None, None)),
                     });
                 }
                 ImeEvent::Update(text, position) => {
                     if self.is_composing {
                         callback(Event::WindowEvent {
                             window_id: mkwid(window),
-                            event: WindowEvent::IME(IMEEvent::Preedit(
+                            event: WindowEvent::IME(IME::Preedit(
                                 text,
                                 Some(position),
                                 Some(position),
@@ -1268,7 +1268,7 @@ impl<T: 'static> EventProcessor<T> {
                     self.is_composing = false;
                     callback(Event::WindowEvent {
                         window_id: mkwid(window),
-                        event: WindowEvent::IME(IMEEvent::Commit(
+                        event: WindowEvent::IME(IME::Commit(
                             self.composed_text.take().unwrap_or("".to_owned()),
                         )),
                     });

src/platform_impl/linux/x11/ime/context.rs

@@ -89,7 +89,7 @@ extern "C" fn preedit_draw_callback(
             .collect()
     };
     let mut old_text_tail = client_data.text.split_off(chg_range.end);
-    client_data.text.split_off(chg_range.start);
+    let _ = client_data.text.split_off(chg_range.start);
     client_data.text.append(&mut new_chars);
     client_data.text.append(&mut old_text_tail);
     let cursor_byte_pos = calc_byte_position(&client_data.text, client_data.cursor_pos);