bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Partial fix [#21395] Command key for keyboard mapping not functional

Browse Source 
Reported by Andy Braham.

Handle VK_LWIN and VK_RWIN (The infamous Windows keys). Note, these are not separate, so handled as one command key.
This commit is contained in:
Nathan Letwory 2010-09-15 23:19:21 +00:00
parent d08a40450e
commit d6baea457e
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/ghost/GHOST_Types.h
View File

@ -283,8 +283,8 @@ typedef enum {
GHOST_kKeyRightControl, GHOST_kKeyRightControl,
GHOST_kKeyLeftAlt, GHOST_kKeyLeftAlt,
GHOST_kKeyRightAlt, GHOST_kKeyRightAlt,
GHOST_kKeyCommand, // APPLE only! GHOST_kKeyCommand, // Command key on Apple, Windows key(s) on Windows
GHOST_kKeyGrLess , // German PC only! GHOST_kKeyGrLess , // German PC only!
GHOST_kKeyCapsLock, GHOST_kKeyCapsLock,
GHOST_kKeyNumLock, GHOST_kKeyNumLock,

35
intern/ghost/intern/GHOST_SystemWin32.cpp
View File

@ -287,17 +287,6 @@ GHOST_TSuccess GHOST_SystemWin32::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32
GHOST_TSuccess GHOST_SystemWin32::getModifierKeys(GHOST_ModifierKeys& keys) const GHOST_TSuccess GHOST_SystemWin32::getModifierKeys(GHOST_ModifierKeys& keys) const
{ {
/*
GetKeyState and GetAsyncKeyState only work with Win95, Win98, NT4,
Terminal Server and Windows 2000.
But on WinME it always returns zero. These two functions are simply
skipped by Millenium Edition!
Official explanation from Microsoft:
Intentionally disabled.
It didn't work all that well on some newer hardware, and worked less
well with the passage of time, so it was fully disabled in ME.
*/
if (m_separateLeftRight && m_separateLeftRightInitialized) { if (m_separateLeftRight && m_separateLeftRightInitialized) {
bool down = HIBYTE(::GetKeyState(VK_LSHIFT)) != 0; bool down = HIBYTE(::GetKeyState(VK_LSHIFT)) != 0;
keys.set(GHOST_kModifierKeyLeftShift, down); keys.set(GHOST_kModifierKeyLeftShift, down);
@ -311,6 +300,12 @@ GHOST_TSuccess GHOST_SystemWin32::getModifierKeys(GHOST_ModifierKeys& keys) cons
keys.set(GHOST_kModifierKeyLeftControl, down); keys.set(GHOST_kModifierKeyLeftControl, down);
down = HIBYTE(::GetKeyState(VK_RCONTROL)) != 0; down = HIBYTE(::GetKeyState(VK_RCONTROL)) != 0;
keys.set(GHOST_kModifierKeyRightControl, down); keys.set(GHOST_kModifierKeyRightControl, down);
bool lwindown = HIBYTE(::GetKeyState(VK_LWIN)) != 0;
bool rwindown = HIBYTE(::GetKeyState(VK_RWIN)) != 0;
if(lwindown || rwindown)
keys.set(GHOST_kModifierKeyCommand, true);
else
keys.set(GHOST_kModifierKeyCommand, false);
} }
else { else {
bool down = HIBYTE(::GetKeyState(VK_SHIFT)) != 0; bool down = HIBYTE(::GetKeyState(VK_SHIFT)) != 0;
@ -322,6 +317,12 @@ GHOST_TSuccess GHOST_SystemWin32::getModifierKeys(GHOST_ModifierKeys& keys) cons
down = HIBYTE(::GetKeyState(VK_CONTROL)) != 0; down = HIBYTE(::GetKeyState(VK_CONTROL)) != 0;
keys.set(GHOST_kModifierKeyLeftControl, down); keys.set(GHOST_kModifierKeyLeftControl, down);
keys.set(GHOST_kModifierKeyRightControl, down); keys.set(GHOST_kModifierKeyRightControl, down);
bool lwindown = HIBYTE(::GetKeyState(VK_LWIN)) != 0;
bool rwindown = HIBYTE(::GetKeyState(VK_RWIN)) != 0;
if(lwindown || rwindown)
keys.set(GHOST_kModifierKeyCommand, true);
else
keys.set(GHOST_kModifierKeyCommand, false);
} }
return GHOST_kSuccess; return GHOST_kSuccess;
} }
@ -376,8 +377,8 @@ GHOST_TSuccess GHOST_SystemWin32::init()
wc.cbClsExtra= 0; wc.cbClsExtra= 0;
wc.cbWndExtra= 0; wc.cbWndExtra= 0;
wc.hInstance= ::GetModuleHandle(0); wc.hInstance= ::GetModuleHandle(0);
wc.hIcon = ::LoadIcon(wc.hInstance, "APPICON"); wc.hIcon = ::LoadIcon(wc.hInstance, "APPICON");
if (!wc.hIcon) { if (!wc.hIcon) {
::LoadIcon(NULL, IDI_APPLICATION); ::LoadIcon(NULL, IDI_APPLICATION);
} }
@ -670,6 +671,8 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
case VK_SHIFT: case VK_SHIFT:
case VK_CONTROL: case VK_CONTROL:
case VK_MENU: case VK_MENU:
case VK_LWIN:
case VK_RWIN:
if (!system->m_separateLeftRightInitialized) { if (!system->m_separateLeftRightInitialized) {
// Check whether this system supports separate left and right keys // Check whether this system supports separate left and right keys
switch (wParam) { switch (wParam) {
@ -691,6 +694,10 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
(HIBYTE(::GetKeyState(VK_RMENU)) != 0) ? (HIBYTE(::GetKeyState(VK_RMENU)) != 0) ?
true : false; true : false;
break; break;
case VK_LWIN:
case VK_RWIN:
system->m_separateLeftRight = true;
break;
} }
system->m_separateLeftRightInitialized = true; system->m_separateLeftRightInitialized = true;
} }
@ -714,6 +721,8 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
case VK_SHIFT: case VK_SHIFT:
case VK_CONTROL: case VK_CONTROL:
case VK_MENU: case VK_MENU:
case VK_LWIN:
case VK_RWIN:
system->processModifierKeys(window); system->processModifierKeys(window);
// Bypass call to DefWindowProc // Bypass call to DefWindowProc
return 0; return 0;