Remove xlib_xconnection from public interface

This commit is contained in:
John Nunley 2023-01-10 08:46:48 +00:00 committed by GitHub
parent 4b22ca8daf
commit 490abcad14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 56 additions and 104 deletions

View file

@ -50,6 +50,7 @@ And please only add new entries to the top of this list, right below the `# Unre
- **Breaking:** On Android, switched to using [`android-activity`](https://github.com/rib/android-activity) crate as a glue layer instead of [`ndk-glue`](https://github.com/rust-windowing/android-ndk-rs/tree/master/ndk-glue). See [README.md#Android](https://github.com/rust-windowing/winit#Android) for more details. ([#2444](https://github.com/rust-windowing/winit/pull/2444)) - **Breaking:** On Android, switched to using [`android-activity`](https://github.com/rib/android-activity) crate as a glue layer instead of [`ndk-glue`](https://github.com/rust-windowing/android-ndk-rs/tree/master/ndk-glue). See [README.md#Android](https://github.com/rust-windowing/winit#Android) for more details. ([#2444](https://github.com/rust-windowing/winit/pull/2444))
- **Breaking:** Removed support for `raw-window-handle` version `0.4` - **Breaking:** Removed support for `raw-window-handle` version `0.4`
- On Wayland, `RedrawRequested` not emitted during resize. - On Wayland, `RedrawRequested` not emitted during resize.
- **Breaking:** Remove the unstable `xlib_xconnection()` function from the private interface.
- Added Orbital support for Redox OS - Added Orbital support for Redox OS
# 0.27.5 # 0.27.5

View file

@ -1,5 +1,5 @@
use std::os::raw; use std::os::raw;
use std::{ptr, sync::Arc}; use std::ptr;
use crate::{ use crate::{
event_loop::{EventLoopBuilder, EventLoopWindowTarget}, event_loop::{EventLoopBuilder, EventLoopWindowTarget},
@ -9,13 +9,9 @@ use crate::{
use crate::dpi::Size; use crate::dpi::Size;
use crate::platform_impl::{ use crate::platform_impl::{
x11::ffi::XVisualInfo, x11::XConnection, ApplicationName, Backend, x11::ffi::XVisualInfo, ApplicationName, Backend, Window as LinuxWindow, XLIB_ERROR_HOOKS,
EventLoopWindowTarget as LinuxEventLoopWindowTarget, Window as LinuxWindow, XLIB_ERROR_HOOKS,
}; };
// TODO: stupid hack so that glutin can do its work
#[doc(hidden)]
pub use crate::platform_impl::x11;
pub use crate::platform_impl::{x11::util::WindowType as XWindowType, XNotSupported}; pub use crate::platform_impl::{x11::util::WindowType as XWindowType, XNotSupported};
/// The first argument in the provided hook will be the pointer to `XDisplay` /// The first argument in the provided hook will be the pointer to `XDisplay`
@ -45,9 +41,6 @@ pub fn register_xlib_error_hook(hook: XlibErrorHook) {
pub trait EventLoopWindowTargetExtX11 { pub trait EventLoopWindowTargetExtX11 {
/// True if the [`EventLoopWindowTarget`] uses X11. /// True if the [`EventLoopWindowTarget`] uses X11.
fn is_x11(&self) -> bool; fn is_x11(&self) -> bool;
#[doc(hidden)]
fn xlib_xconnection(&self) -> Option<Arc<XConnection>>;
} }
impl<T> EventLoopWindowTargetExtX11 for EventLoopWindowTarget<T> { impl<T> EventLoopWindowTargetExtX11 for EventLoopWindowTarget<T> {
@ -55,15 +48,6 @@ impl<T> EventLoopWindowTargetExtX11 for EventLoopWindowTarget<T> {
fn is_x11(&self) -> bool { fn is_x11(&self) -> bool {
!self.p.is_wayland() !self.p.is_wayland()
} }
#[inline]
fn xlib_xconnection(&self) -> Option<Arc<XConnection>> {
match self.p {
LinuxEventLoopWindowTarget::X(ref e) => Some(e.x_connection().clone()),
#[cfg(wayland_platform)]
_ => None,
}
}
} }
/// Additional methods on [`EventLoopBuilder`] that are specific to X11. /// Additional methods on [`EventLoopBuilder`] that are specific to X11.
@ -108,9 +92,6 @@ pub trait WindowExtX11 {
fn xlib_screen_id(&self) -> Option<raw::c_int>; fn xlib_screen_id(&self) -> Option<raw::c_int>;
#[doc(hidden)]
fn xlib_xconnection(&self) -> Option<Arc<XConnection>>;
/// This function returns the underlying `xcb_connection_t` of an xlib `Display`. /// This function returns the underlying `xcb_connection_t` of an xlib `Display`.
/// ///
/// Returns `None` if the window doesn't use xlib (if it uses wayland for example). /// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
@ -147,15 +128,6 @@ impl WindowExtX11 for Window {
} }
} }
#[inline]
fn xlib_xconnection(&self) -> Option<Arc<XConnection>> {
match self.window {
LinuxWindow::X(ref w) => Some(w.xlib_xconnection()),
#[cfg(wayland_platform)]
_ => None,
}
}
#[inline] #[inline]
fn xcb_connection(&self) -> Option<*mut raw::c_void> { fn xcb_connection(&self) -> Option<*mut raw::c_void> {
match self.window { match self.window {

View file

@ -116,7 +116,7 @@ impl Default for PlatformSpecificWindowBuilderAttributes {
} }
#[cfg(x11_platform)] #[cfg(x11_platform)]
pub static X11_BACKEND: Lazy<Mutex<Result<Arc<XConnection>, XNotSupported>>> = pub(crate) static X11_BACKEND: Lazy<Mutex<Result<Arc<XConnection>, XNotSupported>>> =
Lazy::new(|| Mutex::new(XConnection::new(Some(x_error_callback)).map(Arc::new))); Lazy::new(|| Mutex::new(XConnection::new(Some(x_error_callback)).map(Arc::new)));
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@ -142,7 +142,7 @@ impl fmt::Display for OsError {
} }
} }
pub enum Window { pub(crate) enum Window {
#[cfg(x11_platform)] #[cfg(x11_platform)]
X(x11::Window), X(x11::Window),
#[cfg(wayland_platform)] #[cfg(wayland_platform)]

View file

@ -11,8 +11,7 @@ use percent_encoding::percent_decode;
use super::{ffi, util, XConnection, XError}; use super::{ffi, util, XConnection, XError};
#[derive(Debug)] #[derive(Debug)]
pub struct DndAtoms { pub(crate) struct DndAtoms {
pub aware: ffi::Atom,
pub enter: ffi::Atom, pub enter: ffi::Atom,
pub leave: ffi::Atom, pub leave: ffi::Atom,
pub drop: ffi::Atom, pub drop: ffi::Atom,
@ -29,7 +28,6 @@ pub struct DndAtoms {
impl DndAtoms { impl DndAtoms {
pub fn new(xconn: &Arc<XConnection>) -> Result<Self, XError> { pub fn new(xconn: &Arc<XConnection>) -> Result<Self, XError> {
let names = [ let names = [
b"XdndAware\0".as_ptr() as *mut c_char,
b"XdndEnter\0".as_ptr() as *mut c_char, b"XdndEnter\0".as_ptr() as *mut c_char,
b"XdndLeave\0".as_ptr() as *mut c_char, b"XdndLeave\0".as_ptr() as *mut c_char,
b"XdndDrop\0".as_ptr() as *mut c_char, b"XdndDrop\0".as_ptr() as *mut c_char,
@ -44,18 +42,17 @@ impl DndAtoms {
]; ];
let atoms = unsafe { xconn.get_atoms(&names) }?; let atoms = unsafe { xconn.get_atoms(&names) }?;
Ok(DndAtoms { Ok(DndAtoms {
aware: atoms[0], enter: atoms[0],
enter: atoms[1], leave: atoms[1],
leave: atoms[2], drop: atoms[2],
drop: atoms[3], position: atoms[3],
position: atoms[4], status: atoms[4],
status: atoms[5], action_private: atoms[5],
action_private: atoms[6], selection: atoms[6],
selection: atoms[7], finished: atoms[7],
finished: atoms[8], type_list: atoms[8],
type_list: atoms[9], uri_list: atoms[9],
uri_list: atoms[10], none: atoms[10],
none: atoms[11],
}) })
} }
} }
@ -87,7 +84,7 @@ impl From<io::Error> for DndDataParseError {
} }
} }
pub struct Dnd { pub(crate) struct Dnd {
xconn: Arc<XConnection>, xconn: Arc<XConnection>,
pub atoms: DndAtoms, pub atoms: DndAtoms,
// Populated by XdndEnter event handler // Populated by XdndEnter event handler

View file

@ -8,7 +8,7 @@ use super::{
input_method::PotentialInputMethods, input_method::PotentialInputMethods,
}; };
pub unsafe fn xim_set_callback( pub(crate) unsafe fn xim_set_callback(
xconn: &Arc<XConnection>, xconn: &Arc<XConnection>,
xim: ffi::XIM, xim: ffi::XIM,
field: *const c_char, 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. // * 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 // * 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. // 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>, xconn: &Arc<XConnection>,
client_data: ffi::XPointer, client_data: ffi::XPointer,
) -> Result<(), XError> { ) -> Result<(), XError> {
@ -41,7 +41,7 @@ pub unsafe fn set_instantiate_callback(
xconn.check_errors() xconn.check_errors()
} }
pub unsafe fn unset_instantiate_callback( pub(crate) unsafe fn unset_instantiate_callback(
xconn: &Arc<XConnection>, xconn: &Arc<XConnection>,
client_data: ffi::XPointer, client_data: ffi::XPointer,
) -> Result<(), XError> { ) -> Result<(), XError> {
@ -56,7 +56,7 @@ pub unsafe fn unset_instantiate_callback(
xconn.check_errors() xconn.check_errors()
} }
pub unsafe fn set_destroy_callback( pub(crate) unsafe fn set_destroy_callback(
xconn: &Arc<XConnection>, xconn: &Arc<XConnection>,
im: ffi::XIM, im: ffi::XIM,
inner: &ImeInner, inner: &ImeInner,

View file

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

View file

@ -8,17 +8,17 @@ use super::{
}; };
use crate::platform_impl::platform::x11::ime::ImeEventSender; 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.xlib.XCloseIM)(im);
xconn.check_errors() 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.xlib.XDestroyIC)(ic);
xconn.check_errors() xconn.check_errors()
} }
pub struct ImeInner { pub(crate) struct ImeInner {
pub xconn: Arc<XConnection>, pub xconn: Arc<XConnection>,
pub im: Option<InputMethod>, pub im: Option<InputMethod>,
pub potential_input_methods: PotentialInputMethods, pub potential_input_methods: PotentialInputMethods,
@ -33,7 +33,7 @@ pub struct ImeInner {
} }
impl ImeInner { impl ImeInner {
pub fn new( pub(crate) fn new(
xconn: Arc<XConnection>, xconn: Arc<XConnection>,
potential_input_methods: PotentialInputMethods, potential_input_methods: PotentialInputMethods,
event_sender: ImeEventSender, event_sender: ImeEventSender,

View file

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

View file

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

View file

@ -10,12 +10,14 @@ pub mod util;
mod window; mod window;
mod xdisplay; mod xdisplay;
pub use self::{ pub(crate) use self::{
monitor::{MonitorHandle, VideoMode}, monitor::{MonitorHandle, VideoMode},
window::UnownedWindow, window::UnownedWindow,
xdisplay::{XConnection, XError, XNotSupported}, xdisplay::XConnection,
}; };
pub use self::xdisplay::{XError, XNotSupported};
use std::{ use std::{
cell::{Cell, RefCell}, cell::{Cell, RefCell},
collections::{HashMap, HashSet}, collections::{HashMap, HashSet},
@ -135,7 +137,7 @@ impl<T: 'static> Clone for EventLoopProxy<T> {
} }
impl<T: 'static> EventLoop<T> { impl<T: 'static> EventLoop<T> {
pub fn new(xconn: Arc<XConnection>) -> EventLoop<T> { pub(crate) fn new(xconn: Arc<XConnection>) -> EventLoop<T> {
let root = unsafe { (xconn.xlib.XDefaultRootWindow)(xconn.display) }; let root = unsafe { (xconn.xlib.XDefaultRootWindow)(xconn.display) };
let wm_delete_window = unsafe { xconn.get_atom_unchecked(b"WM_DELETE_WINDOW\0") }; let wm_delete_window = unsafe { xconn.get_atom_unchecked(b"WM_DELETE_WINDOW\0") };
@ -538,7 +540,7 @@ pub(crate) fn get_xtarget<T>(target: &RootELW<T>) -> &EventLoopWindowTarget<T> {
impl<T> EventLoopWindowTarget<T> { impl<T> EventLoopWindowTarget<T> {
/// Returns the `XConnection` of this events loop. /// Returns the `XConnection` of this events loop.
#[inline] #[inline]
pub fn x_connection(&self) -> &Arc<XConnection> { pub(crate) fn x_connection(&self) -> &Arc<XConnection> {
&self.xconn &self.xconn
} }
@ -627,12 +629,13 @@ impl<'a> Deref for DeviceInfo<'a> {
pub struct DeviceId(c_int); pub struct DeviceId(c_int);
impl DeviceId { impl DeviceId {
#[allow(unused)]
pub const unsafe fn dummy() -> Self { pub const unsafe fn dummy() -> Self {
DeviceId(0) DeviceId(0)
} }
} }
pub struct Window(Arc<UnownedWindow>); pub(crate) struct Window(Arc<UnownedWindow>);
impl Deref for Window { impl Deref for Window {
type Target = UnownedWindow; type Target = UnownedWindow;

View file

@ -185,7 +185,7 @@ impl MwmHints {
} }
} }
pub struct NormalHints<'a> { pub(crate) struct NormalHints<'a> {
size_hints: XSmartPointer<'a, ffi::XSizeHints>, size_hints: XSmartPointer<'a, ffi::XSizeHints>,
} }
@ -196,11 +196,6 @@ impl<'a> NormalHints<'a> {
} }
} }
pub fn get_position(&self) -> Option<(i32, i32)> {
has_flag(self.size_hints.flags, ffi::PPosition)
.then(|| (self.size_hints.x, self.size_hints.y))
}
pub fn get_resize_increments(&self) -> Option<(u32, u32)> { pub fn get_resize_increments(&self) -> Option<(u32, u32)> {
has_flag(self.size_hints.flags, ffi::PResizeInc).then(|| { has_flag(self.size_hints.flags, ffi::PResizeInc).then(|| {
( (

View file

@ -2,7 +2,7 @@ use std::ops::{Deref, DerefMut};
use super::*; use super::*;
pub struct XSmartPointer<'a, T> { pub(crate) struct XSmartPointer<'a, T> {
xconn: &'a XConnection, xconn: &'a XConnection,
pub ptr: *mut T, pub ptr: *mut T,
} }

View file

@ -17,10 +17,12 @@ mod window_property;
mod wm; mod wm;
pub use self::{ pub use self::{
atom::*, client_msg::*, format::*, geometry::*, hint::*, icon::*, input::*, memory::*, atom::*, client_msg::*, format::*, geometry::*, hint::*, icon::*, input::*, randr::*,
randr::*, window_property::*, wm::*, window_property::*, wm::*,
}; };
pub(crate) use self::memory::*;
use std::{ use std::{
mem::{self, MaybeUninit}, mem::{self, MaybeUninit},
ops::BitAnd, ops::BitAnd,
@ -48,7 +50,7 @@ where
} }
#[must_use = "This request was made asynchronously, and is still in the output buffer. You must explicitly choose to either `.flush()` (empty the output buffer, sending the request now) or `.queue()` (wait to send the request, allowing you to continue to add more requests without additional round-trips). For more information, see the documentation for `util::flush_requests`."] #[must_use = "This request was made asynchronously, and is still in the output buffer. You must explicitly choose to either `.flush()` (empty the output buffer, sending the request now) or `.queue()` (wait to send the request, allowing you to continue to add more requests without additional round-trips). For more information, see the documentation for `util::flush_requests`."]
pub struct Flusher<'a> { pub(crate) struct Flusher<'a> {
xconn: &'a XConnection, xconn: &'a XConnection,
} }

View file

@ -26,13 +26,13 @@ pub enum Modifier {
} }
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub struct ModifierKeymap { pub(crate) struct ModifierKeymap {
// Maps keycodes to modifiers // Maps keycodes to modifiers
keys: HashMap<ffi::KeyCode, Modifier>, keys: HashMap<ffi::KeyCode, Modifier>,
} }
#[derive(Clone, Debug, Default)] #[derive(Clone, Debug, Default)]
pub struct ModifierKeyState { pub(crate) struct ModifierKeyState {
// Contains currently pressed modifier keys and their corresponding modifiers // Contains currently pressed modifier keys and their corresponding modifiers
keys: HashMap<ffi::KeyCode, Modifier>, keys: HashMap<ffi::KeyCode, Modifier>,
state: ModifiersState, state: ModifiersState,

View file

@ -101,8 +101,8 @@ impl SharedState {
unsafe impl Send for UnownedWindow {} unsafe impl Send for UnownedWindow {}
unsafe impl Sync for UnownedWindow {} unsafe impl Sync for UnownedWindow {}
pub struct UnownedWindow { pub(crate) struct UnownedWindow {
pub xconn: Arc<XConnection>, // never changes pub(crate) xconn: Arc<XConnection>, // never changes
xwindow: ffi::Window, // never changes xwindow: ffi::Window, // never changes
root: ffi::Window, // never changes root: ffi::Window, // never changes
screen_id: i32, // never changes screen_id: i32, // never changes
@ -1299,11 +1299,6 @@ impl UnownedWindow {
self.screen_id self.screen_id
} }
#[inline]
pub fn xlib_xconnection(&self) -> Arc<XConnection> {
Arc::clone(&self.xconn)
}
#[inline] #[inline]
pub fn xlib_window(&self) -> c_ulong { pub fn xlib_window(&self) -> c_ulong {
self.xwindow self.xwindow

View file

@ -5,16 +5,13 @@ use crate::window::CursorIcon;
use super::ffi; use super::ffi;
/// A connection to an X server. /// A connection to an X server.
pub struct XConnection { pub(crate) struct XConnection {
pub xlib: ffi::Xlib, pub xlib: ffi::Xlib,
/// Exposes XRandR functions from version < 1.5 /// Exposes XRandR functions from version < 1.5
pub xrandr: ffi::Xrandr_2_2_0, pub xrandr: ffi::Xrandr_2_2_0,
/// Exposes XRandR functions from version = 1.5
pub xrandr_1_5: Option<ffi::Xrandr>,
pub xcursor: ffi::Xcursor, pub xcursor: ffi::Xcursor,
pub xinput2: ffi::XInput2, pub xinput2: ffi::XInput2,
pub xlib_xcb: ffi::Xlib_xcb, pub xlib_xcb: ffi::Xlib_xcb,
pub xrender: ffi::Xrender,
pub display: *mut ffi::Display, pub display: *mut ffi::Display,
pub x11_fd: c_int, pub x11_fd: c_int,
pub latest_error: Mutex<Option<XError>>, pub latest_error: Mutex<Option<XError>>,
@ -33,10 +30,8 @@ impl XConnection {
let xlib = ffi::Xlib::open()?; let xlib = ffi::Xlib::open()?;
let xcursor = ffi::Xcursor::open()?; let xcursor = ffi::Xcursor::open()?;
let xrandr = ffi::Xrandr_2_2_0::open()?; let xrandr = ffi::Xrandr_2_2_0::open()?;
let xrandr_1_5 = ffi::Xrandr::open().ok();
let xinput2 = ffi::XInput2::open()?; let xinput2 = ffi::XInput2::open()?;
let xlib_xcb = ffi::Xlib_xcb::open()?; let xlib_xcb = ffi::Xlib_xcb::open()?;
let xrender = ffi::Xrender::open()?;
unsafe { (xlib.XInitThreads)() }; unsafe { (xlib.XInitThreads)() };
unsafe { (xlib.XSetErrorHandler)(error_handler) }; unsafe { (xlib.XSetErrorHandler)(error_handler) };
@ -56,11 +51,9 @@ impl XConnection {
Ok(XConnection { Ok(XConnection {
xlib, xlib,
xrandr, xrandr,
xrandr_1_5,
xcursor, xcursor,
xinput2, xinput2,
xlib_xcb, xlib_xcb,
xrender,
display, display,
x11_fd: fd, x11_fd: fd,
latest_error: Mutex::new(None), latest_error: Mutex::new(None),
@ -78,12 +71,6 @@ impl XConnection {
Ok(()) Ok(())
} }
} }
/// Ignores any previous error.
#[inline]
pub fn ignore_error(&self) {
*self.latest_error.lock().unwrap() = None;
}
} }
impl fmt::Debug for XConnection { impl fmt::Debug for XConnection {