ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-26 19:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[KBSWITCH] Follow-up of #8039

Browse Source 
JIRA issue: CORE-18546
This commit is contained in:
Katayama Hirofumi MZ
2025-06-04 15:13:15 +09:00
parent 7d8d8a6e52
commit 18290a7b6b
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/applications/kbswitch/kbsdll/kbsdll.c
+11 -4
View File
@@ -65,6 +65,12 @@ ShellHookProc(INT code, WPARAM wParam, LPARAM lParam)
return CallNextHookEx(hShellHook, code, wParam, lParam);
}
static inline BOOL
CheckVirtualKey(UINT vKey, UINT vKey1, UINT vKey2)
{
return vKey == vKey1 || vKey == vKey2;
}
static LRESULT CALLBACK
KeyboardLLHook(INT code, WPARAM wParam, LPARAM lParam)
{
@@ -80,10 +86,11 @@ KeyboardLLHook(INT code, WPARAM wParam, LPARAM lParam)
BOOL bAltPressed = GetAsyncKeyState(VK_MENU) < 0;
BOOL bCtrlPressed = GetAsyncKeyState(VK_CONTROL) < 0;
// Detect Alt+Shift and Ctrl+Shift
if ((pKbStruct->vkCode == VK_SHIFT && bAltPressed) ||
(pKbStruct->vkCode == VK_MENU && bShiftPressed) ||
(pKbStruct->vkCode == VK_SHIFT && bCtrlPressed) ||
(pKbStruct->vkCode == VK_CONTROL && bShiftPressed))
UINT vkCode = pKbStruct->vkCode;
if ((bAltPressed && CheckVirtualKey(vkCode, VK_LSHIFT, VK_RSHIFT)) ||
(bShiftPressed && CheckVirtualKey(vkCode, VK_LMENU, VK_RMENU)) ||
(bCtrlPressed && CheckVirtualKey(vkCode, VK_LSHIFT, VK_RSHIFT)) ||
(bShiftPressed && CheckVirtualKey(vkCode, VK_LCONTROL, VK_RCONTROL)))
{
PostMessageToMainWnd(WM_LANG_CHANGED, 0, 0);
}