Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Rebuild the left popup menu containing the keyboard layouts on every click to take care of keyboard layout changes.

Browse source 
I know this is probably not the best way for doing the job, but I don't know of any other method to achieve the same.
- Change the right popup menu to only show the "Options" and "Exit" menu items (like ctfmon does)
- Add the missing 'return 0;' statements, when a message was handled

See issue #3372 for more details.

svn path=/trunk/; revision=34053
This commit is contained in:
Colin Finck 2008-06-22 21:59:27 +00:00
parent f721678f57
commit 5882bc1cea
11 changed files with 30 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
reactos/base/applications/kbswitch/kbswitch.c
View file

@ -210,7 +210,7 @@ GetLayoutName(LPTSTR szLayoutNum, LPTSTR szName)
TCHAR szBuf[MAX_PATH], szDispName[MAX_PATH], szIndex[MAX_PATH], szPath[MAX_PATH];
TCHAR szLCID[CCH_LAYOUT_ID + 1];
HANDLE hLib;
int i, j, k;
UINT i, j, k;
if(!GetLayoutID(szLayoutNum, szLCID))
return FALSE;
@ -329,52 +329,6 @@ BuildLeftPopupMenu()
return hMenu;
}
static HMENU
BuildRightPopupMenu()
{
HMENU hMenu;
HMENU hMenuTemplate;
DWORD dwIndex;
LPTSTR pszMenuItem;
MENUITEMINFO mii;
// Add the keyboard layouts to the popup menu
hMenu = BuildLeftPopupMenu();
// Add the menu items from the popup menu template
hMenuTemplate = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP)), 0);
dwIndex = 0;
mii.cbSize = sizeof(mii);
mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_ID;
mii.dwTypeData = NULL;
while(GetMenuItemInfo(hMenuTemplate, dwIndex, TRUE, &mii))
{
if(mii.cch > 0)
{
mii.cch++;
pszMenuItem = (LPTSTR)HeapAlloc(hProcessHeap, 0, mii.cch * sizeof(TCHAR));
mii.dwTypeData = pszMenuItem;
GetMenuItemInfo(hMenuTemplate, dwIndex, TRUE, &mii);
AppendMenu(hMenu, mii.fType, mii.wID, mii.dwTypeData);
HeapFree(hProcessHeap, 0, pszMenuItem);
mii.dwTypeData = NULL;
}
else
{
AppendMenu(hMenu, mii.fType, 0, NULL);
}
dwIndex++;
}
return hMenu;
}
BOOL
SetHooks()
{
@ -430,7 +384,7 @@ GetNextLayout()
LRESULT CALLBACK
WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
{
static HMENU hLeftPopupMenu, hRightPopupMenu;
static HMENU hRightPopupMenu;
static TCHAR szLCID[MAX_PATH], szLangName[MAX_PATH];
switch (Message)
@ -439,32 +393,35 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
{
SetHooks();
AddTrayIcon(hwnd);
hLeftPopupMenu = BuildLeftPopupMenu(hwnd);
hRightPopupMenu = BuildRightPopupMenu(hwnd);
hRightPopupMenu = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(IDR_POPUP)), 0);
return 0;
}
break;
case WM_LANG_CHANGED:
{
GetLayoutIDByHkl((HKL)lParam, szLCID);
GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, sizeof(szLangName) / sizeof(TCHAR));
UpdateTrayIcon(hwnd, szLCID, szLangName);
return 0;
}
break;
case WM_LOAD_LAYOUT:
{
ActivateLayout(hwnd, GetNextLayout());
return 0;
}
break;
case WM_WINDOW_ACTIVATE:
{
GetLayoutIDByHkl(GetKeyboardLayout(GetWindowThreadProcessId((HWND)wParam, 0)), szLCID);
GetLocaleInfo((LANGID)_tcstoul(szLCID, NULL, 16), LOCALE_SLANGUAGE, (LPTSTR)szLangName, sizeof(szLangName) / sizeof(TCHAR));
UpdateTrayIcon(hwnd, szLCID, szLangName);
return 0;
}
break;
case WM_NOTIFYICONMSG:
switch (lParam)
@ -476,13 +433,25 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
GetCursorPos(&pt);
SetForegroundWindow(hwnd);
if (lParam == WM_LBUTTONDOWN)
{
HMENU hLeftPopupMenu;
/* Rebuild the left popup menu on every click to take care of keyboard layout changes */
hLeftPopupMenu = BuildLeftPopupMenu();
TrackPopupMenu(hLeftPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL);
else
TrackPopupMenu(hRightPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL);
PostMessage(hwnd, WM_NULL, 0, 0);
DestroyMenu(hLeftPopupMenu);
}
else
{
TrackPopupMenu(hRightPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL);
}
PostMessage(hwnd, WM_NULL, 0, 0);
return 0;
}
break;
}
break;
@ -491,7 +460,7 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
{
case ID_EXIT:
SendMessage(hwnd, WM_CLOSE, 0, 0);
break;
return 0;
case ID_PREFERENCES:
{
@ -506,11 +475,10 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
if (!ShellExecuteEx(&shInputDll))
MessageBox(hwnd, _T("Can't start input.dll"), NULL, MB_OK | MB_ICONERROR);
}
break;
default:
ActivateLayout(hwnd, LOWORD(wParam));
break;
return 0;
}
break;
@ -526,12 +494,12 @@ WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
case WM_DESTROY:
{
DeleteHooks();
DestroyMenu(hLeftPopupMenu);
DestroyMenu(hRightPopupMenu);
DelTrayIcon(hwnd);
PostQuitMessage(0);
return 0;
}
break;
}
return DefWindowProc(hwnd, Message, wParam, lParam);

1
reactos/base/applications/kbswitch/lang/bg-BG.rc
View file

@ -4,7 +4,6 @@ IDR_POPUP MENU
BEGIN
POPUP "popup"
BEGIN
MENUITEM SEPARATOR
MENUITEM "&Ïðåäïî÷èòàíèÿ...", ID_PREFERENCES
MENUITEM SEPARATOR
MENUITEM "Èç&õîä", ID_EXIT

1
reactos/base/applications/kbswitch/lang/cs-CZ.rc
View file

@ -9,7 +9,6 @@ IDR_POPUP MENU
BEGIN
POPUP "popup"
BEGIN
MENUITEM SEPARATOR
MENUITEM "&Pøedvolby...", ID_PREFERENCES
MENUITEM SEPARATOR
MENUITEM "&Ukonèit", ID_EXIT

1
reactos/base/applications/kbswitch/lang/de-DE.rc
View file

@ -4,7 +4,6 @@ IDR_POPUP MENU
BEGIN
POPUP "popup"
BEGIN
MENUITEM SEPARATOR
MENUITEM "&Einstellungen...", ID_PREFERENCES
MENUITEM SEPARATOR
MENUITEM "&Beenden", ID_EXIT

1
reactos/base/applications/kbswitch/lang/en-US.rc
View file

@ -4,7 +4,6 @@ IDR_POPUP MENU
BEGIN
POPUP "popup"
BEGIN
MENUITEM SEPARATOR
MENUITEM "&Preferences...", ID_PREFERENCES
MENUITEM SEPARATOR
MENUITEM "&Exit", ID_EXIT

1
reactos/base/applications/kbswitch/lang/es-ES.rc
View file

@ -4,7 +4,6 @@ IDR_POPUP MENU
BEGIN
POPUP "popup"
BEGIN
MENUITEM SEPARATOR
MENUITEM "&Preferencias...", ID_PREFERENCES
MENUITEM SEPARATOR
MENUITEM "&Salir", ID_EXIT

1
reactos/base/applications/kbswitch/lang/fr-FR.rc
View file

@ -4,7 +4,6 @@ IDR_POPUP MENU
BEGIN
POPUP "popup"
BEGIN
MENUITEM SEPARATOR
MENUITEM "&Préférences...", ID_PREFERENCES
MENUITEM SEPARATOR
MENUITEM "Quitt&er", ID_EXIT

1
reactos/base/applications/kbswitch/lang/lt-LT.rc
View file

@ -6,7 +6,6 @@ IDR_POPUP MENU
BEGIN
POPUP "popup"
BEGIN
MENUITEM SEPARATOR
MENUITEM "&Nuostatos...", ID_PREFERENCES
MENUITEM SEPARATOR
MENUITEM "&Baigti", ID_EXIT

1
reactos/base/applications/kbswitch/lang/pl-PL.rc
View file

@ -11,7 +11,6 @@ IDR_POPUP MENU
BEGIN
POPUP "popup"
BEGIN
MENUITEM SEPARATOR
MENUITEM "&Ustawienia...", ID_PREFERENCES
MENUITEM SEPARATOR
MENUITEM "&Wyjœcie", ID_EXIT

1
reactos/base/applications/kbswitch/lang/ru-RU.rc
View file

@ -4,7 +4,6 @@ IDR_POPUP MENU
BEGIN
POPUP "popup"
BEGIN
MENUITEM SEPARATOR
MENUITEM "&Ïàðàìåòðû...", ID_PREFERENCES
MENUITEM SEPARATOR
MENUITEM "&Âûõîä", ID_EXIT

1
reactos/base/applications/kbswitch/lang/sk-SK.rc
View file

@ -8,7 +8,6 @@ IDR_POPUP MENU
BEGIN
POPUP "popup"
BEGIN
MENUITEM SEPARATOR
MENUITEM "&Nastavenia...", ID_PREFERENCES
MENUITEM SEPARATOR
MENUITEM "&Zavrie<69>", ID_EXIT