Ensure modifiers are passed through.

Closes #29.

Author: thejpster

src/layouts/azerty.rs

@@ -553,7 +553,7 @@ mod test {
         );
         assert_eq!(
             k.process_keyevent(KeyEvent::new(KeyCode::NumpadLock, KeyState::Down)),
-            None
+            Some(DecodedKey::RawKey(KeyCode::NumpadLock))
         );
         assert_eq!(
             k.process_keyevent(KeyEvent::new(KeyCode::NumpadLock, KeyState::Up)),

src/lib.rs

@@ -673,14 +673,14 @@ where
                 state: KeyState::Down,
             } => {
                 self.modifiers.lshift = true;
-                None
+                Some(DecodedKey::RawKey(KeyCode::LShift))
             }
             KeyEvent {
                 code: KeyCode::RShift,
                 state: KeyState::Down,
             } => {
                 self.modifiers.rshift = true;
-                None
+                Some(DecodedKey::RawKey(KeyCode::RShift))
             }
             KeyEvent {
                 code: KeyCode::LShift,
@@ -701,7 +701,7 @@ where
                 state: KeyState::Down,
             } => {
                 self.modifiers.capslock = !self.modifiers.capslock;
-                None
+                Some(DecodedKey::RawKey(KeyCode::CapsLock))
             }
             KeyEvent {
                 code: KeyCode::NumpadLock,
@@ -714,15 +714,15 @@ where
                 } else {
                     // It's a numlock toggle
                     self.modifiers.numlock = !self.modifiers.numlock;
-                    None
+                    Some(DecodedKey::RawKey(KeyCode::NumpadLock))
                 }
             }
             KeyEvent {
                 code: KeyCode::LControl,
                 state: KeyState::Down,
             } => {
                 self.modifiers.lctrl = true;
-                None
+                Some(DecodedKey::RawKey(KeyCode::LControl))
             }
             KeyEvent {
                 code: KeyCode::LControl,
@@ -736,7 +736,7 @@ where
                 state: KeyState::Down,
             } => {
                 self.modifiers.rctrl = true;
-                None
+                Some(DecodedKey::RawKey(KeyCode::RControl))
             }
             KeyEvent {
                 code: KeyCode::RControl,
@@ -750,7 +750,7 @@ where
                 state: KeyState::Down,
             } => {
                 self.modifiers.alt_gr = true;
-                None
+                Some(DecodedKey::RawKey(KeyCode::RAltGr))
             }
             KeyEvent {
                 code: KeyCode::RAltGr,
@@ -764,7 +764,7 @@ where
                 state: KeyState::Down,
             } => {
                 self.modifiers.rctrl2 = true;
-                None
+                Some(DecodedKey::RawKey(KeyCode::RControl2))
             }
             KeyEvent {
                 code: KeyCode::RControl2,
@@ -1019,7 +1019,10 @@ mod test {
         );
         let test_sequence = [
             // A with left shift held
-            (KeyEvent::new(KeyCode::LShift, KeyState::Down), None),
+            (
+                KeyEvent::new(KeyCode::LShift, KeyState::Down),
+                Some(DecodedKey::RawKey(KeyCode::LShift)),
+            ),
             (
                 KeyEvent::new(KeyCode::A, KeyState::Down),
                 Some(DecodedKey::Unicode('A')),
@@ -1033,15 +1036,21 @@ mod test {
             ),
             (KeyEvent::new(KeyCode::A, KeyState::Up), None),
             // A with right shift held
-            (KeyEvent::new(KeyCode::RShift, KeyState::Down), None),
+            (
+                KeyEvent::new(KeyCode::RShift, KeyState::Down),
+                Some(DecodedKey::RawKey(KeyCode::RShift)),
+            ),
             (
                 KeyEvent::new(KeyCode::A, KeyState::Down),
                 Some(DecodedKey::Unicode('A')),
             ),
             (KeyEvent::new(KeyCode::A, KeyState::Up), None),
             (KeyEvent::new(KeyCode::RShift, KeyState::Up), None),
             // Caps lock ON
-            (KeyEvent::new(KeyCode::CapsLock, KeyState::Down), None),
+            (
+                KeyEvent::new(KeyCode::CapsLock, KeyState::Down),
+                Some(DecodedKey::RawKey(KeyCode::CapsLock)),
+            ),
             (KeyEvent::new(KeyCode::CapsLock, KeyState::Up), None),
             // Letters are now caps
             (
@@ -1050,7 +1059,10 @@ mod test {
             ),
             (KeyEvent::new(KeyCode::X, KeyState::Up), None),
             // Unless you press shift
-            (KeyEvent::new(KeyCode::RShift, KeyState::Down), None),
+            (
+                KeyEvent::new(KeyCode::RShift, KeyState::Down),
+                Some(DecodedKey::RawKey(KeyCode::RShift)),
+            ),
             (
                 KeyEvent::new(KeyCode::A, KeyState::Down),
                 Some(DecodedKey::Unicode('a')),
@@ -1083,7 +1095,10 @@ mod test {
             ),
             (KeyEvent::new(KeyCode::A, KeyState::Up), None),
             // Left Control
-            (KeyEvent::new(KeyCode::LControl, KeyState::Down), None),
+            (
+                KeyEvent::new(KeyCode::LControl, KeyState::Down),
+                Some(DecodedKey::RawKey(KeyCode::LControl)),
+            ),
             (
                 KeyEvent::new(KeyCode::A, KeyState::Down),
                 Some(DecodedKey::Unicode('\u{0001}')),
@@ -1097,7 +1112,10 @@ mod test {
             ),
             (KeyEvent::new(KeyCode::A, KeyState::Up), None),
             // Right Control
-            (KeyEvent::new(KeyCode::RControl, KeyState::Down), None),
+            (
+                KeyEvent::new(KeyCode::RControl, KeyState::Down),
+                Some(DecodedKey::RawKey(KeyCode::RControl)),
+            ),
             (
                 KeyEvent::new(KeyCode::A, KeyState::Down),
                 Some(DecodedKey::Unicode('\u{0001}')),
@@ -1124,7 +1142,10 @@ mod test {
             ),
             (KeyEvent::new(KeyCode::Numpad0, KeyState::Up), None),
             // Numlock OFF
-            (KeyEvent::new(KeyCode::NumpadLock, KeyState::Down), None),
+            (
+                KeyEvent::new(KeyCode::NumpadLock, KeyState::Down),
+                Some(DecodedKey::RawKey(KeyCode::NumpadLock)),
+            ),
             (KeyEvent::new(KeyCode::NumpadLock, KeyState::Up), None),
             // Now KP_0 produces INSERT
             (
@@ -1358,7 +1379,7 @@ mod test {
                     code: KeyCode::RControl2,
                     state: KeyState::Down,
                 },
-                None,
+                Some(DecodedKey::RawKey(KeyCode::RControl2)),
             ),
             // Numlock
             (