[Win] Reliably check caps lock for every key press

tuyenvm · Aug 21, 2024 · d6bd4fa · d6bd4fa
1 parent db31c52
commit d6bd4fa
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Sources/OpenKey/win32/OpenKey/OpenKey/OpenKey.cpp b/Sources/OpenKey/win32/OpenKey/OpenKey/OpenKey.cpp
@@ -454,12 +454,16 @@ static void handleMacro() {
 }
 
 static bool SetModifierMask(const Uint16& vkCode) {
+	// For caps lock case, toggling the flag isn't enough. We need to check the actual state, which should be done before each key press.
+	// Example: the caps lock state can be changed without the key being pressed, or the key toggle is made with admin privilege, making the app not able to detect the change.
+	if (GetKeyState(VK_CAPITAL) == 1) _flag |= MASK_CAPITAL;
+	else _flag &= ~MASK_CAPITAL;
+
 	if (vkCode == VK_LSHIFT || vkCode == VK_RSHIFT) _flag |= MASK_SHIFT;
 	else if (vkCode == VK_LCONTROL || vkCode == VK_RCONTROL) _flag |= MASK_CONTROL;
 	else if (vkCode == VK_LMENU || vkCode == VK_RMENU) _flag |= MASK_ALT;
 	else if (vkCode == VK_LWIN || vkCode == VK_RWIN) _flag |= MASK_WIN;
 	else if (vkCode == VK_NUMLOCK) _flag |= MASK_NUMLOCK;
-	else if (vkCode == VK_CAPITAL) _flag ^= MASK_CAPITAL;
 	else if (vkCode == VK_SCROLL) _flag |= MASK_SCROLL;
 	else { 
 		_isFlagKey = false;