Remove xlib_xconnection from public interface

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

@@ -8,7 +8,7 @@ use super::{
     input_method::PotentialInputMethods,
 };
 
-pub unsafe fn xim_set_callback(
+pub(crate) unsafe fn xim_set_callback(
     xconn: &Arc<XConnection>,
     xim: ffi::XIM,
     field: *const c_char,
@@ -26,7 +26,7 @@ pub unsafe fn xim_set_callback(
 // * This is called per locale modifier, not per input method opened with that locale modifier.
 // * Trying to set this for multiple locale modifiers causes problems, i.e. one of the rebuilt
 //   input contexts would always silently fail to use the input method.
-pub unsafe fn set_instantiate_callback(
+pub(crate) unsafe fn set_instantiate_callback(
     xconn: &Arc<XConnection>,
     client_data: ffi::XPointer,
 ) -> Result<(), XError> {
@@ -41,7 +41,7 @@ pub unsafe fn set_instantiate_callback(
     xconn.check_errors()
 }
 
-pub unsafe fn unset_instantiate_callback(
+pub(crate) unsafe fn unset_instantiate_callback(
     xconn: &Arc<XConnection>,
     client_data: ffi::XPointer,
 ) -> Result<(), XError> {
@@ -56,7 +56,7 @@ pub unsafe fn unset_instantiate_callback(
     xconn.check_errors()
 }
 
-pub unsafe fn set_destroy_callback(
+pub(crate) unsafe fn set_destroy_callback(
     xconn: &Arc<XConnection>,
     im: ffi::XIM,
     inner: &ImeInner,

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

@@ -201,7 +201,7 @@ pub struct ImeContext {
 }
 
 impl ImeContext {
-    pub unsafe fn new(
+    pub(crate) unsafe fn new(
         xconn: &Arc<XConnection>,
         im: ffi::XIM,
         style: Style,
@@ -323,14 +323,14 @@ impl ImeContext {
         (!ic.is_null()).then(|| ic)
     }
 
-    pub fn focus(&self, xconn: &Arc<XConnection>) -> Result<(), XError> {
+    pub(crate) fn focus(&self, xconn: &Arc<XConnection>) -> Result<(), XError> {
         unsafe {
             (xconn.xlib.XSetICFocus)(self.ic);
         }
         xconn.check_errors()
     }
 
-    pub fn unfocus(&self, xconn: &Arc<XConnection>) -> Result<(), XError> {
+    pub(crate) fn unfocus(&self, xconn: &Arc<XConnection>) -> Result<(), XError> {
         unsafe {
             (xconn.xlib.XUnsetICFocus)(self.ic);
         }
@@ -346,7 +346,7 @@ impl ImeContext {
     // window and couldn't be changed.
     //
     // For me see: https://bugs.freedesktop.org/show_bug.cgi?id=1580.
-    pub fn set_spot(&mut self, xconn: &Arc<XConnection>, x: c_short, y: c_short) {
+    pub(crate) fn set_spot(&mut self, xconn: &Arc<XConnection>, x: c_short, y: c_short) {
         if !self.is_allowed() || self.ic_spot.x == x && self.ic_spot.y == y {
             return;
         }

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

@@ -8,17 +8,17 @@ use super::{
 };
 use crate::platform_impl::platform::x11::ime::ImeEventSender;
 
-pub unsafe fn close_im(xconn: &Arc<XConnection>, im: ffi::XIM) -> Result<(), XError> {
+pub(crate) unsafe fn close_im(xconn: &Arc<XConnection>, im: ffi::XIM) -> Result<(), XError> {
     (xconn.xlib.XCloseIM)(im);
     xconn.check_errors()
 }
 
-pub unsafe fn destroy_ic(xconn: &Arc<XConnection>, ic: ffi::XIC) -> Result<(), XError> {
+pub(crate) unsafe fn destroy_ic(xconn: &Arc<XConnection>, ic: ffi::XIC) -> Result<(), XError> {
     (xconn.xlib.XDestroyIC)(ic);
     xconn.check_errors()
 }
 
-pub struct ImeInner {
+pub(crate) struct ImeInner {
     pub xconn: Arc<XConnection>,
     pub im: Option<InputMethod>,
     pub potential_input_methods: PotentialInputMethods,
@@ -33,7 +33,7 @@ pub struct ImeInner {
 }
 
 impl ImeInner {
-    pub fn new(
+    pub(crate) fn new(
         xconn: Arc<XConnection>,
         potential_input_methods: PotentialInputMethods,
         event_sender: ImeEventSender,

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

@@ -263,7 +263,7 @@ impl PotentialInputMethod {
 // By logging this struct, you get a sequential listing of every locale modifier tried, where it
 // came from, and if it succeeded.
 #[derive(Debug, Clone)]
-pub struct PotentialInputMethods {
+pub(crate) struct PotentialInputMethods {
     // On correctly configured systems, the XMODIFIERS environment variable tells us everything we
     // need to know.
     xmodifiers: Option<PotentialInputMethod>,

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

@@ -45,13 +45,13 @@ pub enum ImeRequest {
 }
 
 #[derive(Debug)]
-pub enum ImeCreationError {
+pub(crate) enum ImeCreationError {
     // Boxed to prevent large error type
     OpenFailure(Box<PotentialInputMethods>),
     SetDestroyCallbackFailed(XError),
 }
 
-pub struct Ime {
+pub(crate) struct Ime {
     xconn: Arc<XConnection>,
     // The actual meat of this struct is boxed away, since it needs to have a fixed location in
     // memory so we can pass a pointer to it around.