From c4ba2dbc379d0accb16ce232a1acf2bc431e084d Mon Sep 17 00:00:00 2001
From: Leonard Hecker <leonard@hecker.io>
Date: Sun, 7 Feb 2021 16:10:23 +0100
Subject: [PATCH] Fixed #5205: Ctrl+Alt+2 doesn't send ^[^@

---
 .../actions/spelling/dictionary/microsoft.txt |  2 ++
 src/terminal/input/terminalInput.cpp          | 32 ++++++++++++-------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/.github/actions/spelling/dictionary/microsoft.txt b/.github/actions/spelling/dictionary/microsoft.txt
index 83440accbfa..d6743107907 100644
--- a/.github/actions/spelling/dictionary/microsoft.txt
+++ b/.github/actions/spelling/dictionary/microsoft.txt
@@ -39,6 +39,7 @@ systemroot
 taskkill
 tasklist
 tdbuildteamid
+VCRT
 vcruntime
 visualstudio
 VSTHRD
@@ -47,3 +48,4 @@ wslpath
 wtl
 wtt
 wttlog
+Xamarin
diff --git a/src/terminal/input/terminalInput.cpp b/src/terminal/input/terminalInput.cpp
index 73be6356acc..f3b1864ab38 100644
--- a/src/terminal/input/terminalInput.cpp
+++ b/src/terminal/input/terminalInput.cpp
@@ -565,25 +565,33 @@ bool TerminalInput::HandleKey(const IInputEvent* const pInEvent)
     // for the 5 least significant ones to be zeroed out.
     if (keyEvent.IsAltPressed() && keyEvent.IsCtrlPressed())
     {
-        auto ch = keyEvent.GetCharData();
-        if (ch == UNICODE_NULL)
-        {
-            // For Alt+Ctrl+Key messages GetCharData() returns 0.
-            // The values of the ASCII characters and virtual key codes
-            // of <Space>, A-Z (as used below) are numerically identical.
-            // -> Get the char from the virtual key.
-            ch = keyEvent.GetVirtualKeyCode();
-        }
+        const auto ch = keyEvent.GetCharData();
+        const auto vkey = keyEvent.GetVirtualKeyCode();
+
+        // For Alt+Ctrl+Key messages GetCharData() usually returns 0.
+        // Luckily the numerical values of the ASCII characters and virtual key codes
+        // of <Space> and A-Z, as used below, are numerically identical.
+        // -> Get the char from the virtual key if it's 0.
+        const auto ctrlAltChar = keyEvent.GetCharData() != 0 ? keyEvent.GetCharData() : keyEvent.GetVirtualKeyCode();
+
         // Alt+Ctrl acts as a substitute for AltGr on Windows.
         // For instance using a German keyboard both AltGr+< and Alt+Ctrl+< produce a | (pipe) character.
         // The below condition primitively ensures that we allow all common Alt+Ctrl combinations
         // while preserving most of the functionality of Alt+Ctrl as a substitute for AltGr.
-        if (ch == UNICODE_SPACE || (ch > 0x40 && ch <= 0x5A))
+        if (ctrlAltChar == UNICODE_SPACE || (ctrlAltChar > 0x40 && ctrlAltChar <= 0x5A))
         {
             // Pressing the control key causes all bits but the 5 least
             // significant ones to be zeroed out (when using ASCII).
-            ch &= 0b11111;
-            _SendEscapedInputSequence(ch);
+            _SendEscapedInputSequence(ctrlAltChar & 0b11111);
+            return true;
+        }
+
+        // Currently, when we're called with Alt+Ctrl+@, ch will be 0, since Ctrl+@ equals a null byte.
+        // VkKeyScanW(0) in turn returns the vkey for the null character (ASCII @).
+        // -> Use the vkey to determine if Ctrl+@ is being pressed and produce ^[^@.
+        if (ch == UNICODE_NULL && vkey == LOBYTE(VkKeyScanW(0)))
+        {
+            _SendEscapedInputSequence(L'\0');
             return true;
         }
     }