From de373074fd84fc025d61daecbeb92f9223c22d8d Mon Sep 17 00:00:00 2001
From: Victor Berger <victor.berger@m4x.org>
Date: Sat, 12 May 2018 12:55:37 +0200
Subject: [PATCH] Update winit to 0.14

---
 Cargo.toml           | 15 +++++----------
 src/backend/winit.rs |  2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index e1f1619..cd370ca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,16 +10,16 @@ repository = "https://github.com/Smithay/smithay"
 members = [ "anvil" ]
 
 [dependencies]
-wayland-server = "0.20.2"
-wayland-sys = "0.20.2"
+wayland-server = "0.20.5"
+wayland-sys = "0.20.5"
 nix = "0.10.0"
 xkbcommon = "0.2.1"
 tempfile = "2.1.5"
 slog = { version = "2.1.1" }
 slog-stdlog = "3.0.2"
 libloading = "0.4.0"
-wayland-client = { version = "0.20.2", optional = true }
-winit = { version = "0.10.0", optional = true }
+wayland-client = { version = "0.20.5", optional = true }
+winit = { version = "0.14.0", optional = true }
 drm = { version = "^0.3.1", optional = true }
 gbm = { version = "^0.4.0", optional = true, default-features = false, features = ["drm-support"] }
 glium = { version = "0.19.0", optional = true, default-features = false }
@@ -27,7 +27,7 @@ input = { version = "0.4.0", optional = true }
 udev = { version = "0.2.0", optional = true }
 dbus = { version = "0.6.1", optional = true }
 systemd = { version = "^0.2.0", optional = true }
-wayland-protocols = { version = "0.20.2", features = ["unstable_protocols", "server"] }
+wayland-protocols = { version = "0.20.5", features = ["unstable_protocols", "server"] }
 image = "0.17.0"
 error-chain = "0.11.0"
 lazy_static = "1.0.0"
@@ -35,11 +35,6 @@ lazy_static = "1.0.0"
 [build-dependencies]
 gl_generator = "0.9"
 
-[dev-dependencies]
-slog-term = "2.3"
-slog-async = "2.2"
-rand = "0.3"
-
 [features]
 default = ["backend_winit", "backend_drm", "backend_libinput", "backend_udev", "renderer_glium", "xwayland"]
 backend_winit = ["winit", "wayland-server/dlopen", "wayland-client/dlopen"]
diff --git a/src/backend/winit.rs b/src/backend/winit.rs
index ae0a658..fcd3089 100644
--- a/src/backend/winit.rs
+++ b/src/backend/winit.rs
@@ -862,7 +862,7 @@ impl InputBackend for WinitInputBackend {
                             trace!(logger, "Calling on_touch_cancel");
                             handler.on_touch_cancel(seat, WinitTouchCancelledEvent { time, id: id })
                         }
-                        (WindowEvent::Closed, _, _) => {
+                        (WindowEvent::CloseRequested, _, _) | (WindowEvent::Destroyed, _, _) => {
                             warn!(logger, "Window closed");
                             *closed_ptr = true;
                         }