Add wayland specific code to examples for windows to appear

Cargo.toml

@@ -63,7 +63,7 @@ features = [
 
 [target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd"))'.dependencies]
 wayland-client = { version = "0.21", features = [ "dlopen", "egl", "cursor"] }
-smithay-client-toolkit = "0.4.3"
+smithay-client-toolkit = { git = "https://github.com/smithay/client-toolkit" }
 x11-dl = "2.18.3"
 parking_lot = "0.7"
 percent-encoding = "1.0"

examples/cursor.rs

@@ -1,11 +1,17 @@
 extern crate winit;
 
+mod helpers;
+
 use winit::{Event, ElementState, MouseCursor, WindowEvent, KeyboardInput, ControlFlow};
 
 fn main() {
     let mut events_loop = winit::EventsLoop::new();
 
     let window = winit::WindowBuilder::new().build(&events_loop).unwrap();
+
+    // Wayland requires the commiting of a surface to display a window
+    helpers::init_wayland(&window);
+
     window.set_title("A fantastic window!");
 
     let cursors = [MouseCursor::Default, MouseCursor::Crosshair, MouseCursor::Hand, MouseCursor::Arrow, MouseCursor::Move, MouseCursor::Text, MouseCursor::Wait, MouseCursor::Help, MouseCursor::Progress, MouseCursor::NotAllowed, MouseCursor::ContextMenu, MouseCursor::Cell, MouseCursor::VerticalText, MouseCursor::Alias, MouseCursor::Copy, MouseCursor::NoDrop, MouseCursor::Grab, MouseCursor::Grabbing, MouseCursor::AllScroll, MouseCursor::ZoomIn, MouseCursor::ZoomOut, MouseCursor::EResize, MouseCursor::NResize, MouseCursor::NeResize, MouseCursor::NwResize, MouseCursor::SResize, MouseCursor::SeResize, MouseCursor::SwResize, MouseCursor::WResize, MouseCursor::EwResize, MouseCursor::NsResize, MouseCursor::NeswResize, MouseCursor::NwseResize, MouseCursor::ColResize, MouseCursor::RowResize];

examples/cursor_grab.rs

@@ -1,5 +1,7 @@
 extern crate winit;
 
+mod helpers;
+
 fn main() {
     let mut events_loop = winit::EventsLoop::new();
 
@@ -8,6 +10,9 @@ fn main() {
         .build(&events_loop)
         .unwrap();
 
+    // Wayland requires the commiting of a surface to display a window
+    helpers::init_wayland(&window);
+
     events_loop.run_forever(|event| {
         if let winit::Event::WindowEvent { event, .. } = event {
             use winit::WindowEvent::*;

examples/fullscreen.rs

@@ -1,5 +1,7 @@
 extern crate winit;
 
+mod helpers;
+
 use std::io::{self, Write};
 use winit::{ControlFlow, Event, WindowEvent};
 
@@ -46,6 +48,9 @@ fn main() {
         .build(&events_loop)
         .unwrap();
 
+    // Wayland requires the commiting of a surface to display a window
+    helpers::init_wayland(&window);
+
     events_loop.run_forever(|event| {
         println!("{:?}", event);
 

examples/handling_close.rs

@@ -1,13 +1,18 @@
 extern crate winit;
 
+mod helpers;
+
 fn main() {
     let mut events_loop = winit::EventsLoop::new();
 
-    let _window = winit::WindowBuilder::new()
+    let window = winit::WindowBuilder::new()
         .with_title("Your faithful window")
         .build(&events_loop)
         .unwrap();
 
+    // Wayland requires the commiting of a surface to display a window
+    helpers::init_wayland(&window);
+
     let mut close_requested = false;
 
     events_loop.run_forever(|event| {

examples/helpers/mod.rs

@@ -0,0 +1,45 @@
+#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
+extern crate smithay_client_toolkit as sctk;
+
+#[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
+use winit::os::unix::WindowExt;
+
+// Wayland requires the commiting of a surface to display a window
+pub fn init_wayland(window: &winit::Window) {
+    #[cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
+    {
+        if let Some(winit_display) = window.get_wayland_display() {
+            if let Some(surface) = window.get_wayland_surface() {
+                use self::sctk::reexports::client::protocol::wl_shm;
+                use self::sctk::reexports::client::protocol::wl_surface::RequestsTrait as SurfaceRequests;
+                use self::sctk::reexports::client::{Display, Proxy};
+                use self::sctk::utils::DoubleMemPool;
+                use self::sctk::wayland_client::sys::client::wl_display;
+                use self::sctk::Environment;
+
+                let (width, height): (u32, u32) = window.get_inner_size().unwrap().into();
+                let (display, mut event_queue) =
+                    unsafe { Display::from_external_display(winit_display as *mut wl_display) };
+                let env = Environment::from_display(&*display, &mut event_queue).unwrap();
+                let mut pools =
+                    DoubleMemPool::new(&env.shm, || {}).expect("Failed to create a memory pool !");
+                let surface = unsafe { Proxy::from_c_ptr(surface as *mut _) };
+
+                if let Some(pool) = pools.pool() {
+                    pool.resize(4 * (width * height) as usize)
+                        .expect("Failed to resize the memory pool.");
+                    let new_buffer = pool.buffer(
+                        0,
+                        width as i32,
+                        height as i32,
+                        4 * width as i32,
+                        wl_shm::Format::Argb8888,
+                    );
+                    surface.attach(Some(&new_buffer), 0, 0);
+                    surface.commit();
+                    event_queue.sync_roundtrip().unwrap();
+                }
+            }
+        }
+    }
+}

examples/min_max_size.rs

@@ -1,5 +1,7 @@
 extern crate winit;
 
+mod helpers;
+
 use winit::dpi::LogicalSize;
 
 fn main() {
@@ -9,6 +11,9 @@ fn main() {
         .build(&events_loop)
         .unwrap();
 
+    // Wayland requires the commiting of a surface to display a window
+    helpers::init_wayland(&window);
+
     window.set_min_dimensions(Some(LogicalSize::new(400.0, 200.0)));
     window.set_max_dimensions(Some(LogicalSize::new(800.0, 400.0)));
 

examples/monitor_list.rs

@@ -1,7 +1,11 @@
 extern crate winit;
 
+mod helpers;
+
 fn main() {
     let event_loop = winit::EventsLoop::new();
     let window = winit::WindowBuilder::new().build(&event_loop).unwrap();
+    // Wayland requires the commiting of a surface to display a window
+    helpers::init_wayland(&window);
     println!("{:#?}\nPrimary: {:#?}", window.get_available_monitors(), window.get_primary_monitor());
 }

examples/multiwindow.rs

@@ -1,5 +1,7 @@
 extern crate winit;
 
+mod helpers;
+
 use std::collections::HashMap;
 
 fn main() {
@@ -8,6 +10,8 @@ fn main() {
     let mut windows = HashMap::new();
     for _ in 0..3 {
         let window = winit::Window::new(&events_loop).unwrap();
+        // Wayland requires the commiting of a surface to display a window
+        helpers::init_wayland(&window);
         windows.insert(window.id(), window);
     }
 

examples/proxy.rs

@@ -1,13 +1,18 @@
 extern crate winit;
 
+mod helpers;
+
 fn main() {
     let mut events_loop = winit::EventsLoop::new();
 
-    let _window = winit::WindowBuilder::new()
+    let window = winit::WindowBuilder::new()
         .with_title("A fantastic window!")
         .build(&events_loop)
         .unwrap();
 
+    // Wayland requires the commiting of a surface to display a window
+    helpers::init_wayland(&window);
+
     let proxy = events_loop.create_proxy();
 
     std::thread::spawn(move || {

examples/resizable.rs

@@ -1,5 +1,7 @@
 extern crate winit;
 
+mod helpers;
+
 fn main() {
     let mut events_loop = winit::EventsLoop::new();
 
@@ -12,6 +14,9 @@ fn main() {
         .build(&events_loop)
         .unwrap();
 
+    // Wayland requires the commiting of a surface to display a window
+    helpers::init_wayland(&window);
+
     events_loop.run_forever(|event| {
         match event {
             winit::Event::WindowEvent { event, .. } => match event {

examples/transparent.rs

@@ -1,12 +1,17 @@
 extern crate winit;
 
+mod helpers;
+
 fn main() {
     let mut events_loop = winit::EventsLoop::new();
 
     let window = winit::WindowBuilder::new().with_decorations(false)
                                                  .with_transparency(true)
                                                  .build(&events_loop).unwrap();
 
+    // Wayland requires the commiting of a surface to display a window
+    helpers::init_wayland(&window);
+
     window.set_title("A fantastic window!");
 
     events_loop.run_forever(|event| {

examples/window.rs

@@ -1,13 +1,18 @@
 extern crate winit;
 
+mod helpers;
+
 fn main() {
     let mut events_loop = winit::EventsLoop::new();
 
-    let _window = winit::WindowBuilder::new()
+    let window = winit::WindowBuilder::new()
         .with_title("A fantastic window!")
         .build(&events_loop)
         .unwrap();
 
+    // Wayland requires the commiting of a surface to display a window
+    helpers::init_wayland(&window);
+
     events_loop.run_forever(|event| {
         println!("{:?}", event);
 

examples/window_icon.rs

@@ -6,6 +6,8 @@ extern crate winit;
 #[cfg(feature = "icon_loading")]
 extern crate image;
 
+mod helpers;
+
 #[cfg(feature = "icon_loading")]
 fn main() {
     use winit::Icon;
@@ -30,6 +32,9 @@ fn main() {
         .build(&events_loop)
         .unwrap();
 
+    // Wayland requires the commiting of a surface to display a window
+    helpers::init_wayland(&window);
+
     events_loop.run_forever(|event| {
         if let winit::Event::WindowEvent { event, .. } = event {
             use winit::WindowEvent::*;