fix issues in ctrl/shift/alt states on win32

src/framework/platform/platformwindow.cpp

@@ -45,18 +45,25 @@ void PlatformWindow::updateUnmaximizedCoords()
 
 void PlatformWindow::processKeyDown(Fw::Key keyCode)
 {
-    if(keyCode == Fw::KeyUnknown || m_keysState[keyCode])
+    if(keyCode == Fw::KeyUnknown)
         return;
 
-    m_keysState[keyCode] = true;
-    m_lastKeysPress[keyCode] = -1;
-
-    if(keyCode == Fw::KeyCtrl)
+    if(keyCode == Fw::KeyCtrl) {
         m_inputEvent.keyboardModifiers |= Fw::KeyboardCtrlModifier;
-    else if(keyCode == Fw::KeyAlt)
+        return;
+    } else if(keyCode == Fw::KeyAlt) {
         m_inputEvent.keyboardModifiers |= Fw::KeyboardAltModifier;
-    else if(keyCode == Fw::KeyShift)
+        return;
+    } else if(keyCode == Fw::KeyShift) {
         m_inputEvent.keyboardModifiers |= Fw::KeyboardShiftModifier;
+        return;
+    }
+
+    if(m_keysState[keyCode])
+        return;
+
+    m_keysState[keyCode] = true;
+    m_lastKeysPress[keyCode] = -1;
 
     m_inputEvent.reset(Fw::KeyDownInputEvent);
     m_inputEvent.type = Fw::KeyDownInputEvent;
@@ -75,17 +82,24 @@ void PlatformWindow::processKeyDown(Fw::Key keyCode)
 
 void PlatformWindow::processKeyUp(Fw::Key keyCode)
 {
-    if(keyCode == Fw::KeyUnknown || !m_keysState[keyCode])
+    if(keyCode == Fw::KeyUnknown)
         return;
 
-    m_keysState[keyCode] = false;
-
-    if(keyCode == Fw::KeyCtrl)
+    if(keyCode == Fw::KeyCtrl) {
         m_inputEvent.keyboardModifiers &= ~Fw::KeyboardCtrlModifier;
-    else if(keyCode == Fw::KeyAlt)
+        return;
+    } else if(keyCode == Fw::KeyAlt) {
         m_inputEvent.keyboardModifiers &= ~Fw::KeyboardAltModifier;
-    else if(keyCode == Fw::KeyShift)
+        return;
+    } else if(keyCode == Fw::KeyShift) {
         m_inputEvent.keyboardModifiers &= ~Fw::KeyboardShiftModifier;
+        return;
+    }
+
+    if(!m_keysState[keyCode])
+        return;
+
+    m_keysState[keyCode] = false;
 
     if(m_onInputEvent) {
         m_inputEvent.reset(Fw::KeyUpInputEvent);

src/framework/platform/win32window.cpp

@@ -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: {