aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomaka <pierre.krieger1708@gmail.com>2015-08-26 16:43:50 +0200
committertomaka <pierre.krieger1708@gmail.com>2015-08-26 16:43:50 +0200
commit66317f5924ee72bae84ee15021a6f3cf780f8409 (patch)
treeb3e77d738aca3dfb125b5774521c84779306acda
parent7dd98efccb61578e4aec7fdd166e81878fe84839 (diff)
parent3427308c607f9156a958cedd8ba4f101ae293e4d (diff)
downloadglutin-66317f5924ee72bae84ee15021a6f3cf780f8409.tar.gz
glutin-66317f5924ee72bae84ee15021a6f3cf780f8409.zip
Merge pull request #560 from dylanede/master
Modified Windows key event handling to support modifier keys.
-rw-r--r--src/api/win32/callback.rs6
-rw-r--r--src/api/win32/event.rs27
2 files changed, 23 insertions, 10 deletions
diff --git a/src/api/win32/callback.rs b/src/api/win32/callback.rs
index 5667ca8..c6e7763 100644
--- a/src/api/win32/callback.rs
+++ b/src/api/win32/callback.rs
@@ -129,8 +129,7 @@ pub unsafe extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT,
winapi::WM_KEYDOWN => {
use events::Event::KeyboardInput;
use events::ElementState::Pressed;
- let scancode = ((lparam >> 16) & 0xff) as u8;
- let vkey = event::vkeycode_to_element(wparam);
+ let (scancode, vkey) = event::vkeycode_to_element(wparam, lparam);
send_event(window, KeyboardInput(Pressed, scancode, vkey));
0
},
@@ -138,8 +137,7 @@ pub unsafe extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT,
winapi::WM_KEYUP => {
use events::Event::KeyboardInput;
use events::ElementState::Released;
- let scancode = ((lparam >> 16) & 0xff) as u8;
- let vkey = event::vkeycode_to_element(wparam);
+ let (scancode, vkey) = event::vkeycode_to_element(wparam, lparam);
send_event(window, KeyboardInput(Released, scancode, vkey));
0
},
diff --git a/src/api/win32/event.rs b/src/api/win32/event.rs
index 6fbde81..ad4598a 100644
--- a/src/api/win32/event.rs
+++ b/src/api/win32/event.rs
@@ -1,8 +1,20 @@
use events::VirtualKeyCode;
use winapi;
+use user32;
+use ScanCode;
-pub fn vkeycode_to_element(code: winapi::WPARAM) -> Option<VirtualKeyCode> {
- match code as i32 {
+const MAPVK_VSC_TO_VK_EX: u32 = 3;
+
+pub fn vkeycode_to_element(wparam: winapi::WPARAM, lparam: winapi::LPARAM) -> (ScanCode, Option<VirtualKeyCode>) {
+ let scancode = ((lparam >> 16) & 0xff) as u8;
+ let extended = (lparam & 0x01000000) != 0;
+ let vk = match wparam as i32 {
+ winapi::VK_SHIFT => unsafe { user32::MapVirtualKeyA(scancode as u32, MAPVK_VSC_TO_VK_EX) as i32 },
+ winapi::VK_CONTROL => if extended { winapi::VK_RCONTROL } else { winapi::VK_LCONTROL },
+ winapi::VK_MENU => if extended { winapi::VK_RMENU } else { winapi::VK_LMENU },
+ other => other
+ };
+ (scancode, match vk {
//winapi::VK_LBUTTON => Some(VirtualKeyCode::Lbutton),
//winapi::VK_RBUTTON => Some(VirtualKeyCode::Rbutton),
//winapi::VK_CANCEL => Some(VirtualKeyCode::Cancel),
@@ -13,9 +25,12 @@ pub fn vkeycode_to_element(code: winapi::WPARAM) -> Option<VirtualKeyCode> {
winapi::VK_TAB => Some(VirtualKeyCode::Tab),
//winapi::VK_CLEAR => Some(VirtualKeyCode::Clear),
winapi::VK_RETURN => Some(VirtualKeyCode::Return),
- //winapi::VK_SHIFT => Some(VirtualKeyCode::Shift),
- //winapi::VK_CONTROL => Some(VirtualKeyCode::Control),
- //winapi::VK_MENU => Some(VirtualKeyCode::Menu),
+ winapi::VK_LSHIFT => Some(VirtualKeyCode::LShift),
+ winapi::VK_RSHIFT => Some(VirtualKeyCode::RShift),
+ winapi::VK_LCONTROL => Some(VirtualKeyCode::LControl),
+ winapi::VK_RCONTROL => Some(VirtualKeyCode::RControl),
+ winapi::VK_LMENU => Some(VirtualKeyCode::LMenu),
+ winapi::VK_RMENU => Some(VirtualKeyCode::RMenu),
winapi::VK_PAUSE => Some(VirtualKeyCode::Pause),
winapi::VK_CAPITAL => Some(VirtualKeyCode::Capital),
winapi::VK_KANA => Some(VirtualKeyCode::Kana),
@@ -177,5 +192,5 @@ pub fn vkeycode_to_element(code: winapi::WPARAM) -> Option<VirtualKeyCode> {
winapi::VK_PA1 => Some(VirtualKeyCode::Pa1),
winapi::VK_OEM_CLEAR => Some(VirtualKeyCode::Oem_clear),*/
_ => None
- }
+ })
}