Remove Ime prefix from winit_core::ime items

Author: dhardy

winit-android/src/event_loop.rs

@@ -21,7 +21,7 @@ use winit_core::event_loop::{
     EventLoopProxy as CoreEventLoopProxy, EventLoopProxyProvider,
     OwnedDisplayHandle as CoreOwnedDisplayHandle,
 };
-use winit_core::ime::{ImeCapabilities, ImePurpose, ImeRequest, ImeRequestError};
+use winit_core::ime;
 use winit_core::monitor::{Fullscreen, MonitorHandle as CoreMonitorHandle};
 use winit_core::window::{
     self, CursorGrabMode, ResizeDirection, Theme, Window as CoreWindow, WindowAttributes,
@@ -755,7 +755,7 @@ pub struct PlatformSpecificWindowAttributes;
 #[derive(Debug)]
 pub struct Window {
     app: AndroidApp,
-    ime_capabilities: Mutex<Option<ImeCapabilities>>,
+    ime_capabilities: Mutex<Option<ime::Capabilities>>,
     redraw_requester: RedrawRequester,
 }
 
@@ -938,20 +938,20 @@ impl CoreWindow for Window {
 
     fn set_ime_cursor_area(&self, _position: Position, _size: Size) {}
 
-    fn request_ime_update(&self, request: ImeRequest) -> Result<(), ImeRequestError> {
+    fn request_ime_update(&self, request: ime::Request) -> Result<(), ime::RequestError> {
         let mut current_caps = self.ime_capabilities.lock().unwrap();
         match request {
-            ImeRequest::Enable(enable) => {
+            ime::Request::Enable(enable) => {
                 let (capabilities, _) = enable.into_raw();
                 if current_caps.is_some() {
-                    return Err(ImeRequestError::AlreadyEnabled);
+                    return Err(ime::RequestError::AlreadyEnabled);
                 }
                 *current_caps = Some(capabilities);
                 self.app.show_soft_input(true);
             },
-            ImeRequest::Update(_) => {
+            ime::Request::Update(_) => {
                 if current_caps.is_none() {
-                    return Err(ImeRequestError::NotEnabled);
+                    return Err(ime::RequestError::NotEnabled);
                 }
             },
         }
@@ -964,11 +964,11 @@ impl CoreWindow for Window {
         self.app.hide_soft_input(true);
     }
 
-    fn ime_capabilities(&self) -> Option<ImeCapabilities> {
+    fn ime_capabilities(&self) -> Option<ime::Capabilities> {
         *self.ime_capabilities.lock().unwrap()
     }
 
-    fn set_ime_purpose(&self, _purpose: ImePurpose) {}
+    fn set_ime_purpose(&self, _purpose: ime::Purpose) {}
 
     fn focus_window(&self) {}
 

winit-appkit/src/window.rs

@@ -11,7 +11,7 @@ use objc2_foundation::NSObject;
 use winit_core::cursor::Cursor;
 use winit_core::error::RequestError;
 use winit_core::icon::Icon;
-use winit_core::ime::{ImeCapabilities, ImeRequest, ImeRequestError};
+use winit_core::ime;
 use winit_core::monitor::{Fullscreen, MonitorHandle as CoreMonitorHandle};
 use winit_core::window::{
     Theme, UserAttentionType, Window as CoreWindow, WindowAttributes, WindowButtons, WindowId,
@@ -234,15 +234,15 @@ impl CoreWindow for Window {
         self.maybe_wait_on_main(|delegate| delegate.set_window_icon(window_icon));
     }
 
-    fn request_ime_update(&self, request: ImeRequest) -> Result<(), ImeRequestError> {
+    fn request_ime_update(&self, request: ime::Request) -> Result<(), ime::RequestError> {
         self.maybe_wait_on_main(|delegate| delegate.request_ime_update(request))
     }
 
     fn disable_ime(&self) {
         self.maybe_wait_on_main(|delegate| delegate.disable_ime());
     }
 
-    fn ime_capabilities(&self) -> Option<ImeCapabilities> {
+    fn ime_capabilities(&self) -> Option<ime::Capabilities> {
         self.maybe_wait_on_main(|delegate| delegate.ime_capabilities())
     }
 

winit-appkit/src/window_delegate.rs

@@ -46,7 +46,7 @@ use winit_core::cursor::Cursor;
 use winit_core::error::{NotSupportedError, RequestError};
 use winit_core::event::{SurfaceSizeWriter, WindowEvent};
 use winit_core::icon::Icon;
-use winit_core::ime::{ImeCapabilities, ImeRequest, ImeRequestError};
+use winit_core::ime;
 use winit_core::monitor::{Fullscreen, MonitorHandle as CoreMonitorHandle, MonitorHandleProvider};
 use winit_core::window::{
     CursorGrabMode, ResizeDirection, Theme, UserAttentionType, WindowAttributes, WindowButtons,
@@ -1675,20 +1675,20 @@ impl WindowDelegate {
         // https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/WinPanel/Tasks/SettingWindowTitle.html
     }
 
-    pub fn request_ime_update(&self, request: ImeRequest) -> Result<(), ImeRequestError> {
+    pub fn request_ime_update(&self, request: ime::Request) -> Result<(), ime::RequestError> {
         let current_caps = self.view().ime_capabilities();
         let request_data = match request {
-            ImeRequest::Enable(enable) => {
+            ime::Request::Enable(enable) => {
                 let (capabilities, request_data) = enable.into_raw();
                 if current_caps.is_some() {
-                    return Err(ImeRequestError::AlreadyEnabled);
+                    return Err(ime::RequestError::AlreadyEnabled);
                 }
                 self.view().set_ime_allowed(Some(capabilities));
                 request_data
             },
-            ImeRequest::Update(request_data) => {
+            ime::Request::Update(request_data) => {
                 if current_caps.is_none() {
-                    return Err(ImeRequestError::NotEnabled);
+                    return Err(ime::RequestError::NotEnabled);
                 }
                 request_data
             },
@@ -1716,7 +1716,7 @@ impl WindowDelegate {
         self.view().set_ime_allowed(None);
     }
 
-    pub fn ime_capabilities(&self) -> Option<ImeCapabilities> {
+    pub fn ime_capabilities(&self) -> Option<ime::Capabilities> {
         self.view().ime_capabilities()
     }