Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-11-03 12:16:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix issues in ctrl/shift/alt states on win32

Browse Source
This commit is contained in:
Eduardo Bart
2012-04-04 19:35:56 -03:00
parent c4693fb7b9
commit 1410031e02
2 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/framework/platform/win32window.cpp
View File

@@ -446,14 +446,29 @@ Fw::Key WIN32Window::retranslateVirtualKey(WPARAM wParam, LPARAM lParam)
}
}
Fw::Key key = Fw::KeyUnknown;
if(m_keyMap.find(wParam) != m_keyMap.end())
return m_keyMap[wParam];
key = m_keyMap[wParam];
return Fw::KeyUnknown;
// actually ignore alt/ctrl/shift keys, they is states are already stored in m_inputEvent.keyboardModifiers
if(key == Fw::KeyAlt || key == Fw::KeyCtrl || key == Fw::KeyShift)
key = Fw::KeyUnknown;
return key;
}
#define IsKeyDown(a) (GetKeyState(a) & 0x80)
LRESULT WIN32Window::windowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
m_inputEvent.keyboardModifiers = 0;
if(IsKeyDown(VK_CONTROL))
m_inputEvent.keyboardModifiers |= Fw::KeyboardCtrlModifier;
if(IsKeyDown(VK_SHIFT))
m_inputEvent.keyboardModifiers |= Fw::KeyboardShiftModifier;
if(IsKeyDown(VK_MENU))
m_inputEvent.keyboardModifiers |= Fw::KeyboardAltModifier;
switch(uMsg)
{
case WM_SETCURSOR: {