Merge pull request #11 from vberger/wayland

wayland: Remove EGL-dependent code.

Cargo.toml

@@ -72,56 +72,56 @@ kernel32-sys = "0.2"
 dwmapi-sys = "0.1"
 
 [target.i686-unknown-linux-gnu.dependencies]
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
+wayland-client = { version = "0.5.4", features = ["dlopen"] }
 wayland-kbd = "0.3.3"
 wayland-window = "0.2.2"
 x11-dl = "~2.4"
 
 [target.i586-unknown-linux-gnu.dependencies]
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
+wayland-client = { version = "0.5.4", features = ["dlopen"] }
 wayland-kbd = "0.3.3"
 wayland-window = "0.2.2"
 x11-dl = "~2.4"
 
 [target.x86_64-unknown-linux-gnu.dependencies]
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
+wayland-client = { version = "0.5.4", features = ["dlopen"] }
 wayland-kbd = "0.3.3"
 wayland-window = "0.2.2"
 x11-dl = "~2.4"
 
 [target.arm-unknown-linux-gnueabihf.dependencies]
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
+wayland-client = { version = "0.5.4", features = ["dlopen"] }
 wayland-kbd = "0.3.3"
 wayland-window = "0.2.2"
 x11-dl = "~2.4"
 
 [target.armv7-unknown-linux-gnueabihf.dependencies]
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
+wayland-client = { version = "0.5.4", features = ["dlopen"] }
 wayland-kbd = "0.3.3"
 wayland-window = "0.2.2"
 x11-dl = "~2.4"
 
 [target.aarch64-unknown-linux-gnu.dependencies]
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
+wayland-client = { version = "0.5.4", features = ["dlopen"] }
 wayland-kbd = "0.3.3"
 wayland-window = "0.2.2"
 x11-dl = "~2.4"
 
 [target.x86_64-unknown-dragonfly.dependencies]
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
+wayland-client = { version = "0.5.4", features = ["dlopen"] }
 wayland-kbd = "0.3.3"
 wayland-window = "0.2.2"
 x11-dl = "~2.4"
 
 [target.x86_64-unknown-freebsd.dependencies]
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
+wayland-client = { version = "0.5.4", features = ["dlopen"] }
 wayland-kbd = "0.3.3"
 wayland-window = "0.2.2"
 x11-dl = "~2.4"
 
 [target.x86_64-unknown-openbsd.dependencies]
 osmesa-sys = "0.0.5"
-wayland-client = { version = "0.5.4", features = ["egl", "dlopen"] }
+wayland-client = { version = "0.5.4", features = ["dlopen"] }
 wayland-kbd = "0.3.3"
 wayland-window = "0.2.2"
 x11-dl = "~2.4"

src/api/wayland/context.rs

@@ -57,7 +57,7 @@ impl WaylandContext {
 
         let (mut inner_env, iterator) = InnerEnv::init(display);
 
-        let mut outputs_events = EventIterator::new();
+        let outputs_events = EventIterator::new();
 
         let mut monitors = inner_env.globals.iter()
             .flat_map(|&(id, _, _)| inner_env.rebind_id::<WlOutput>(id))

src/api/wayland/window.rs

@@ -1,15 +1,13 @@
 use std::collections::VecDeque;
-use std::ffi::CString;
 use std::sync::{Arc, Mutex};
 
 use libc;
 
 use {CreationError, CursorState, Event, MouseCursor, WindowAttributes};
-use api::dlopen;
 use platform::MonitorId as PlatformMonitorId;
 
 use wayland_client::EventIterator;
-use wayland_client::egl as wegl;
+use wayland_client::wayland::compositor::WlSurface;
 use wayland_client::wayland::shell::WlShellSurface;
 use super::wayland_window::{DecoratedSurface, add_borders, substract_borders};
 use super::context::{WaylandContext, WAYLAND_CONTEXT};
@@ -26,7 +24,7 @@ impl WindowProxy {
 
 pub struct Window {
     wayland_context: &'static WaylandContext,
-    egl_surface: wegl::WlEglSurface,
+    surface: WlSurface,
     shell_window: Mutex<ShellWindow>,
     evt_queue: Arc<Mutex<VecDeque<Event>>>,
     inner_size: Mutex<(i32, i32)>,
@@ -72,7 +70,6 @@ impl Window {
             if let ShellWindow::Decorated(ref mut deco) = *shell_window_guard {
                 deco.resize(w, h);
             }
-            self.egl_surface.resize(w, h, 0, 0);
             if let Some(f) = self.resize_callback {
                 f(w as u32, h as u32);
             }
@@ -145,10 +142,6 @@ impl Window {
             None => return Err(CreationError::NotSupported),
         };
 
-        if !wegl::is_available() {
-            return Err(CreationError::NotSupported)
-        }
-
         let (w, h) = window.dimensions.unwrap_or((800, 600));
 
         let (surface, evt_queue) = match wayland_context.new_surface() {
@@ -156,11 +149,9 @@ impl Window {
             None => return Err(CreationError::NotSupported)
         };
 
-        let egl_surface = wegl::WlEglSurface::new(surface, w as i32, h as i32);
-
         let shell_window = if let Some(PlatformMonitorId::Wayland(ref monitor_id)) = window.monitor {
             let pid = super::monitor::proxid_from_monitorid(monitor_id);
-            match wayland_context.plain_from(&egl_surface, Some(pid)) {
+            match wayland_context.plain_from(&surface, Some(pid)) {
                 Some(mut s) => {
                     let iter = EventIterator::new();
                     s.set_evt_iterator(&iter);
@@ -169,12 +160,12 @@ impl Window {
                 None => return Err(CreationError::NotSupported)
             }
         } else if window.decorations {
-            match wayland_context.decorated_from(&egl_surface, w as i32, h as i32) {
+            match wayland_context.decorated_from(&surface, w as i32, h as i32) {
                 Some(s) => ShellWindow::Decorated(s),
                 None => return Err(CreationError::NotSupported)
             }
         } else {
-            match wayland_context.plain_from(&egl_surface, None) {
+            match wayland_context.plain_from(&surface, None) {
                 Some(mut s) => {
                     let iter = EventIterator::new();
                     s.set_evt_iterator(&iter);
@@ -186,7 +177,7 @@ impl Window {
 
         Ok(Window {
             wayland_context: wayland_context,
-            egl_surface: egl_surface,
+            surface: surface,
             shell_window: Mutex::new(shell_window),
             evt_queue: evt_queue,
             inner_size: Mutex::new((w as i32, h as i32)),
@@ -242,7 +233,6 @@ impl Window {
             ShellWindow::Decorated(ref mut deco) => { deco.resize(x as i32, y as i32); },
             _ => {}
         }
-        self.egl_surface.resize(x as i32, y as i32, 0, 0)
     }
 
     #[inline]
@@ -296,20 +286,34 @@ 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 {
-        unimplemented!()
+        WAYLAND_CONTEXT.as_ref().unwrap() // context exists if window was created
+                       .display_ptr() as *mut libc::c_void
     }
 
     #[inline]
     pub fn platform_window(&self) -> *mut libc::c_void {
-        unimplemented!()
+        use wayland_client::Proxy;
+        self.surface.ptr() as *mut libc::c_void
     }
 }
 
 impl Drop for Window {
     fn drop(&mut self) {
         use wayland_client::Proxy;
-        self.wayland_context.dropped_surface((*self.egl_surface).id())
+        self.wayland_context.dropped_surface(self.surface.id());
     }
 }

src/os/unix.rs

@@ -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.