Windows: fix handling AltGr+Key

magiblot · Oct 21, 2024 · bfca212 · bfca212
1 parent c1abb10
commit bfca212
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/source/platform/win32con.cpp b/source/platform/win32con.cpp
@@ -438,13 +438,15 @@ bool getWin32Key(const KEY_EVENT_RECORD &KeyEvent, TEvent &ev, InputState &state
          ev.keyDown.keyCode == 0x3A00 )
         // Discard standalone Shift, Ctrl, Alt, Caps Lock keys.
         ev.keyDown.keyCode = kbNoKey;
-    else if ( (ev.keyDown.controlKeyState & kbCtrlShift) &&
-              (ev.keyDown.controlKeyState & kbAltShift) ) // Ctrl+Alt is AltGr.
+    else if (ev.keyDown.controlKeyState & kbRightAlt)
     {
-        // When AltGr+Key does not produce a character, a
-        // keyCode with unwanted effects may be read instead.
-        if (!ev.keyDown.textLength)
+        if (ev.keyDown.textLength == 0)
+            // When AltGr+Key does not produce a character, an unwanted keyCode
+            // may be read instead, so discard it.
             ev.keyDown.keyCode = kbNoKey;
+        else
+            // Otherwise, discard the Ctrl modifier that is automatically added.
+            ev.keyDown.controlKeyState &= ~kbLeftCtrl;
     }
     else if (KeyEvent.wVirtualScanCode < 89)
     {

diff --git a/source/tvision/hardwrvr.cpp b/source/tvision/hardwrvr.cpp
@@ -345,13 +345,15 @@ BOOL THardwareInfo::getKeyEvent( TEvent& event )
                     event.keyDown.keyCode == 0x3A00 )
                     // Discard standalone Shift, Ctrl, Alt, Caps Lock keys.
                     event.keyDown.keyCode = kbNoKey;
-                else if( (event.keyDown.controlKeyState & kbCtrlShift) &&
-                         (event.keyDown.controlKeyState & kbAltShift) ) // Ctrl+Alt is AltGr.
+                else if( event.keyDown.controlKeyState & kbRightAlt )
                     {
-                    // When AltGr+Key does not produce a character, a
-                    // keyCode with unwanted effects may be read instead.
-                    if( !event.keyDown.charScan.charCode )
+                    if( event.keyDown.charScan.charCode == '\0' )
+                        // When AltGr+Key does not produce a character, an unwanted keyCode
+                        // may be read instead, so discard it.
                         event.keyDown.keyCode = kbNoKey;
+                    else
+                        // Otherwise, discard the Ctrl modifier that is automatically added.
+                        event.keyDown.controlKeyState &= ~kbLeftCtrl;
                     }
                 else if( irBuffer.Event.KeyEvent.wVirtualScanCode < 89 )
                     {

diff --git a/test/platform/far2l.test.cpp b/test/platform/far2l.test.cpp
@@ -29,8 +29,8 @@ TEST(Far2l, ShouldReadFar2lInput)
         {"AQC+AAAAAAAAAKwgAABL\x07", {Accepted, keyDownEv(kbNoKey, 0x0000, "€")}},
         {"AQBWAAAACAAAAAAAAABL\x07", {Accepted, keyDownEv(kbCtrlV, kbLeftCtrl, "")}},
         {"AQA5AAAACAAAADkAAABL\x07", {Accepted, keyDownEv(kb9, kbLeftCtrl, "9")}},
-        {"AQBWAAAACgAAAFYAAABL\x07", {Accepted, keyDownEv(kbAltV, kbLeftCtrl | kbLeftAlt, "")}},
-        {"AQBWAAAACgAAAAAAAABL\x07", {Ignored}}, // AltGr + V, UnicodeChar = 0
+        {"AQBWAAAACgAAAFYAAABL\x07", {Accepted, keyDownEv(kbAltV, kbLeftCtrl | kbLeftAlt, "")}}, // UnicodeChar = 'V'
+        {"AQBWAAAACgAAAAAAAABL\x07", {Accepted, keyDownEv(kbAltV, kbLeftCtrl | kbLeftAlt, "")}}, // UnicodeChar = 0
         {"AQAMAAAAIgAAAAAAAABL\x07", {Ignored}}, // Alt + VK_CLEAR
         {"AAAGAAAAAAAAAAAAAQAAAE0=\x07", {Accepted, mouseEv({0, 6}, meMouseMoved, 0, 0, 0)}},
         {"CQANAAQAAAAAAAAAAAAAAE0=\x07", {Accepted, mouseEv({9, 13}, 0, 0, mbMiddleButton, 0)}},