Change hotkeys fixup

Author: justanotheranonymoususer

recaps.cpp

@@ -511,10 +511,12 @@ void SwitchAndConvert(void*)
 // A LowLevelHookProc implementation that captures the CapsLock key
 LRESULT CALLBACK LowLevelHookProc(int nCode, WPARAM wParam, LPARAM lParam)
 {
-	if(nCode < 0) return CallNextHookEx(g_hHook, nCode, wParam, lParam);
+	if(nCode < 0)
+		return CallNextHookEx(g_hHook, nCode, wParam, lParam);
 
 	KBDLLHOOKSTRUCT* data = (KBDLLHOOKSTRUCT*)lParam;
-	BOOL caps = data->vkCode == VK_CAPITAL && wParam == WM_KEYDOWN;
+	BOOL caps = data->vkCode == VK_CAPITAL &&
+		(wParam == WM_KEYDOWN || wParam == WM_SYSKEYDOWN);
 
 	// ignore injected keystrokes
 	if(caps && (data->flags & LLKHF_INJECTED) == 0)
@@ -535,6 +537,10 @@ LRESULT CALLBACK LowLevelHookProc(int nCode, WPARAM wParam, LPARAM lParam)
 			_beginthread(SwitchAndConvert, 0, NULL);
 			return 1; // prevent windows from handling the keystroke
 		}
+		else if(GetKeyState(VK_SHIFT) < 0)
+		{
+			// Skip Shift+CapsLock
+		}
 		else
 		{
 			// Handle CapsLock - only switch current layout