mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-30 00:31:30 +11:00
23e4293179
Fixes #256 `get_xlib_window` and `get_xlib_screen_id` previously returned `Option<*mut c_void>` by casting integer IDs into pointers, which while producing no functionality issues, is semantically incorrect and rather surprising. Worse still, the docs for `get_xlib_window` stated that it was in fact a valid pointer. Additionally, now all `unix::WindowExt` methods return `std::os::raw` types rather than `libc` types; note that the two versions of `c_void` are not interchangeable in the eyes of the compiler, so those wanting the `libc` type will need to explicitly cast. This is a breaking change, and will require some trivial changes to glutin.
232 lines
6.7 KiB
Rust
232 lines
6.7 KiB
Rust
#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd"))]
|
|
|
|
use std::os::raw;
|
|
use std::sync::Arc;
|
|
use std::ptr;
|
|
use EventsLoop;
|
|
use MonitorId;
|
|
use Window;
|
|
use platform::EventsLoop as LinuxEventsLoop;
|
|
use platform::Window as LinuxWindow;
|
|
use WindowBuilder;
|
|
use platform::x11::XConnection;
|
|
use platform::x11::ffi::XVisualInfo;
|
|
|
|
// TODO: stupid hack so that glutin can do its work
|
|
#[doc(hidden)]
|
|
pub use platform::x11;
|
|
|
|
pub use platform::XNotSupported;
|
|
|
|
/// Additional methods on `EventsLoop` that are specific to Linux.
|
|
pub trait EventsLoopExt {
|
|
/// Builds a new `EventsLoop` that is forced to use X11.
|
|
fn new_x11() -> Result<Self, XNotSupported>
|
|
where Self: Sized;
|
|
|
|
/// Builds a new `EventsLoop` that is forced to use Wayland.
|
|
fn new_wayland() -> Self
|
|
where Self: Sized;
|
|
|
|
/// True if the `EventsLoop` uses Wayland.
|
|
fn is_wayland(&self) -> bool;
|
|
|
|
/// True if the `EventsLoop` uses X11.
|
|
fn is_x11(&self) -> bool;
|
|
|
|
#[doc(hidden)]
|
|
fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>>;
|
|
}
|
|
|
|
impl EventsLoopExt for EventsLoop {
|
|
#[inline]
|
|
fn new_x11() -> Result<Self, XNotSupported> {
|
|
LinuxEventsLoop::new_x11().map(|ev|
|
|
EventsLoop {
|
|
events_loop: ev,
|
|
_marker: ::std::marker::PhantomData,
|
|
}
|
|
)
|
|
}
|
|
|
|
#[inline]
|
|
fn new_wayland() -> Self {
|
|
EventsLoop {
|
|
events_loop: match LinuxEventsLoop::new_wayland() {
|
|
Ok(e) => e,
|
|
Err(_) => panic!() // TODO: propagate
|
|
},
|
|
_marker: ::std::marker::PhantomData,
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
fn is_wayland(&self) -> bool {
|
|
self.events_loop.is_wayland()
|
|
}
|
|
|
|
#[inline]
|
|
fn is_x11(&self) -> bool {
|
|
!self.events_loop.is_wayland()
|
|
}
|
|
|
|
#[inline]
|
|
fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>> {
|
|
self.events_loop.x_connection().cloned()
|
|
}
|
|
}
|
|
|
|
/// Additional methods on `Window` that are specific to Unix.
|
|
pub trait WindowExt {
|
|
/// Returns the ID of the `Window` xlib object that is used by this window.
|
|
///
|
|
/// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
|
|
fn get_xlib_window(&self) -> Option<raw::c_ulong>;
|
|
|
|
/// Returns a pointer to the `Display` object of xlib that is used by this window.
|
|
///
|
|
/// Returns `None` if the window doesn't use xlib (if it uses wayland for example).
|
|
///
|
|
/// The pointer will become invalid when the glutin `Window` is destroyed.
|
|
fn get_xlib_display(&self) -> Option<*mut raw::c_void>;
|
|
|
|
fn get_xlib_screen_id(&self) -> Option<raw::c_int>;
|
|
|
|
fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>>;
|
|
|
|
fn send_xim_spot(&self, x: i16, y: i16);
|
|
|
|
/// 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).
|
|
///
|
|
/// The pointer will become invalid when the glutin `Window` is destroyed.
|
|
fn get_xcb_connection(&self) -> Option<*mut raw::c_void>;
|
|
|
|
/// Returns a pointer to the `wl_surface` object of wayland that is used by this window.
|
|
///
|
|
/// Returns `None` if the window doesn't use wayland (if it uses xlib for example).
|
|
///
|
|
/// The pointer will become invalid when the glutin `Window` is destroyed.
|
|
fn get_wayland_surface(&self) -> Option<*mut raw::c_void>;
|
|
|
|
/// Returns a pointer to the `wl_display` object of wayland that is used by this window.
|
|
///
|
|
/// Returns `None` if the window doesn't use wayland (if it uses xlib for example).
|
|
///
|
|
/// The pointer will become invalid when the glutin `Window` is destroyed.
|
|
fn get_wayland_display(&self) -> Option<*mut raw::c_void>;
|
|
|
|
/// Check if the window is ready for drawing
|
|
///
|
|
/// It is a remnant of a previous implementation detail for the
|
|
/// wayland backend, and is no longer relevant.
|
|
///
|
|
/// Always return true.
|
|
#[deprecated]
|
|
fn is_ready(&self) -> bool;
|
|
}
|
|
|
|
impl WindowExt for Window {
|
|
#[inline]
|
|
fn get_xlib_window(&self) -> Option<raw::c_ulong> {
|
|
match self.window {
|
|
LinuxWindow::X(ref w) => Some(w.get_xlib_window()),
|
|
_ => None
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
fn get_xlib_display(&self) -> Option<*mut raw::c_void> {
|
|
match self.window {
|
|
LinuxWindow::X(ref w) => Some(w.get_xlib_display()),
|
|
_ => None
|
|
}
|
|
}
|
|
|
|
fn get_xlib_screen_id(&self) -> Option<raw::c_int> {
|
|
match self.window {
|
|
LinuxWindow::X(ref w) => Some(w.get_xlib_screen_id()),
|
|
_ => None
|
|
}
|
|
}
|
|
|
|
fn get_xlib_xconnection(&self) -> Option<Arc<XConnection>> {
|
|
match self.window {
|
|
LinuxWindow::X(ref w) => Some(w.get_xlib_xconnection()),
|
|
_ => None
|
|
}
|
|
}
|
|
|
|
fn get_xcb_connection(&self) -> Option<*mut raw::c_void> {
|
|
match self.window {
|
|
LinuxWindow::X(ref w) => Some(w.get_xcb_connection()),
|
|
_ => None
|
|
}
|
|
}
|
|
|
|
fn send_xim_spot(&self, x: i16, y: i16) {
|
|
if let LinuxWindow::X(ref w) = self.window {
|
|
w.send_xim_spot(x, y);
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
fn get_wayland_surface(&self) -> Option<*mut raw::c_void> {
|
|
use wayland_client::Proxy;
|
|
match self.window {
|
|
LinuxWindow::Wayland(ref w) => Some(w.get_surface().ptr() as *mut _),
|
|
_ => None
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
fn get_wayland_display(&self) -> Option<*mut raw::c_void> {
|
|
use wayland_client::Proxy;
|
|
match self.window {
|
|
LinuxWindow::Wayland(ref w) => Some(w.get_display().ptr() as *mut _),
|
|
_ => None
|
|
}
|
|
}
|
|
|
|
#[inline]
|
|
fn is_ready(&self) -> bool {
|
|
true
|
|
}
|
|
}
|
|
|
|
/// Additional methods on `WindowBuilder` that are specific to Unix.
|
|
pub trait WindowBuilderExt {
|
|
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_x11_visual<T>(mut self, visual_infos: *const T) -> WindowBuilder {
|
|
self.platform_specific.visual_infos = Some(
|
|
unsafe { ptr::read(visual_infos as *const XVisualInfo) }
|
|
);
|
|
self
|
|
}
|
|
|
|
#[inline]
|
|
fn with_x11_screen(mut self, screen_id: i32) -> WindowBuilder {
|
|
self.platform_specific.screen_id = Some(screen_id);
|
|
self
|
|
}
|
|
}
|
|
|
|
/// Additional methods on `MonitorId` that are specific to Linux.
|
|
pub trait MonitorIdExt {
|
|
/// Returns the inner identifier of the monitor.
|
|
fn native_id(&self) -> u32;
|
|
}
|
|
|
|
impl MonitorIdExt for MonitorId {
|
|
#[inline]
|
|
fn native_id(&self) -> u32 {
|
|
self.inner.get_native_identifier()
|
|
}
|
|
}
|