mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-10 09:58:01 +00:00
AltGr should now work again even when Compose key disabled
[originally from svn r838]
This commit is contained in:
parent
93004c40ad
commit
a24c502f4f
8
window.c
8
window.c
@ -1911,11 +1911,14 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
if (wParam == VK_MENU && (HIWORD(lParam)&KF_EXTENDED)) {
|
||||||
|
keystate[VK_RMENU] = keystate[VK_MENU];
|
||||||
|
}
|
||||||
|
|
||||||
/* Note if AltGr was pressed and if it was used as a compose key */
|
/* Note if AltGr was pressed and if it was used as a compose key */
|
||||||
if (cfg.compose_key) {
|
if (cfg.compose_key) {
|
||||||
if (wParam == VK_MENU && (HIWORD(lParam)&KF_EXTENDED))
|
if (wParam == VK_MENU && (HIWORD(lParam)&KF_EXTENDED))
|
||||||
{
|
{
|
||||||
keystate[VK_RMENU] = keystate[VK_MENU];
|
|
||||||
if (!compose_state) compose_key = wParam;
|
if (!compose_state) compose_key = wParam;
|
||||||
}
|
}
|
||||||
if (wParam == VK_APPS && !compose_state)
|
if (wParam == VK_APPS && !compose_state)
|
||||||
@ -1932,8 +1935,9 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
|
|||||||
}
|
}
|
||||||
else if (compose_state==1 && wParam != VK_CONTROL)
|
else if (compose_state==1 && wParam != VK_CONTROL)
|
||||||
compose_state = 0;
|
compose_state = 0;
|
||||||
} else
|
} else {
|
||||||
compose_state = 0;
|
compose_state = 0;
|
||||||
|
}
|
||||||
|
|
||||||
/* Nastyness with NUMLock - Shift-NUMLock is left alone though */
|
/* Nastyness with NUMLock - Shift-NUMLock is left alone though */
|
||||||
if ( (cfg.funky_type == 3 ||
|
if ( (cfg.funky_type == 3 ||
|
||||||
|
Loading…
Reference in New Issue
Block a user