Improve support for VT character sets

.github/actions/spell-check/dictionary/dictionary.txt

@@ -97786,6 +97786,7 @@ dalesman
 dalesmen
 dalespeople
 daleswoman
+dalet
 daleth
 daleths
 Daleville
@@ -107561,6 +107562,7 @@ dialystelic
 dialystely
 dialytic
 dialytically
+dialytika
 dialyzability
 dialyzable
 dialyzate
@@ -114004,6 +114006,7 @@ djalmaite
 Djambi
 djasakid
 djave
+dje
 djebel
 djebels
 djehad
@@ -120418,11 +120421,13 @@ DZ
 dz
 dz.
 Dzaudzhikau
+dze
 dzeren
 dzerin
 dzeron
 Dzerzhinsk
 Dzhambul
+dzhe
 Dzhugashvili
 dziggetai
 dzo
@@ -158966,6 +158971,7 @@ Ghaznevid
 Ghazzah
 Ghazzali
 ghbor
+ghe
 Gheber
 gheber
 ghebeta
@@ -160166,6 +160172,7 @@ gizzards
 gizzen
 gizzened
 gizzern
+gje
 gjedost
 Gjellerup
 gjetost
@@ -212347,6 +212354,7 @@ Kizilbash
 Kizzee
 Kizzie
 kJ
+kje
 Kjeldahl
 kjeldahlization
 kjeldahlize
@@ -224856,6 +224864,7 @@ lizzie
 Lizzy
 LJ
 LJBF
+lje
 Ljod
 Ljoka
 Ljubljana
@@ -261607,6 +261616,7 @@ N.J.
 NJ
 nj
 njave
+nje
 Njord
 Njorth
 NKGB
@@ -274785,6 +274795,7 @@ Ogma
 ogmic
 Ogmios
 OGO
+ogonek
 ogonium
 Ogor
 O'Gowan
@@ -329834,6 +329845,7 @@ QN
 qn
 QNP
 QNS
+qof
 Qoheleth
 Qom
 qoph
@@ -371408,6 +371420,7 @@ Shaysite
 shazam
 Shazar
 SHCD
+shcha
 Shcheglovsk
 Shcherbakov
 she
@@ -420973,6 +420986,7 @@ tonometry
 Tonopah
 tonophant
 tonoplast
+tonos
 tonoscope
 tonotactic
 tonotaxis
@@ -428676,6 +428690,7 @@ tsetses
 TSF
 TSgt
 TSH
+tshe
 Tshi
 tshi
 Tshiluba
@@ -477068,6 +477083,7 @@ Yermo
 yern
 yertchuk
 yerth
+yeru
 yerva
 Yerwa-Maiduguri
 Yerxa
@@ -478235,6 +478251,7 @@ Z-bar
 ZBB
 ZBR
 ZD
+ze
 Zea
 zea
 zeal
@@ -478604,6 +478621,7 @@ ZG
 ZGS
 Zhang
 Zhdanov
+zhe
 Zhitomir
 Zhivkov
 Zhmud

.github/actions/spell-check/expect/expect.txt

@@ -903,6 +903,7 @@ grep
 Greyscale
 gridline
 groupbox
+gset
 gsl
 GTP
 guc
@@ -1524,6 +1525,7 @@ NOYIELD
 NOZORDER
 NPM
 npos
+NRCS
 NSTATUS
 ntapi
 ntcon
@@ -2023,6 +2025,7 @@ SCROLLSCALE
 SCROLLSCREENBUFFER
 Scrollup
 Scrolluppage
+SCS
 scursor
 sddl
 sdeleted
@@ -2437,6 +2440,7 @@ untimes
 UPDATEDISPLAY
 UPDOWN
 UPKEY
+UPSS
 upvote
 uri
 url

.github/actions/spell-check/patterns/patterns.txt

@@ -1,11 +1,13 @@
 https://(?:(?:[-a-zA-Z0-9?&=]*\.|)microsoft\.com)/[-a-zA-Z0-9?&=_#\/.]*
 https://aka\.ms/[-a-zA-Z0-9?&=\/_]*
+https://www\.itscj\.ipsj\.or\.jp/iso-ir/[-0-9]+\.pdf
+https://www\.vt100\.net/docs/[-a-zA-Z0-9#_\/.]*
 https://www.w3.org/[-a-zA-Z0-9?&=\/_#]*
 https://(?:(?:www\.|)youtube\.com|youtu.be)/[-a-zA-Z0-9?&=]*
 https://[a-z-]+\.githubusercontent\.com/[-a-zA-Z0-9?&=_\/.]*
 [Pp]ublicKeyToken="?[0-9a-fA-F]{16}"?
 (?:[{"]|UniqueIdentifier>)[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}(?:[}"]|</UniqueIdentifier)
-(?:0[Xx]|U\+|#)[a-f0-9A-FGgRr]{2,}[Uu]?[Ll]?\b
+(?:0[Xx]|\\x|U\+|#)[a-f0-9A-FGgRr]{2,}[Uu]?[Ll]{0,2}\b
 microsoft/cascadia-code\@[0-9a-fA-F]{40}
 \d+x\d+Logo
 Scro\&ll

src/host/getset.cpp

@@ -922,6 +922,25 @@ void ApiRoutines::GetLargestConsoleWindowSizeImpl(const SCREEN_INFORMATION& cont
     CATCH_RETURN();
 }
 
+[[nodiscard]] HRESULT DoSrvSetConsoleOutputCodePage(const unsigned int codepage)
+{
+    CONSOLE_INFORMATION& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
+
+    // Return if it's not known as a valid codepage ID.
+    RETURN_HR_IF(E_INVALIDARG, !(IsValidCodePage(codepage)));
+
+    // Do nothing if no change.
+    if (gci.OutputCP != codepage)
+    {
+        // Set new code page
+        gci.OutputCP = codepage;
+
+        SetConsoleCPInfo(TRUE);
+    }
+
+    return S_OK;
+}
+
 // Routine Description:
 // - Sets the codepage used for translating text when calling A versions of functions affecting the output buffer.
 // Arguments:
@@ -932,23 +951,9 @@ void ApiRoutines::GetLargestConsoleWindowSizeImpl(const SCREEN_INFORMATION& cont
 {
     try
     {
-        CONSOLE_INFORMATION& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
         LockConsole();
         auto Unlock = wil::scope_exit([&] { UnlockConsole(); });
-
-        // Return if it's not known as a valid codepage ID.
-        RETURN_HR_IF(E_INVALIDARG, !(IsValidCodePage(codepage)));
-
-        // Do nothing if no change.
-        if (gci.OutputCP != codepage)
-        {
-            // Set new code page
-            gci.OutputCP = codepage;
-
-            SetConsoleCPInfo(TRUE);
-        }
-
-        return S_OK;
+        return DoSrvSetConsoleOutputCodePage(codepage);
     }
     CATCH_RETURN();
 }

src/host/getset.h

@@ -50,6 +50,7 @@ void DoSrvSetCursorColor(SCREEN_INFORMATION& screenInfo,
 
 void DoSrvPrivateRefreshWindow(const SCREEN_INFORMATION& screenInfo);
 
+[[nodiscard]] HRESULT DoSrvSetConsoleOutputCodePage(const unsigned int codepage);
 void DoSrvGetConsoleOutputCodePage(unsigned int& codepage);
 
 [[nodiscard]] NTSTATUS DoSrvPrivateSuppressResizeRepaint();

src/host/outputStream.cpp

@@ -553,6 +553,17 @@ bool ConhostInternalGetSet::PrivateWriteConsoleControlInput(const KeyEvent key)
                                                           key));
 }
 
+// Routine Description:
+// - Connects the SetConsoleOutputCP API call directly into our Driver Message servicing call inside Conhost.exe
+// Arguments:
+// - codepage - the new output codepage of the console.
+// Return Value:
+// - true if successful (see DoSrvSetConsoleOutputCodePage). false otherwise.
+bool ConhostInternalGetSet::SetConsoleOutputCP(const unsigned int codepage)
+{
+    return SUCCEEDED(DoSrvSetConsoleOutputCodePage(codepage));
+}
+
 // Routine Description:
 // - Connects the GetConsoleOutputCP API call directly into our Driver Message servicing call inside Conhost.exe
 // Arguments:

src/host/outputStream.hpp

@@ -115,6 +115,7 @@ class ConhostInternalGetSet final : public Microsoft::Console::VirtualTerminal::
 
     bool PrivateWriteConsoleControlInput(const KeyEvent key) override;
 
+    bool SetConsoleOutputCP(const unsigned int codepage) override;
     bool GetConsoleOutputCP(unsigned int& codepage) override;
 
     bool IsConsolePty() const override;

src/terminal/adapter/DispatchTypes.hpp

@@ -99,10 +99,16 @@ namespace Microsoft::Console::VirtualTerminal::DispatchTypes
         ASB_AlternateScreenBuffer = 1049
     };
 
-    enum VTCharacterSets : wchar_t
+    namespace CharacterSets
     {
-        DEC_LineDrawing = L'0',
-        USASCII = L'B'
+        constexpr auto DecSpecialGraphics = std::make_pair(L'0', L'\0');
+        constexpr auto ASCII = std::make_pair(L'B', L'\0');
+    }
+
+    enum CodingSystem : wchar_t
+    {
+        ISO2022 = L'@',
+        UTF8 = L'G'
     };
 
     enum TabClearType : unsigned short

src/terminal/adapter/ITermDispatch.hpp

@@ -95,7 +95,12 @@ class Microsoft::Console::VirtualTerminal::ITermDispatch
     virtual bool DeviceAttributes() = 0; // DA1
     virtual bool Vt52DeviceAttributes() = 0; // VT52 Identify
 
-    virtual bool DesignateCharset(const wchar_t wchCharset) = 0; // SCS
+    virtual bool DesignateCodingSystem(const wchar_t codingSystem) = 0; // DOCS
+    virtual bool Designate94Charset(const size_t gsetNumber, const std::pair<wchar_t, wchar_t> charset) = 0; // SCS
+    virtual bool Designate96Charset(const size_t gsetNumber, const std::pair<wchar_t, wchar_t> charset) = 0; // SCS
+    virtual bool LockingShift(const size_t gsetNumber) = 0; // LS0, LS1, LS2, LS3
+    virtual bool LockingShiftRight(const size_t gsetNumber) = 0; // LS1R, LS2R, LS3R
+    virtual bool SingleShift(const size_t gsetNumber) = 0; // SS2, SS3
 
     virtual bool SoftReset() = 0; // DECSTR
     virtual bool HardReset() = 0; // RIS