alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-24 06:11:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

wayland: WindowExt implementations.

Browse source
This commit is contained in:
Victor Berger 2016-05-08 09:28:54 +02:00
parent 14323656b6
commit c49c6bcd6e
No known key found for this signature in database
GPG key ID: 3638519DDEAAD525
2 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/api/wayland/window.rs
View file

@ -286,6 +286,18 @@ impl Window {
Err(())
}
#[inline]
pub fn get_wayland_display(&self) -> *mut libc::c_void {
WAYLAND_CONTEXT.as_ref().unwrap() // context exists if window was created
.display_ptr() as *mut libc::c_void
}
#[inline]
pub fn get_wayland_surface(&self) -> *mut libc::c_void {
use wayland_client::Proxy;
self.surface.ptr() as *mut libc::c_void
}
#[inline]
pub fn platform_display(&self) -> *mut libc::c_void {
WAYLAND_CONTEXT.as_ref().unwrap() // context exists if window was created

30
src/os/unix.rs
View file

@ -20,6 +20,20 @@ pub trait WindowExt {
///
/// The pointer will become invalid when the glutin `Window` is destroyed.
fn get_xlib_display(&self) -> Option<*mut libc::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 libc::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 libc::c_void>;
}
impl WindowExt for Window {
@ -38,6 +52,22 @@ impl WindowExt for Window {
_ => None
}
}
#[inline]
fn get_wayland_surface(&self) -> Option<*mut libc::c_void> {
match self.window {
LinuxWindow::Wayland(ref w) => Some(w.get_wayland_surface()),
_ => None
}
}
#[inline]
fn get_wayland_display(&self) -> Option<*mut libc::c_void> {
match self.window {
LinuxWindow::Wayland(ref w) => Some(w.get_wayland_display()),
_ => None
}
}
}
/// Additional methods on `WindowBuilder` that are specific to Unix.