From 744ec05f19154516211e55efc7ee37798c38c641 Mon Sep 17 00:00:00 2001
From: Kartoffelsaft <39356821+Kartoffelsaft@users.noreply.github.com>
Date: Mon, 28 Dec 2020 00:59:44 -0800
Subject: [PATCH] Add support for combining some modifier keys (#518)

---
 src/event/sys/unix/parse.rs | 38 +++++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/event/sys/unix/parse.rs b/src/event/sys/unix/parse.rs
index 90ec427..d3a7f2c 100644
--- a/src/event/sys/unix/parse.rs
+++ b/src/event/sys/unix/parse.rs
@@ -57,12 +57,16 @@ pub(crate) fn parse_event(buffer: &[u8], input_available: bool) -> Result<Option
                     }
                     b'[' => parse_csi(buffer),
                     b'\x1B' => Ok(Some(InternalEvent::Event(Event::Key(KeyCode::Esc.into())))),
-                    _ => parse_utf8_char(&buffer[1..]).map(|maybe_char| {
-                        maybe_char
-                            .map(KeyCode::Char)
-                            .map(|code| KeyEvent::new(code, KeyModifiers::ALT))
-                            .map(Event::Key)
-                            .map(InternalEvent::Event)
+                    _ => parse_event(&buffer[1..], input_available).map(|event_option| {
+                        event_option.map(|event| {
+                            if let InternalEvent::Event(Event::Key(key_event)) = event {
+                                let mut alt_key_event = key_event;
+                                alt_key_event.modifiers |= KeyModifiers::ALT;
+                                InternalEvent::Event(Event::Key(alt_key_event))
+                            } else {
+                                event
+                            }
+                        })
                     }),
                 }
             }
@@ -491,6 +495,28 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_alt_shift() {
+        assert_eq!(
+            parse_event(b"\x1BH", false).unwrap(),
+            Some(InternalEvent::Event(Event::Key(KeyEvent::new(
+                KeyCode::Char('H'),
+                KeyModifiers::ALT | KeyModifiers::SHIFT
+            )))),
+        );
+    }
+
+    #[test]
+    fn test_alt_ctrl() {
+        assert_eq!(
+            parse_event(b"\x1B\x14", false).unwrap(),
+            Some(InternalEvent::Event(Event::Key(KeyEvent::new(
+                KeyCode::Char('t'),
+                KeyModifiers::ALT | KeyModifiers::CONTROL
+            )))),
+        );
+    }
+
     #[test]
     fn test_parse_event_subsequent_calls() {
         // The main purpose of this test is to check if we're passing