From 542fede5a52dcec100f14895d9db39577fe999cf Mon Sep 17 00:00:00 2001
From: Wez Furlong <wez@wezfurlong.org>
Date: Sat, 6 Jun 2020 11:58:38 -0700
Subject: [PATCH] window: update smithay-client-toolkit

---
 Cargo.lock                      | 69 +++++++++++++++------------------
 window/Cargo.toml               |  2 +-
 window/src/os/wayland/window.rs |  4 +-
 3 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3ff672579..474009ec7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,11 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+[[package]]
+name = "ab_glyph_rasterizer"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b7e4e8cf778db814365e46839949ca74df4efb10e87ba4913e6ec5967ef0285"
+
 [[package]]
 name = "addr2line"
 version = "0.12.1"
@@ -68,13 +74,13 @@ dependencies = [
 
 [[package]]
 name = "andrew"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7f09f89872c2b6b29e319377b1fbe91c6f5947df19a25596e121cf19a7b35e"
+checksum = "5e1ea80a5089cac999ffd4a91888154076a961d27387b0f7a6cd2d4dddb636b9"
 dependencies = [
  "bitflags 1.2.1",
- "line_drawing 0.7.0",
- "rusttype 0.7.9",
+ "line_drawing",
+ "rusttype",
  "walkdir",
  "xdg",
  "xml-rs 0.8.3",
@@ -1545,15 +1551,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "line_drawing"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc7ad3d82c845bdb5dde34ffdcc7a5fb4d2996e1e1ee0f19c33bc80e15196b9"
-dependencies = [
- "num-traits 0.2.11",
-]
-
 [[package]]
 name = "line_drawing"
 version = "0.8.0"
@@ -2114,6 +2111,15 @@ dependencies = [
  "winapi 0.3.8",
 ]
 
+[[package]]
+name = "owned_ttf_parser"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f923fb806c46266c02ab4a5b239735c144bdeda724a50ed058e5226f594cde3"
+dependencies = [
+ "ttf-parser",
+]
+
 [[package]]
 name = "palette"
 version = "0.5.0"
@@ -2735,22 +2741,12 @@ dependencies = [
 
 [[package]]
 name = "rusttype"
-version = "0.7.9"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "310942406a39981bed7e12b09182a221a29e0990f3e7e0c971f131922ed135d5"
+checksum = "dc7c727aded0be18c5b80c1640eae0ac8e396abf6fa8477d96cb37d18ee5ec59"
 dependencies = [
- "rusttype 0.8.3",
-]
-
-[[package]]
-name = "rusttype"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f61411055101f7b60ecf1041d87fb74205fb20b0c7a723f07ef39174cf6b4c0"
-dependencies = [
- "approx",
- "ordered-float",
- "stb_truetype",
+ "ab_glyph_rasterizer",
+ "owned_ttf_parser",
 ]
 
 [[package]]
@@ -2993,7 +2989,7 @@ checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4"
 [[package]]
 name = "smithay-client-toolkit"
 version = "0.9.1"
-source = "git+https://github.com/wez/client-toolkit.git?branch=title_tunc#55172a091b43f8b649a56d65345a9834f2bcd02c"
+source = "git+https://github.com/wez/client-toolkit.git?branch=title_trunc#9b80c17400aa245f2bceadd496f57c2bb8908e95"
 dependencies = [
  "andrew",
  "bitflags 1.2.1",
@@ -3060,15 +3056,6 @@ dependencies = [
  "parking_lot 0.10.2",
 ]
 
-[[package]]
-name = "stb_truetype"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f77b6b07e862c66a9f3e62a07588fee67cd90a9135a2b942409f195507b4fb51"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "strsim"
 version = "0.8.0"
@@ -3406,6 +3393,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "ttf-parser"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52fbe7769f5af5d7d25aea74b9443b64e544a5ffb4d2b2968295ddea934f1a06"
+
 [[package]]
 name = "uds_windows"
 version = "0.1.4"
@@ -3936,7 +3929,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "libloading 0.5.2",
- "line_drawing 0.8.0",
+ "line_drawing",
  "log",
  "memmap",
  "metrics",
diff --git a/window/Cargo.toml b/window/Cargo.toml
index e3f4f7e09..d6fdc7166 100644
--- a/window/Cargo.toml
+++ b/window/Cargo.toml
@@ -58,7 +58,7 @@ xkbcommon = { version = "0.5", features = ["x11", "wayland"], git="https://githu
 mio = "0.6"
 mio-extras = "2.0"
 libc = "0.2"
-smithay-client-toolkit = {version = "0.9", optional = true, features=["calloop"], git="https://github.com/wez/client-toolkit.git", branch="title_tunc"}
+smithay-client-toolkit = {version = "0.9", optional = true, features=["calloop"], git="https://github.com/wez/client-toolkit.git", branch="title_trunc"}
 memmap = {version="0.7", optional=true}
 wayland-client = {version="0.26", optional=true}
 wayland-egl = {version="0.26", optional=true}
diff --git a/window/src/os/wayland/window.rs b/window/src/os/wayland/window.rs
index 77a08a596..88612f964 100644
--- a/window/src/os/wayland/window.rs
+++ b/window/src/os/wayland/window.rs
@@ -197,7 +197,7 @@ impl WaylandWindow {
             .environment
             .borrow()
             .create_window::<ConceptFrame, _>(
-                surface.clone(),
+                surface.clone().detach(),
                 (
                     dimensions.pixel_width as u32,
                     dimensions.pixel_height as u32,
@@ -235,7 +235,7 @@ impl WaylandWindow {
             copy_and_paste,
             window_id,
             callbacks,
-            surface,
+            surface: surface.detach(),
             window: Some(window),
             pool,
             dimensions,