strip disable evnet

rust-windowing · Nov 16, 2020 · 0684ebd · 0684ebd
1 parent 02ea93e
commit 0684ebd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/platform_impl/linux/x11/event_processor.rs b/src/platform_impl/linux/x11/event_processor.rs
@@ -1229,12 +1229,18 @@ impl<T: 'static> EventProcessor<T> {
         }
         match self.ime_event_receiver.try_recv() {
             Ok((window, event)) => match event {
+                ImeEvent::Enabled => {
+                    callback(Event::WindowEvent {
+                        window_id: mkwid(window),
+                        event: WindowEvent::IME(IMEEvent::Enabled),
+                    });
+                }
                 ImeEvent::Start => {
                     self.is_composing = true;
                     self.composed_text = None;
                     callback(Event::WindowEvent {
                         window_id: mkwid(window),
-                        event: WindowEvent::IME(IMEEvent::PreeditStart("".to_owned())),
+                        event: WindowEvent::IME(IMEEvent::Preedit("".to_owned(), None, None)),
                     });
                 }
                 ImeEvent::Update(text, position) => {
@@ -1254,7 +1260,6 @@ impl<T: 'static> EventProcessor<T> {
                         )),
                     });
                 }
-                _ => {}
             },
             Err(_) => (),
         }

diff --git a/src/platform_impl/linux/x11/ime/mod.rs b/src/platform_impl/linux/x11/ime/mod.rs
@@ -26,7 +26,6 @@ pub enum ImeEvent {
     Start,
     Update(String, usize),
     End,
-    Disabled,
 }
 
 pub type ImeReceiver = Receiver<(ffi::Window, i16, i16)>;
@@ -107,6 +106,7 @@ impl Ime {
             // Create empty entry in map, so that when IME is rebuilt, this window has a context.
             None
         } else {
+            self.inner.event_sender.send((window, ImeEvent::Enabled)).expect("Failed to send enabled event");
             Some(unsafe {
                 ImeContext::new(
                     &self.inner.xconn,