bump deps

8 files changed, 155 insertions, 178 deletions

diff --git a/Cargo.lock b/Cargo.lock
index ab699d4..9986bb3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -154,19 +154,18 @@ dependencies = [
 
 [[package]]
 name = "c2-chacha"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101"
+checksum = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb"
 dependencies = [
- "lazy_static",
  "ppv-lite86",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.46"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0213d356d3c4ea2c18c40b037c3be23cd639825c18f25ee670ac7813beeef99c"
+checksum = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8"
 
 [[package]]
 name = "cfg-if"
@@ -324,79 +323,22 @@ dependencies = [
 
 [[package]]
 name = "crossterm"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57512e27b69eccc2a3068f2bc962a24186e9e6e2904538aad5885d4877f8c187"
-dependencies = [
- "crossterm_input",
- "crossterm_screen",
- "crossterm_terminal",
- "crossterm_utils",
-]
-
-[[package]]
-name = "crossterm_cursor"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c0b733adeee9b605fec8b1087dc3a17c9849a16c561d5b36f459a2a55135f47"
-dependencies = [
- "crossterm_utils",
- "crossterm_winapi",
- "winapi 0.3.8",
-]
-
-[[package]]
-name = "crossterm_input"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa27cd549d7967837781e2682aae1adf04c0c4e523099291ad0ffe16ed705c9"
-dependencies = [
- "crossterm_screen",
- "crossterm_utils",
- "crossterm_winapi",
- "libc",
- "winapi 0.3.8",
-]
-
-[[package]]
-name = "crossterm_screen"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b434d668812d63706c161a6a98a95a0a6cac74c61e0c8eba2716b342f83617cb"
-dependencies = [
- "crossterm_utils",
- "crossterm_winapi",
- "winapi 0.3.8",
-]
-
-[[package]]
-name = "crossterm_terminal"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1882bfcef878a2ef66c36d988f8c2f1ec487a62c929a66e5f9ca75c03d0c4058"
-dependencies = [
- "crossterm_cursor",
- "crossterm_utils",
- "crossterm_winapi",
- "libc",
-]
-
-[[package]]
-name = "crossterm_utils"
-version = "0.3.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b46df236ff59f418afe87b2f19941e050ac205f1f1aa0bdba114b820201477"
+checksum = "682960e27b079207bd70677b520bfce2e6fb559bf50e1229b07a69c13a4e77a6"
 dependencies = [
  "crossterm_winapi",
+ "lazy_static",
  "libc",
+ "mio",
  "winapi 0.3.8",
 ]
 
 [[package]]
 name = "crossterm_winapi"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1521f4476da2d62ec558221bf3136d834cc08c585b1bcb2c072f89e47b27f138"
+checksum = "df25e92a352488d9b3e0215e4e99402945993026159f98b477047719f16a6530"
 dependencies = [
  "winapi 0.3.8",
 ]
@@ -422,7 +364,7 @@ dependencies = [
  "proc-macro2 1.0.6",
  "quote 1.0.2",
  "strsim 0.9.2",
- "syn 1.0.5",
+ "syn 1.0.7",
 ]
 
 [[package]]
@@ -433,7 +375,7 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
 dependencies = [
  "darling_core",
  "quote 1.0.2",
- "syn 1.0.5",
+ "syn 1.0.7",
 ]
 
 [[package]]
@@ -513,7 +455,7 @@ dependencies = [
  "darling",
  "proc-macro2 1.0.6",
  "quote 1.0.2",
- "syn 1.0.5",
+ "syn 1.0.7",
 ]
 
 [[package]]
@@ -567,7 +509,7 @@ checksum = "0bc225b78e0391e4b8683440bf2e63c2deeeb2ce5189eab46e2b68c6d3725d08"
 dependencies = [
  "proc-macro2 1.0.6",
  "quote 1.0.2",
- "syn 1.0.5",
+ "syn 1.0.7",
  "synstructure",
 ]
 
@@ -668,9 +610,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571"
+checksum = "e7db7ca94ed4cd01190ceee0d8a8052f08a247aa1b469a7f68c6a3b71afcf407"
 dependencies = [
  "cfg-if",
  "libc",
@@ -702,6 +644,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1de41fb8dba9714efd92241565cdff73f78508c95697dd56787d3cba27e2353"
 
 [[package]]
+name = "hermit-abi"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "307c3c9f937f38e3534b1d6447ecf090cafcc9744e4a6360e8b037b2cf5af120"
+dependencies = [
+ "libc",
+]
+
+[[package]]
 name = "http"
 version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -881,6 +832,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 
 [[package]]
+name = "maybe-uninit"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
+
+[[package]]
 name = "memchr"
 version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -888,9 +845,9 @@ checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
 
 [[package]]
 name = "memoffset"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f"
+checksum = "4a85c1a8c329f11437034d7313dca647c79096523533a1c79e86f1d0f657c7cc"
 dependencies = [
  "rustc_version",
 ]
@@ -913,9 +870,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "304f66c19be2afa56530fa7c39796192eef38618da8d19df725ad7c6d6b2aaae"
+checksum = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625"
 dependencies = [
  "adler32",
 ]
@@ -1023,10 +980,11 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.10.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273"
+checksum = "155394f924cdddf08149da25bfb932d226b4a593ca7468b08191ff6335941af5"
 dependencies = [
+ "hermit-abi",
  "libc",
 ]
 
@@ -1133,15 +1091,15 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.16"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72d5370d90f49f70bd033c3d75e87fc529fbfff9d6f7cccef07d6170079d91ea"
+checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
+checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b"
 
 [[package]]
 name = "proc-macro2"
@@ -1478,9 +1436,9 @@ checksum = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
 
 [[package]]
 name = "safemem"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b08423011dae9a5ca23f07cf57dac3857f5c885d352b76f6d95f4aea9434d0"
+checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
 
 [[package]]
 name = "schannel"
@@ -1500,9 +1458,9 @@ checksum = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
 
 [[package]]
 name = "security-framework"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eee63d0f4a9ec776eeb30e220f0bc1e092c3ad744b2a379e3993070364d3adc2"
+checksum = "301c862a6d0ee78f124c5e1710205965fc5c553100dcda6d98f13ef87a763f04"
 dependencies = [
  "core-foundation",
  "core-foundation-sys",
@@ -1512,9 +1470,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56"
+checksum = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895"
 dependencies = [
  "core-foundation-sys",
 ]
@@ -1536,22 +1494,22 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.101"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9796c9b7ba2ffe7a9ce53c2287dfc48080f4b2b362fcc245a259b3a7201119dd"
+checksum = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.101"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b133a43a1ecd55d4086bd5b4dc6c1751c68b1bfbeba7a5040442022c7e7c02e"
+checksum = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8"
 dependencies = [
  "proc-macro2 1.0.6",
  "quote 1.0.2",
- "syn 1.0.5",
+ "syn 1.0.7",
 ]
 
 [[package]]
@@ -1591,9 +1549,9 @@ dependencies = [
 
 [[package]]
 name = "signal-hook"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f61c4d59f3aaa9f61bba6450a9b80ba48362fd7d651689e7a10c453b1f6dc68"
+checksum = "cb543aecec4ba8b867f41284729ddfdb7e8fcd70ec3d7d37fca3007a4b53675f"
 dependencies = [
  "libc",
  "signal-hook-registry",
@@ -1617,9 +1575,12 @@ checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
 
 [[package]]
 name = "smallvec"
-version = "0.6.10"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7"
+checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6"
+dependencies = [
+ "maybe-uninit",
+]
 
 [[package]]
 name = "snafu"
@@ -1678,9 +1639,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.5"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66850e97125af79138385e9b88339cbcd037e3f28ceab8c5ad98e64f0f1f80bf"
+checksum = "0e7bedb3320d0f3035594b0b723c8a28d7d336a3eda3881db79e61d676fb644c"
 dependencies = [
  "proc-macro2 1.0.6",
  "quote 1.0.2",
@@ -1689,13 +1650,13 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f085a5855930c0441ca1288cf044ea4aecf4f43a91668abdb870b4ba546a203"
+checksum = "575be94ccb86e8da37efb894a87e2b660be299b41d8ef347f9d6d79fbe61b1ba"
 dependencies = [
  "proc-macro2 1.0.6",
  "quote 1.0.2",
- "syn 1.0.5",
+ "syn 1.0.7",
  "unicode-xid 0.2.0",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 75d4ea5..9633a9e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,7 @@ bytes = "0.4"
 clap = { version = "2", features = ["wrap_help"] }
 component-future = "0.1"
 config = { version = "0.9", features = ["toml"], default_features = false }
-crossterm = { version = "0.11", features = ["terminal", "input", "screen"], default_features = false }
+crossterm = { version = "0.13", features = ["terminal", "input", "screen"], default_features = false }
 directories = "2"
 env_logger = "0.7"
 futures = "0.1.29"
diff --git a/src/cmd/play.rs b/src/cmd/play.rs
index cd78f36..8c30bef 100644
--- a/src/cmd/play.rs
+++ b/src/cmd/play.rs
@@ -261,8 +261,8 @@ enum FileState {
 struct PlaySession {
     file: FileState,
     player: Player,
-    raw_screen: Option<crossterm::RawScreen>,
-    alternate_screen: Option<crossterm::AlternateScreen>,
+    raw_screen: Option<crossterm::screen::RawScreen>,
+    alternate_screen: Option<crossterm::screen::AlternateScreen>,
     key_reader: crate::key_reader::KeyReader,
     last_frame_time: std::time::Duration,
     last_frame_screen: Option<vt100::Screen>,
@@ -292,41 +292,41 @@ impl PlaySession {
         }
     }
 
-    fn keypress(&mut self, e: &crossterm::InputEvent) -> Result<bool> {
+    fn keypress(&mut self, e: &crossterm::input::InputEvent) -> Result<bool> {
         match e {
-            crossterm::InputEvent::Keyboard(crossterm::KeyEvent::Char(
-                'q',
-            )) => return Ok(true),
-            crossterm::InputEvent::Keyboard(crossterm::KeyEvent::Char(
-                ' ',
-            )) => {
+            crossterm::input::InputEvent::Keyboard(
+                crossterm::input::KeyEvent::Char('q'),
+            ) => return Ok(true),
+            crossterm::input::InputEvent::Keyboard(
+                crossterm::input::KeyEvent::Char(' '),
+            ) => {
                 self.player.toggle_pause();
                 self.redraw()?;
             }
-            crossterm::InputEvent::Keyboard(crossterm::KeyEvent::Char(
-                '+',
-            )) => {
+            crossterm::input::InputEvent::Keyboard(
+                crossterm::input::KeyEvent::Char('+'),
+            ) => {
                 self.player.playback_ratio_incr();
             }
-            crossterm::InputEvent::Keyboard(crossterm::KeyEvent::Char(
-                '-',
-            )) => {
+            crossterm::input::InputEvent::Keyboard(
+                crossterm::input::KeyEvent::Char('-'),
+            ) => {
                 self.player.playback_ratio_decr();
             }
-            crossterm::InputEvent::Keyboard(crossterm::KeyEvent::Char(
-                '=',
-            )) => {
+            crossterm::input::InputEvent::Keyboard(
+                crossterm::input::KeyEvent::Char('='),
+            ) => {
                 self.player.playback_ratio_reset();
             }
-            crossterm::InputEvent::Keyboard(crossterm::KeyEvent::Char(
-                '<',
-            )) => {
+            crossterm::input::InputEvent::Keyboard(
+                crossterm::input::KeyEvent::Char('<'),
+            ) => {
                 self.player.back();
                 self.redraw()?;
             }
-            crossterm::InputEvent::Keyboard(crossterm::KeyEvent::Char(
-                '>',
-            )) => {
+            crossterm::input::InputEvent::Keyboard(
+                crossterm::input::KeyEvent::Char('>'),
+            ) => {
                 self.player.forward();
                 self.redraw()?;
             }
@@ -519,13 +519,13 @@ impl PlaySession {
     fn poll_input(&mut self) -> component_future::Poll<(), Error> {
         if self.raw_screen.is_none() {
             self.raw_screen = Some(
-                crossterm::RawScreen::into_raw_mode()
+                crossterm::screen::RawScreen::into_raw_mode()
                     .context(crate::error::ToRawMode)?,
             );
         }
         if self.alternate_screen.is_none() {
             self.alternate_screen = Some(
-                crossterm::AlternateScreen::to_alternate(false)
+                crossterm::screen::AlternateScreen::to_alternate(false)
                     .context(crate::error::ToAlternateScreen)?,
             );
         }
diff --git a/src/cmd/record.rs b/src/cmd/record.rs
index d25df4e..ec0a7ce 100644
--- a/src/cmd/record.rs
+++ b/src/cmd/record.rs
@@ -75,7 +75,7 @@ struct RecordSession {
     sent_local: usize,
     needs_flush: bool,
     done: bool,
-    raw_screen: Option<crossterm::RawScreen>,
+    raw_screen: Option<crossterm::screen::RawScreen>,
 }
 
 impl RecordSession {
@@ -168,7 +168,7 @@ impl RecordSession {
             }) => {
                 if self.raw_screen.is_none() {
                     self.raw_screen = Some(
-                        crossterm::RawScreen::into_raw_mode()
+                        crossterm::screen::RawScreen::into_raw_mode()
                             .context(crate::error::ToRawMode)?,
                     );
                 }
diff --git a/src/cmd/stream.rs b/src/cmd/stream.rs
index b4f1a26..503a5ad 100644
--- a/src/cmd/stream.rs
+++ b/src/cmd/stream.rs
@@ -128,7 +128,7 @@ struct StreamSession<
     needs_flush: bool,
     connected: bool,
     done: bool,
-    raw_screen: Option<crossterm::RawScreen>,
+    raw_screen: Option<crossterm::screen::RawScreen>,
 }
 
 impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
@@ -246,7 +246,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
             }) => {
                 if self.raw_screen.is_none() {
                     self.raw_screen = Some(
-                        crossterm::RawScreen::into_raw_mode()
+                        crossterm::screen::RawScreen::into_raw_mode()
                             .context(crate::error::ToRawMode)?,
                     );
                 }
diff --git a/src/cmd/watch.rs b/src/cmd/watch.rs
index 0e4e197..01340ff 100644
--- a/src/cmd/watch.rs
+++ b/src/cmd/watch.rs
@@ -112,11 +112,11 @@ pub fn config(
 enum State<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static> {
     Temporary,
     LoggingIn {
-        alternate_screen: crossterm::AlternateScreen,
+        alternate_screen: crossterm::screen::AlternateScreen,
     },
     Choosing {
         sessions: crate::session_list::SessionList,
-        alternate_screen: crossterm::AlternateScreen,
+        alternate_screen: crossterm::screen::AlternateScreen,
     },
     Watching {
         client: Box<crate::client::Client<S>>,
@@ -197,7 +197,7 @@ struct WatchSession<
             > + Send,
     >,
     state: State<S>,
-    raw_screen: Option<crossterm::RawScreen>,
+    raw_screen: Option<crossterm::screen::RawScreen>,
     needs_redraw: bool,
 }
 
@@ -242,12 +242,12 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
 
     fn loading_keypress(
         &mut self,
-        e: &crossterm::InputEvent,
+        e: &crossterm::input::InputEvent,
     ) -> Result<bool> {
         match e {
-            crossterm::InputEvent::Keyboard(crossterm::KeyEvent::Char(
-                'q',
-            )) => {
+            crossterm::input::InputEvent::Keyboard(
+                crossterm::input::KeyEvent::Char('q'),
+            ) => {
                 return Ok(true);
             }
             _ => {}
@@ -284,7 +284,10 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
         Ok(())
     }
 
-    fn list_keypress(&mut self, e: &crossterm::InputEvent) -> Result<bool> {
+    fn list_keypress(
+        &mut self,
+        e: &crossterm::input::InputEvent,
+    ) -> Result<bool> {
         let sessions =
             if let State::Choosing { sessions, .. } = &mut self.state {
                 sessions
@@ -293,30 +296,32 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
             };
 
         match e {
-            crossterm::InputEvent::Keyboard(crossterm::KeyEvent::Char(
-                ' ',
-            )) => {
+            crossterm::input::InputEvent::Keyboard(
+                crossterm::input::KeyEvent::Char(' '),
+            ) => {
                 self.list_client
                     .send_message(crate::protocol::Message::list_sessions());
             }
-            crossterm::InputEvent::Keyboard(crossterm::KeyEvent::Char(
-                'q',
-            )) => {
+            crossterm::input::InputEvent::Keyboard(
+                crossterm::input::KeyEvent::Char('q'),
+            ) => {
                 return Ok(true);
             }
-            crossterm::InputEvent::Keyboard(crossterm::KeyEvent::Char(
-                '<',
-            )) => {
+            crossterm::input::InputEvent::Keyboard(
+                crossterm::input::KeyEvent::Char('<'),
+            ) => {
                 sessions.prev_page();
                 self.needs_redraw = true;
             }
-            crossterm::InputEvent::Keyboard(crossterm::KeyEvent::Char(
-                '>',
-            )) => {
+            crossterm::input::InputEvent::Keyboard(
+                crossterm::input::KeyEvent::Char('>'),
+            ) => {
                 sessions.next_page();
                 self.needs_redraw = true;
             }
-            crossterm::InputEvent::Keyboard(crossterm::KeyEvent::Char(c)) => {
+            crossterm::input::InputEvent::Keyboard(
+                crossterm::input::KeyEvent::Char(c),
+            ) => {
                 if let Some(id) = sessions.id_for(*c) {
                     let client = crate::client::Client::watch(
                         (self.make_connector)(),
@@ -325,9 +330,13 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
                         id,
                     );
                     self.state.watching(client);
-                    crossterm::terminal()
-                        .clear(crossterm::ClearType::All)
-                        .context(crate::error::WriteTerminalCrossterm)?;
+                    crossterm::execute!(
+                        std::io::stdout(),
+                        crossterm::terminal::Clear(
+                            crossterm::terminal::ClearType::All
+                        )
+                    )
+                    .context(crate::error::WriteTerminalCrossterm)?;
                 }
             }
             _ => {}
@@ -375,11 +384,14 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
         Ok(())
     }
 
-    fn watch_keypress(&mut self, e: &crossterm::InputEvent) -> Result<bool> {
+    fn watch_keypress(
+        &mut self,
+        e: &crossterm::input::InputEvent,
+    ) -> Result<bool> {
         match e {
-            crossterm::InputEvent::Keyboard(crossterm::KeyEvent::Char(
-                'q',
-            )) => {
+            crossterm::input::InputEvent::Keyboard(
+                crossterm::input::KeyEvent::Char('q'),
+            ) => {
                 self.reconnect(false)?;
             }
             _ => {}
@@ -410,9 +422,11 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
     }
 
     fn display_loading_screen(&self) -> Result<()> {
-        crossterm::terminal()
-            .clear(crossterm::ClearType::All)
-            .context(crate::error::WriteTerminalCrossterm)?;
+        crossterm::execute!(
+            std::io::stdout(),
+            crossterm::terminal::Clear(crossterm::terminal::ClearType::All)
+        )
+        .context(crate::error::WriteTerminalCrossterm)?;
 
         println!("loading...\r");
         if let Some(err) = self.list_client.last_error() {
@@ -478,9 +492,11 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
             - watch_width
             - 3;
 
-        crossterm::terminal()
-            .clear(crossterm::ClearType::All)
-            .context(crate::error::WriteTerminalCrossterm)?;
+        crossterm::execute!(
+            std::io::stdout(),
+            crossterm::terminal::Clear(crossterm::terminal::ClearType::All)
+        )
+        .context(crate::error::WriteTerminalCrossterm)?;
         println!("welcome to teleterm\r");
         println!("available sessions:\r");
         println!("\r");
@@ -595,7 +611,7 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
     fn poll_input(&mut self) -> component_future::Poll<(), Error> {
         if self.raw_screen.is_none() {
             self.raw_screen = Some(
-                crossterm::RawScreen::into_raw_mode()
+                crossterm::screen::RawScreen::into_raw_mode()
                     .context(crate::error::ToRawMode)?,
             );
         }
@@ -675,8 +691,8 @@ impl<S: tokio::io::AsyncRead + tokio::io::AsyncWrite + Send + 'static>
     }
 }
 
-fn new_alternate_screen() -> Result<crossterm::AlternateScreen> {
-    crossterm::AlternateScreen::to_alternate(false)
+fn new_alternate_screen() -> Result<crossterm::screen::AlternateScreen> {
+    crossterm::screen::AlternateScreen::to_alternate(false)
         .context(crate::error::ToAlternateScreen)
 }
 
diff --git a/src/key_reader.rs b/src/key_reader.rs
index 1e1251a..9a35e2d 100644
--- a/src/key_reader.rs
+++ b/src/key_reader.rs
@@ -1,8 +1,9 @@
 use crate::prelude::*;
 
 pub struct KeyReader {
-    events:
-        Option<tokio::sync::mpsc::UnboundedReceiver<crossterm::InputEvent>>,
+    events: Option<
+        tokio::sync::mpsc::UnboundedReceiver<crossterm::input::InputEvent>,
+    >,
     quit: Option<tokio::sync::oneshot::Sender<()>>,
 }
 
@@ -16,13 +17,13 @@ impl KeyReader {
 }
 
 impl futures::stream::Stream for KeyReader {
-    type Item = crossterm::InputEvent;
+    type Item = crossterm::input::InputEvent;
     type Error = Error;
 
     fn poll(&mut self) -> futures::Poll<Option<Self::Item>, Self::Error> {
         if self.events.is_none() {
             let task = futures::task::current();
-            let reader = crossterm::input().read_sync();
+            let reader = crossterm::input::input().read_sync();
             let (events_tx, events_rx) =
                 tokio::sync::mpsc::unbounded_channel();
             let mut events_tx = events_tx.wait();
diff --git a/src/term.rs b/src/term.rs
index c8e795f..13a0a73 100644
--- a/src/term.rs
+++ b/src/term.rs
@@ -14,8 +14,7 @@ pub struct Size {
 
 impl Size {
     pub fn get() -> Result<Self> {
-        let (cols, rows) = crossterm::terminal()
-            .size()
+        let (cols, rows) = crossterm::terminal::size()
             .context(crate::error::GetTerminalSize)?;
         Ok(Self { rows, cols })
     }