Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 00:27:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KBSWITCH] Refactor WndProc

Browse source
This commit is contained in:
Katayama Hirofumi MZ 2022-08-24 11:57:29 +09:00
parent 7151c30079
commit eca08cfe98
1 changed files with 29 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

54
base/applications/kbswitch/kbswitch.c
View file

@ -437,6 +437,8 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
static HMENU s_hMenu; static HMENU s_hMenu;
static HMENU s_hRightPopupMenu; static HMENU s_hRightPopupMenu;
static UINT s_uTaskbarRestart; static UINT s_uTaskbarRestart;
POINT pt;
HMENU hLeftPopupMenu;
switch (Message) switch (Message)
{ {
@ -452,7 +454,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated")); s_uTaskbarRestart = RegisterWindowMessage(TEXT("TaskbarCreated"));
DoRegisterAltShiftHotKeys(hwnd); DoRegisterAltShiftHotKeys(hwnd);
return 0; break;
} }
case WM_LANG_CHANGED: case WM_LANG_CHANGED:
@ -473,7 +475,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
ULONG uNextNum = GetNextLayout(); ULONG uNextNum = GetNextLayout();
if (ulCurrentLayoutNum != uNextNum) if (ulCurrentLayoutNum != uNextNum)
ActivateLayout(hwnd, uNextNum); ActivateLayout(hwnd, uNextNum);
return 0; break;
} }
case WM_WINDOW_ACTIVATE: case WM_WINDOW_ACTIVATE:
@ -482,19 +484,17 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
} }
case WM_NOTIFYICONMSG: case WM_NOTIFYICONMSG:
{
switch (lParam) switch (lParam)
{ {
case WM_RBUTTONUP: case WM_RBUTTONUP:
case WM_LBUTTONUP: case WM_LBUTTONUP:
{ {
POINT pt;
GetCursorPos(&pt); GetCursorPos(&pt);
SetForegroundWindow(hwnd); SetForegroundWindow(hwnd);
if (lParam == WM_LBUTTONUP) if (lParam == WM_LBUTTONUP)
{ {
HMENU hLeftPopupMenu;
/* Rebuild the left popup menu on every click to take care of keyboard layout changes */ /* Rebuild the left popup menu on every click to take care of keyboard layout changes */
hLeftPopupMenu = BuildLeftPopupMenu(); hLeftPopupMenu = BuildLeftPopupMenu();
TrackPopupMenu(hLeftPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL); TrackPopupMenu(hLeftPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL);
@ -506,38 +506,39 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
} }
PostMessage(hwnd, WM_NULL, 0, 0); PostMessage(hwnd, WM_NULL, 0, 0);
break;
return 0;
} }
} }
break; break;
}
case WM_COMMAND: case WM_COMMAND:
switch (LOWORD(wParam)) switch (LOWORD(wParam))
{ {
case ID_EXIT: case ID_EXIT:
{
SendMessage(hwnd, WM_CLOSE, 0, 0); SendMessage(hwnd, WM_CLOSE, 0, 0);
return 0; break;
}
case ID_PREFERENCES: case ID_PREFERENCES:
{ {
SHELLEXECUTEINFO shInputDll = {0}; SHELLEXECUTEINFO shInputDll = { sizeof(shInputDll) };
shInputDll.cbSize = sizeof(shInputDll);
shInputDll.hwnd = hwnd; shInputDll.hwnd = hwnd;
shInputDll.lpVerb = _T("open"); shInputDll.lpVerb = _T("open");
shInputDll.lpFile = _T("rundll32.exe"); shInputDll.lpFile = _T("rundll32.exe");
shInputDll.lpParameters = _T("shell32.dll,Control_RunDLL input.dll"); shInputDll.lpParameters = _T("shell32.dll,Control_RunDLL input.dll");
if (!ShellExecuteEx(&shInputDll)) if (!ShellExecuteEx(&shInputDll))
MessageBox(hwnd, _T("Can't start input.dll"), NULL, MB_OK | MB_ICONERROR); MessageBox(hwnd, _T("Can't start input.dll"), NULL, MB_OK | MB_ICONERROR);
return 0; break;
} }
default: default:
{
ActivateLayout(hwnd, LOWORD(wParam)); ActivateLayout(hwnd, LOWORD(wParam));
return 0; break;
}
} }
break; break;
@ -561,23 +562,26 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
DestroyMenu(s_hMenu); DestroyMenu(s_hMenu);
DelTrayIcon(hwnd); DelTrayIcon(hwnd);
PostQuitMessage(0); PostQuitMessage(0);
break;
return 0;
} }
default: default:
if(Message == s_uTaskbarRestart) {
if (Message == s_uTaskbarRestart)
{
AddTrayIcon(hwnd); AddTrayIcon(hwnd);
break; break;
}
else if (Message == ShellHookMessage && wParam == HSHELL_LANGUAGE)
{
PostMessage(hwnd, WM_LANG_CHANGED, wParam, lParam);
break;
}
return DefWindowProc(hwnd, Message, wParam, lParam);
}
} }
if (Message == ShellHookMessage && wParam == HSHELL_LANGUAGE) return 0;
{
PostMessage(hwnd, WM_LANG_CHANGED, wParam, lParam);
return 0;
}
return DefWindowProc(hwnd, Message, wParam, lParam);
} }
INT WINAPI INT WINAPI