Add Scancode Set 2 for extra JIS-109 keys

Author: thejpster

README.md

@@ -260,6 +260,12 @@ IBM PC or PC/XT.
 | Numpad0        | 0x52           | 0x70           |
 | NumpadPeriod   | 0x53           | 0x71           |
 | -              | --             | --             |
+| Oem9           | 0x7B           | 0x67           |
+| Oem10          | 0x79           | 0x64           |
+| Oem11          | 0x70           | 0x13           |
+| Oem12          | 0x73           | 0x51           |
+| Oem13          | 0x7D           | 0x6A           |
+| -              | --             | --             |
 | PrevTrack      | 0xE010         | 0xE015         |
 | NextTrack      | 0xE019         | 0xE04D         |
 | Mute           | 0xE020         | 0xE023         |

src/lib.rs

@@ -320,6 +320,18 @@ pub enum KeyCode {
     /// The Numppad Period/Delete Key
     NumpadPeriod,
 
+    // ========= JIS 109-key extra keys =========
+    /// Extra JIS key (0x7B)
+    Oem9,
+    /// Extra JIS key (0x79)
+    Oem10,
+    /// Extra JIS key (0x70)
+    Oem11,
+    /// Extra JIS symbol key (0x73)
+    Oem12,
+    /// Extra JIS symbol key (0x7D)
+    Oem13,
+
     // ========= Extra Keys =========
     /// Multi-media keys - Previous Track
     PrevTrack,
@@ -347,16 +359,6 @@ pub enum KeyCode {
     RControl2,
     /// Used as a 'hidden' Right Alt Key (Print Screen = RAlt2 + PrntScr)
     RAlt2,
-    /// Extra JIS key (0x7B)
-    Oem9,
-    /// Extra JIS key (0x79)
-    Oem10,
-    /// Extra JIS key (0x70)
-    Oem11,
-    /// Extra JIS symbol key (0x73)
-    Oem12,
-    /// Extra JIS symbol key (0x7D)
-    Oem13,
 }
 
 /// The new state for a key, as part of a key event.

src/scancodes/set2.rs

@@ -40,6 +40,7 @@ impl ScancodeSet2 {
             0x0E => Ok(KeyCode::Oem8),
             0x11 => Ok(KeyCode::LAlt),
             0x12 => Ok(KeyCode::LShift),
+            0x13 => Ok(KeyCode::Oem11),
             0x14 => Ok(KeyCode::LControl),
             0x15 => Ok(KeyCode::Q),
             0x16 => Ok(KeyCode::Key1),
@@ -83,6 +84,7 @@ impl ScancodeSet2 {
             0x4C => Ok(KeyCode::Oem1),
             0x4D => Ok(KeyCode::P),
             0x4E => Ok(KeyCode::OemMinus),
+            0x51 => Ok(KeyCode::Oem12),
             0x52 => Ok(KeyCode::Oem3),
             0x54 => Ok(KeyCode::Oem4),
             0x55 => Ok(KeyCode::OemPlus),
@@ -92,8 +94,11 @@ impl ScancodeSet2 {
             0x5B => Ok(KeyCode::Oem6),
             0x5D => Ok(KeyCode::Oem7),
             0x61 => Ok(KeyCode::Oem5),
+            0x64 => Ok(KeyCode::Oem10),
             0x66 => Ok(KeyCode::Backspace),
+            0x67 => Ok(KeyCode::Oem9),
             0x69 => Ok(KeyCode::Numpad1),
+            0x6A => Ok(KeyCode::Oem13),
             0x6B => Ok(KeyCode::Numpad4),
             0x6C => Ok(KeyCode::Numpad7),
             0x70 => Ok(KeyCode::Numpad0),
@@ -278,7 +283,7 @@ mod test {
         }
         codes.sort();
         println!("{:?}", codes);
-        assert_eq!(codes.len(), 89);
-        assert_eq!(errs.len(), 167);
+        assert_eq!(codes.len(), 94);
+        assert_eq!(errs.len(), 162);
     }
 }