From 6b092fcac101fc99f0fad9e8fa63b00f8107239b Mon Sep 17 00:00:00 2001 From: deuce <> Date: Thu, 27 Oct 2005 21:36:07 +0000 Subject: [PATCH] Another attempt to straighten out international input... this one appears to work on Canadian Multilingual keyboards as well as US ones. --- src/conio/win32cio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conio/win32cio.c b/src/conio/win32cio.c index d64cf535cd..6069227503 100644 --- a/src/conio/win32cio.c +++ b/src/conio/win32cio.c @@ -308,9 +308,9 @@ int win32_keyboardio(int isgetch) if((input.Event.KeyEvent.dwControlKeyState & (RIGHT_ALT_PRESSED|LEFT_ALT_PRESSED|RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED|ENHANCED_KEY)) || (input.Event.KeyEvent.wVirtualKeyCode >= VK_F1 && input.Event.KeyEvent.wVirtualKeyCode <= VK_F24) || !input.Event.KeyEvent.uChar.AsciiChar - || (!(input.Event.KeyEvent.dwControlKeyState & NUMLOCK_ON) && (input.Event.KeyEvent.uChar.AsciiChar >= '0' && input.Event.KeyEvent.uChar.AsciiChar <= '9'))) - if((input.Event.KeyEvent.dwControlKeyState & RIGHT_ALT_PRESSED|LEFT_ALT_PRESSED) - && (input.Event.KeyEvent.dwControlKeyState & RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED) + || (!(input.Event.KeyEvent.dwControlKeyState & NUMLOCK_ON) && (input.Event.KeyEvent.uChar.AsciiChar >= '.' && input.Event.KeyEvent.uChar.AsciiChar <= '9'))) + /* Is this an AltGr key? */ + if(((input.Event.KeyEvent.dwControlKeyState & RIGHT_ALT_PRESSED|LEFT_CTRL_PRESSED == RIGHT_ALT_PRESSED|LEFT_CTRL_PRESSED) && (BYTE)input.Event.KeyEvent.uChar.AsciiChar) lastch=(BYTE)input.Event.KeyEvent.uChar.AsciiChar; else -- GitLab