alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 23:01:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Implement KeyboardEvent ModifiersState for win32

Browse source
This commit is contained in:
Erik Rigtorp 2017-01-19 19:45:02 -06:00
parent a2c6fb720c
commit 5d41067a05
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/platform/windows/callback.rs
View file

@ -8,7 +8,7 @@ use std::os::windows::ffi::OsStringExt;
use CursorState; use CursorState;
use WindowEvent as Event; use WindowEvent as Event;
use events::ModifersState; use events::ModifiersState;
use super::event; use super::event;
use super::WindowState; use super::WindowState;
@ -201,7 +201,7 @@ pub unsafe extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT,
user32::DefWindowProcW(window, msg, wparam, lparam) user32::DefWindowProcW(window, msg, wparam, lparam)
} else { } else {
let (scancode, vkey) = event::vkeycode_to_element(wparam, lparam); let (scancode, vkey) = event::vkeycode_to_element(wparam, lparam);
send_event(window, KeyboardInput(Pressed, scancode, vkey, ModifersState::default())); send_event(window, KeyboardInput(Pressed, scancode, vkey, event::get_key_mods()));
0 0
} }
}, },
@ -210,7 +210,7 @@ pub unsafe extern "system" fn callback(window: winapi::HWND, msg: winapi::UINT,
use events::WindowEvent::KeyboardInput; use events::WindowEvent::KeyboardInput;
use events::ElementState::Released; use events::ElementState::Released;
let (scancode, vkey) = event::vkeycode_to_element(wparam, lparam); let (scancode, vkey) = event::vkeycode_to_element(wparam, lparam);
send_event(window, KeyboardInput(Released, scancode, vkey, ModifersState::default())); send_event(window, KeyboardInput(Released, scancode, vkey, event::get_key_mods()));
0 0
}, },

20
src/platform/windows/event.rs
View file

@ -1,10 +1,30 @@
use events::VirtualKeyCode; use events::VirtualKeyCode;
use events::ModifiersState;
use winapi; use winapi;
use user32; use user32;
use ScanCode; use ScanCode;
const MAPVK_VSC_TO_VK_EX: u32 = 3; const MAPVK_VSC_TO_VK_EX: u32 = 3;
pub fn get_key_mods() -> ModifiersState {
let mut mods = ModifiersState::default();
unsafe {
if user32::GetKeyState(winapi::VK_SHIFT) & (1 << 15) == (1 << 15) {
mods.shift = true;
}
if user32::GetKeyState(winapi::VK_CONTROL) & (1 << 15) == (1 << 15) {
mods.ctrl = true;
}
if user32::GetKeyState(winapi::VK_MENU) & (1 << 15) == (1 << 15) {
mods.alt = true;
}
if (user32::GetKeyState(winapi::VK_LWIN) | user32::GetKeyState(winapi::VK_RWIN)) & (1 << 15) == (1 << 15) {
mods.logo = true;
}
}
mods
}
pub fn vkeycode_to_element(wparam: winapi::WPARAM, lparam: winapi::LPARAM) -> (ScanCode, Option<VirtualKeyCode>) { pub fn vkeycode_to_element(wparam: winapi::WPARAM, lparam: winapi::LPARAM) -> (ScanCode, Option<VirtualKeyCode>) {
let scancode = ((lparam >> 16) & 0xff) as u8; let scancode = ((lparam >> 16) & 0xff) as u8;
let extended = (lparam & 0x01000000) != 0; let extended = (lparam & 0x01000000) != 0;