m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Win32: better handling of AltGr key

Browse Source
This commit is contained in:
Thomas Bernard 2018-09-18 11:41:34 +02:00
parent 0408eb487e
commit 77e53d3b18
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/keyboard.c
View File

@ -837,10 +837,20 @@ word Get_Key_modifiers(void)
#if defined(WIN32) #if defined(WIN32)
if (GetKeyState(VK_SHIFT) & 0x8000) if (GetKeyState(VK_SHIFT) & 0x8000)
mod |= MOD_SHIFT; mod |= MOD_SHIFT;
// Pressing AltGr is reported by windows as the right Alt together with the Left control keys
if ((GetKeyState(VK_RMENU) & 0x8000) && (GetKeyState(VK_LCONTROL) & 0x8000))
{
mod |= MOD_ALT; // ALT GR
if (GetKeyState(VK_RCONTROL) & 0x8000)
mod |= MOD_CTRL;
}
else
{
if (GetKeyState(VK_CONTROL) & 0x8000) if (GetKeyState(VK_CONTROL) & 0x8000)
mod |= MOD_CTRL; mod |= MOD_CTRL;
if (GetKeyState(VK_MENU) & 0x8000) if (GetKeyState(VK_MENU) & 0x8000)
mod |= MOD_ALT; mod |= MOD_ALT;
}
if ((GetKeyState(VK_LWIN) | GetKeyState(VK_RWIN)) & 0x8000) if ((GetKeyState(VK_LWIN) | GetKeyState(VK_RWIN)) & 0x8000)
mod |= MOD_META; mod |= MOD_META;
#endif #endif

8
src/win32screen.c
View File

@ -159,14 +159,20 @@ static LRESULT CALLBACK Win32_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
// WM_MBUTTONDBLCLK // WM_MBUTTONDBLCLK
case WM_SYSKEYDOWN: // Sent when ALT is pressed case WM_SYSKEYDOWN: // Sent when ALT is pressed
case WM_KEYDOWN: // lParam & 0xffff => repeat count. (lParam >> 16) & 0x1ff => scancode case WM_KEYDOWN: // lParam & 0xffff => repeat count. (lParam >> 16) & 0x1ff => scancode
// lParam & 0x20000000 : context : 0 for WM_KEYDOWN; 1 for WM_SYSKEYDOWN if ALT is pressed
// lParam & 0x40000000 : previous key state (1 down, 0 up)
// lParam & 0x80000000 : transition state. 0 for WM_KEYDOWN and WM_SYSKEYDOWN
GFX2_Log(GFX2_DEBUG, "KEYDOWN wParam=%04x lParam=%08x\n", wParam, lParam);
switch (wParam) switch (wParam)
{ {
// Ignore isolated shift, alt, control and window keys // Ignore isolated shift, alt, control and window keys
// and numlock
case VK_SHIFT: case VK_SHIFT:
case VK_CONTROL: case VK_CONTROL:
case VK_MENU: case VK_MENU: // ALT
case VK_LWIN: case VK_LWIN:
case VK_RWIN: case VK_RWIN:
case VK_NUMLOCK:
break; break;
default: default:
Key = wParam|Get_Key_modifiers(); Key = wParam|Get_Key_modifiers();