mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-24 06:11:30 +11:00
Add get_x11_xconnection function
This commit is contained in:
parent
d4b8fd9f5a
commit
f5812018ca
|
@ -5,6 +5,7 @@ use std::ptr;
|
|||
use libc;
|
||||
use Window;
|
||||
use platform::Window as LinuxWindow;
|
||||
use platform::{UnixBackend, UNIX_BACKEND};
|
||||
use WindowBuilder;
|
||||
use api::x11::XConnection;
|
||||
use api::x11::ffi::XVisualInfo;
|
||||
|
@ -14,6 +15,13 @@ use wayland_client::protocol::wl_surface::WlSurface;
|
|||
|
||||
pub use api::x11;
|
||||
|
||||
pub fn get_x11_xconnection() -> Option<Arc<XConnection>> {
|
||||
match *UNIX_BACKEND {
|
||||
UnixBackend::X(ref connec) => Some(connec.clone()),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
||||
/// Additional methods on `Window` that are specific to Unix.
|
||||
pub trait WindowExt {
|
||||
/// Returns a pointer to the `Window` object of xlib that is used by this window.
|
||||
|
@ -144,21 +152,21 @@ impl WindowExt for Window {
|
|||
|
||||
/// Additional methods on `WindowBuilder` that are specific to Unix.
|
||||
pub trait WindowBuilderExt {
|
||||
fn with_visual(self, visual_infos: *const XVisualInfo) -> WindowBuilder;
|
||||
fn with_screen(self, screen_id: i32) -> WindowBuilder;
|
||||
fn with_x11_visual<T>(self, visual_infos: *const T) -> WindowBuilder;
|
||||
fn with_x11_screen(self, screen_id: i32) -> WindowBuilder;
|
||||
}
|
||||
|
||||
impl WindowBuilderExt for WindowBuilder {
|
||||
#[inline]
|
||||
fn with_visual(mut self, visual_infos: *const XVisualInfo) -> WindowBuilder {
|
||||
fn with_x11_visual<T>(mut self, visual_infos: *const T) -> WindowBuilder {
|
||||
self.platform_specific.visual_infos = Some(
|
||||
unsafe { ptr::read(visual_infos) }
|
||||
);
|
||||
unsafe { ptr::read(visual_infos as *const XVisualInfo) }
|
||||
);
|
||||
self
|
||||
}
|
||||
|
||||
#[inline]
|
||||
fn with_screen(mut self, screen_id: i32) -> WindowBuilder {
|
||||
fn with_x11_screen(mut self, screen_id: i32) -> WindowBuilder {
|
||||
self.platform_specific.screen_id = Some(screen_id);
|
||||
self
|
||||
}
|
||||
|
|
|
@ -21,14 +21,14 @@ pub struct PlatformSpecificWindowBuilderAttributes {
|
|||
pub screen_id: Option<i32>,
|
||||
}
|
||||
|
||||
enum Backend {
|
||||
pub enum Backend {
|
||||
X(Arc<XConnection>),
|
||||
Wayland(Arc<wayland::WaylandContext>),
|
||||
Error(XNotSupported),
|
||||
}
|
||||
}
|
||||
|
||||
lazy_static!(
|
||||
static ref BACKEND: Backend = {
|
||||
pub static ref BACKEND: Backend = {
|
||||
if let Some(ctxt) = wayland::WaylandContext::init() {
|
||||
Backend::Wayland(Arc::new(ctxt))
|
||||
} else {
|
||||
|
@ -40,6 +40,7 @@ lazy_static!(
|
|||
};
|
||||
);
|
||||
|
||||
|
||||
pub enum Window {
|
||||
#[doc(hidden)]
|
||||
X(x11::Window),
|
||||
|
|
|
@ -3,5 +3,7 @@
|
|||
pub use self::api_dispatch::{Window, WindowProxy, MonitorId, get_available_monitors, get_primary_monitor};
|
||||
pub use self::api_dispatch::{WaitEventsIterator, PollEventsIterator};
|
||||
pub use self::api_dispatch::PlatformSpecificWindowBuilderAttributes;
|
||||
pub use self::api_dispatch::Backend as UnixBackend;
|
||||
pub use self::api_dispatch::BACKEND as UNIX_BACKEND;
|
||||
|
||||
mod api_dispatch;
|
||||
|
|
Loading…
Reference in a new issue