aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2014-10-24 10:19:35 +0200
committertomaka <pierre.krieger1708@gmail.com>2014-10-24 10:19:35 +0200
commitfe8646c55681d6ecbd290010ab702f8f0feecc00 (patch)
tree9133f1513e7da85e951e08f3a0c9fb3ac93f00ac
parent59ff347eed8fda8a298330fcc5ab3ad89686da32 (diff)
parent21e3ff99fa5628011fe226dd13a87e09f0f33330 (diff)
downloadglutin-fe8646c55681d6ecbd290010ab702f8f0feecc00.tar.gz
glutin-fe8646c55681d6ecbd290010ab702f8f0feecc00.zip
Merge pull request #66 from glennw/platform_data
Add accessor for underlying display handle on Linux.
-rw-r--r--src/android/mod.rs4
-rw-r--r--src/lib.rs8
-rw-r--r--src/osx/mod.rs4
-rw-r--r--src/win32/mod.rs4
-rw-r--r--src/x11/window/mod.rs4
5 files changed, 24 insertions, 0 deletions
diff --git a/src/android/mod.rs b/src/android/mod.rs
index d900abe..ef2e5e0 100644
--- a/src/android/mod.rs
+++ b/src/android/mod.rs
@@ -186,6 +186,10 @@ impl Window {
ffi::egl::SwapBuffers(self.display, self.surface);
}
}
+
+ pub fn platform_display(&self) -> *mut libc::c_void {
+ unimplemented!()
+ }
}
#[unsafe_destructor]
diff --git a/src/lib.rs b/src/lib.rs
index 041ebeb..868d4c0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -341,6 +341,14 @@ impl Window {
pub fn swap_buffers(&self) {
self.window.swap_buffers()
}
+
+ /// Gets the native platform specific display for this window.
+ /// This is typically only required when integrating with
+ /// other libraries that need this information.
+ #[inline]
+ pub unsafe fn platform_display(&self) -> *mut libc::c_void {
+ self.window.platform_display()
+ }
}
/// Represents a headless OpenGL context.
diff --git a/src/osx/mod.rs b/src/osx/mod.rs
index dfd2eb8..2ad1ba3 100644
--- a/src/osx/mod.rs
+++ b/src/osx/mod.rs
@@ -337,4 +337,8 @@ impl Window {
pub fn swap_buffers(&self) {
unsafe { self.context.flushBuffer(); }
}
+
+ pub fn platform_display(&self) -> *mut libc::c_void {
+ unimplemented!()
+ }
}
diff --git a/src/win32/mod.rs b/src/win32/mod.rs
index c3da891..5ce9677 100644
--- a/src/win32/mod.rs
+++ b/src/win32/mod.rs
@@ -233,6 +233,10 @@ impl Window {
ffi::SwapBuffers(self.hdc);
}
}
+
+ pub fn platform_display(&self) -> *mut libc::c_void {
+ unimplemented!()
+ }
}
#[unsafe_destructor]
diff --git a/src/x11/window/mod.rs b/src/x11/window/mod.rs
index cb73958..3d69a3e 100644
--- a/src/x11/window/mod.rs
+++ b/src/x11/window/mod.rs
@@ -469,6 +469,10 @@ impl Window {
pub fn swap_buffers(&self) {
unsafe { ffi::glx::SwapBuffers(self.display, self.window) }
}
+
+ pub fn platform_display(&self) -> *mut libc::c_void {
+ self.display as *mut libc::c_void
+ }
}
impl Drop for Window {