From f083dae3282ce024fd9834e4fc371c6a44c35a17 Mon Sep 17 00:00:00 2001
From: Lucas Kent <rubickent@gmail.com>
Date: Thu, 14 Jun 2018 03:24:33 +1000
Subject: [PATCH] Windows creates Alt event instead of Menu event. (to match
 other platforms) (#551)

* Removed VirtualKeyCode::LMenu + VirtualKeyCode::RMenu, Windows now generates VirtualKeyCode::LAlt + VirtualKeyCode::RAlt instead.

* CHANGELOG nits
---
 CHANGELOG.md                           | 2 ++
 src/events.rs                          | 2 --
 src/platform/linux/wayland/keyboard.rs | 2 --
 src/platform/windows/event.rs          | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e69d45ae3b..b5dc45d9d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+- **Breaking:** Removed `VirtualKeyCode::LMenu` and `VirtualKeyCode::RMenu`; Windows now generates `VirtualKeyCode::LAlt` and `VirtualKeyCode::RAlt` instead.
+
 # Version 0.15.1 (2018-06-13)
 
 - On X11, the `Moved` event is no longer sent when the window is resized without changing position.
diff --git a/src/events.rs b/src/events.rs
index ec034d2e26..2436796b0b 100644
--- a/src/events.rs
+++ b/src/events.rs
@@ -383,7 +383,6 @@ pub enum VirtualKeyCode {
     LAlt,
     LBracket,
     LControl,
-    LMenu,
     LShift,
     LWin,
     Mail,
@@ -408,7 +407,6 @@ pub enum VirtualKeyCode {
     RAlt,
     RBracket,
     RControl,
-    RMenu,
     RShift,
     RWin,
     Semicolon,
diff --git a/src/platform/linux/wayland/keyboard.rs b/src/platform/linux/wayland/keyboard.rs
index 75a5b1c488..d0d28e8134 100644
--- a/src/platform/linux/wayland/keyboard.rs
+++ b/src/platform/linux/wayland/keyboard.rs
@@ -247,7 +247,6 @@ fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
         keysyms::XKB_KEY_Alt_L => Some(VirtualKeyCode::LAlt),
         // => Some(VirtualKeyCode::LBracket),
         keysyms::XKB_KEY_Control_L => Some(VirtualKeyCode::LControl),
-        // => Some(VirtualKeyCode::LMenu),
         keysyms::XKB_KEY_Shift_L => Some(VirtualKeyCode::LShift),
         // => Some(VirtualKeyCode::LWin),
         // => Some(VirtualKeyCode::Mail),
@@ -270,7 +269,6 @@ fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
         keysyms::XKB_KEY_Alt_R => Some(VirtualKeyCode::RAlt),
         // => Some(VirtualKeyCode::RBracket),
         keysyms::XKB_KEY_Control_R => Some(VirtualKeyCode::RControl),
-        // => Some(VirtualKeyCode::RMenu),
         keysyms::XKB_KEY_Shift_R => Some(VirtualKeyCode::RShift),
         // => Some(VirtualKeyCode::RWin),
         keysyms::XKB_KEY_semicolon => Some(VirtualKeyCode::Semicolon),
diff --git a/src/platform/windows/event.rs b/src/platform/windows/event.rs
index 3be475a0a8..7c35aa91a0 100644
--- a/src/platform/windows/event.rs
+++ b/src/platform/windows/event.rs
@@ -45,8 +45,8 @@ pub fn vkey_to_winit_vkey(vkey: c_int) -> Option<VirtualKeyCode> {
         winuser::VK_RSHIFT => Some(VirtualKeyCode::RShift),
         winuser::VK_LCONTROL => Some(VirtualKeyCode::LControl),
         winuser::VK_RCONTROL => Some(VirtualKeyCode::RControl),
-        winuser::VK_LMENU => Some(VirtualKeyCode::LMenu),
-        winuser::VK_RMENU => Some(VirtualKeyCode::RMenu),
+        winuser::VK_LMENU => Some(VirtualKeyCode::LAlt),
+        winuser::VK_RMENU => Some(VirtualKeyCode::RAlt),
         winuser::VK_PAUSE => Some(VirtualKeyCode::Pause),
         winuser::VK_CAPITAL => Some(VirtualKeyCode::Capital),
         winuser::VK_KANA => Some(VirtualKeyCode::Kana),