Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 21:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[win32k]

Browse source 
- Do not treat the release of the windows key as a hotkey if it was used as a modifier for another hotkey that was pressed
- Now if I press win+R only the Run window opens

svn path=/trunk/; revision=57083
This commit is contained in:
Giannis Adamopoulos 2012-08-16 07:32:49 +00:00
parent bf76d98310
commit 1158d2cfed
1 changed files with 21 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
reactos/win32ss/user/ntuser/hotkey.c
View file

@ -25,6 +25,7 @@ HOT_KEY hkShiftF12 = {NULL, NULL, MOD_SHIFT, VK_F12, IDHK_SHIFTF12, &hkF12};
HOT_KEY hkWinKey = {NULL, NULL, MOD_WIN, 0, IDHK_WINKEY, &hkShiftF12};
PHOT_KEY gphkFirst = &hkWinKey;
BOOL bWinHotkeyActive = FALSE;
/* FUNCTIONS *****************************************************************/
@ -142,40 +143,6 @@ IsHotKey(UINT fsModifiers, WORD wVk)
return NULL;
}
/*
* SendSysCmdMsg
*
* Sends syscommand to specified window
*/
static
VOID NTAPI
SendSysCmdMsg(HWND hWnd, WPARAM Cmd, LPARAM lParam)
{
PWND pWnd;
MSG Msg;
LARGE_INTEGER LargeTickCount;
/* Get ptr to given window */
pWnd = UserGetWindowObject(hWnd);
if (!pWnd)
{
WARN("Invalid window!\n");
return;
}
/* Prepare WM_SYSCOMMAND message */
Msg.hwnd = hWnd;
Msg.message = WM_SYSCOMMAND;
Msg.wParam = Cmd;
Msg.lParam = lParam;
KeQueryTickCount(&LargeTickCount);
Msg.time = MsqCalculateMessageTime(&LargeTickCount);
Msg.pt = gpsi->ptCursor;
/* Post message to window */
MsqPostMessage(pWnd->head.pti->MessageQueue, &Msg, FALSE, QS_POSTMESSAGE);
}
/*
* co_UserProcessHotKeys
*
@ -206,23 +173,41 @@ co_UserProcessHotKeys(WORD wVk, BOOL bIsDown)
/* WIN and F12 keys are hardcoded here. See: http://ivanlef0u.fr/repo/windoz/VI20051005.html */
if (pHotKey == &hkWinKey)
SendSysCmdMsg(InputWindowStation->ShellWindow, SC_TASKLIST, 0);
{
if(bWinHotkeyActive == TRUE)
{
UserPostMessage(InputWindowStation->ShellWindow, WM_SYSCOMMAND, SC_TASKLIST, 0);
bWinHotkeyActive = FALSE;
}
}
else if (pHotKey == &hkF12 || pHotKey == &hkShiftF12)
{
//co_ActivateDebugger(); // FIXME
}
else if (pHotKey->id == IDHK_REACTOS && !pHotKey->pThread) // FIXME: Those hotkeys doesn't depend on RegisterHotKey
{
SendSysCmdMsg(pHotKey->hWnd, SC_HOTKEY, (LPARAM)pHotKey->hWnd);
UserPostMessage(pHotKey->hWnd, WM_SYSCOMMAND, SC_HOTKEY, (LPARAM)pHotKey->hWnd);
}
else
{
/* If a hotkey with the WIN modifier was activated, do not treat the release of the WIN key as a hotkey*/
if((pHotKey->fsModifiers & MOD_WIN) != 0)
bWinHotkeyActive = FALSE;
MsqPostHotKeyMessage(pHotKey->pThread,
pHotKey->hWnd,
(WPARAM)pHotKey->id,
MAKELPARAM((WORD)fModifiers, wVk));
}
}
else
{
if (pHotKey == &hkWinKey)
{
/* The user pressed the win key */
bWinHotkeyActive = TRUE;
}
}
return TRUE; /* Don't send any message */
}