WIP on Wayland upgrade

Cargo.toml

@@ -62,8 +62,9 @@ version = "0.3.9"
 features = ["winuser", "wingdi", "libloaderapi", "errhandlingapi", "fileapi"]
 
 [features]
-default = ["wayland", "x11", "dlopen"]
-dlopen = ["wayland-client/dlopen"]
+# default = ["wayland", "x11", "dlopen"]
+default = ["wayland", "x11"]
+# dlopen = ["wayland-client/dlopen"]
 x11 = ["x11-dl", "libc"]
 wayland = [
   "dlib",
@@ -76,19 +77,17 @@ wayland = [
 ]
 
 [target.'cfg(not(any(target_os = "macos", target_os = "redox", windows, target_arch="wasm32")))'.dependencies]
-wayland-client = { version = "0.29", optional = true }
-wayland-protocols = { version = "0.29", features = [
+wayland-client = { version = "0.31", optional = true }
+wayland-protocols = { version = "0.32", features = [
   "client",
-  "unstable_protocols",
 ], optional = true }
-wayland-cursor = { version = "0.29", optional = true }
+wayland-cursor = { version = "0.31", optional = true }
 tempfile = { version = "3.3", optional = true }
 x11-dl = { version = "2.19.1", optional = true }
 libc = { version = "0.2.107", optional = true }
 dlib = { version = "0.5", optional = true }
 lazy_static = { version = "1.0", optional = true }
 
-
 [target.x86_64-unknown-redox.dependencies]
 orbclient = "0.3.20"
 

src/os/posix/wayland.rs

@@ -37,10 +37,12 @@ use wayland_client::{
     Attached, Display, EventQueue, GlobalManager, Main,
 };
 use wayland_protocols::{
+    /*
     unstable::xdg_decoration::v1::client::zxdg_decoration_manager_v1::ZxdgDecorationManagerV1,
     xdg_shell::client::{
         xdg_surface::XdgSurface, xdg_toplevel::XdgToplevel, xdg_wm_base::XdgWmBase,
     },
+    */
 };
 
 use super::xkb_ffi;