From 8b8ad7502400b45889e6f7f8e3e8b73064d32468 Mon Sep 17 00:00:00 2001
From: PankajBhojwani <pankaj.d.bhoj@gmail.com>
Date: Wed, 20 Oct 2021 11:12:17 -0700
Subject: [PATCH 01/16] Update version to 1.13 on main (#11550)

---
 custom.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/custom.props b/custom.props
index 95b29b746ab..23f7ff5aa82 100644
--- a/custom.props
+++ b/custom.props
@@ -5,7 +5,7 @@
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
     <XesBaseYearForStoreVersion>2021</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
-    <VersionMinor>12</VersionMinor>
+    <VersionMinor>13</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
   </PropertyGroup>
 </Project>

From 5cd966326913298f9d5570717a94972728f63065 Mon Sep 17 00:00:00 2001
From: Leonard Hecker <lhecker@microsoft.com>
Date: Wed, 20 Oct 2021 21:57:55 +0200
Subject: [PATCH 02/16] Fixed VsDevCmd command line quoting (#11554)

---
 src/cascadia/TerminalSettingsModel/VsDevCmdGenerator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cascadia/TerminalSettingsModel/VsDevCmdGenerator.cpp b/src/cascadia/TerminalSettingsModel/VsDevCmdGenerator.cpp
index 39ee490ce77..e00f9f3841f 100644
--- a/src/cascadia/TerminalSettingsModel/VsDevCmdGenerator.cpp
+++ b/src/cascadia/TerminalSettingsModel/VsDevCmdGenerator.cpp
@@ -40,7 +40,7 @@ std::wstring VsDevCmdGenerator::GetProfileCommandLine(const VsSetupConfiguration
 {
     std::wstring commandLine;
     commandLine.reserve(256);
-    commandLine.append(LR"("cmd.exe /k ")");
+    commandLine.append(LR"(cmd.exe /k ")");
     commandLine.append(GetDevCmdScriptPath(instance));
 #if defined(_M_ARM64)
     commandLine.append(LR"(" -arch=arm64 -host_arch=x64)");

From 670ae2bd1c78fd2cc5b8e88f426eacab71fe1bfb Mon Sep 17 00:00:00 2001
From: Mahdi Hosseini <mahdidvb72@gmail.com>
Date: Fri, 22 Oct 2021 00:35:12 +0330
Subject: [PATCH 03/16] Link 1.12 blog and milestones on roadmap (#11562)

---
 doc/terminal-v2-roadmap.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/terminal-v2-roadmap.md b/doc/terminal-v2-roadmap.md
index 8f4cab23573..34fe686ee2e 100644
--- a/doc/terminal-v2-roadmap.md
+++ b/doc/terminal-v2-roadmap.md
@@ -31,7 +31,7 @@ Below is the schedule for when milestones will be included in release builds of
 | 2021-05-31 | [1.9] in Windows Terminal Preview<br>[1.8] in Windows Terminal | [Windows Terminal Preview 1.9 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-9-release/) |
 | 2021-07-14 | [1.10] in Windows Terminal Preview<br>[1.9] in Windows Terminal | [Windows Terminal Preview 1.10 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-10-release/) |
 | 2021-08-31 | [1.11] in Windows Terminal Preview<br>[1.10] in Windows Terminal | [Windows Terminal Preview 1.11 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-11-release/) |
-| 2021-10-31 | 1.12 in Windows Terminal Preview<br>1.11 in Windows Terminal | |
+| 2021-10-20 | [1.12] in Windows Terminal Preview<br>[1.11] in Windows Terminal | [Windows Terminal Preview 1.12 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-12-release/) |
 | 2021-11-30 | 2.0 RC in Windows Terminal Preview<br>2.0 RC in Windows Terminal | |
 | 2021-12-31 | [2.0] in Windows Terminal Preview<br>[2.0] in Windows Terminal | |
 
@@ -91,6 +91,8 @@ Feature Notes:
 [1.9]: https://github.com/microsoft/terminal/milestone/34
 [1.10]: https://github.com/microsoft/terminal/milestone/35
 [1.11]: https://github.com/microsoft/terminal/milestone/36
+[1.12]: https://github.com/microsoft/terminal/milestone/38
+[1.13]: https://github.com/microsoft/terminal/milestone/39
 [2.0]: https://github.com/microsoft/terminal/milestone/22
 [#1564]: https://github.com/microsoft/terminal/issues/1564
 [#6720]: https://github.com/microsoft/terminal/pull/6720

From a2f26850c6c5a1dcc3d66e08bb64e44909a4afff Mon Sep 17 00:00:00 2001
From: Blake Heimann <43186444+BlakeHeimann@users.noreply.github.com>
Date: Mon, 25 Oct 2021 06:16:30 -0500
Subject: [PATCH 04/16] Fixed grammatical error (#11604)

Found a small grammatical error in the documentation of this particular file.
---
 doc/EXCEPTIONS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/EXCEPTIONS.md b/doc/EXCEPTIONS.md
index 48a6017ede2..d6e90988f3a 100644
--- a/doc/EXCEPTIONS.md
+++ b/doc/EXCEPTIONS.md
@@ -4,7 +4,7 @@
 Introducing exceptions to an existing non-exception-based codebase can be perilous. The console was originally written
 in C at a time when C++ was relatively unused in the Windows operating system. As part of our project to modernize the
 Windows console, we converted to use C++, but still had an aversion to using exception-based error handling in
-our code for fear that it introduce unexpected failures. However, the STL and other libraries like it are so useful that
+our code for fear that it might introduce unexpected failures. However, the STL and other libraries like it are so useful that
 sometimes it's significantly simpler to use them. Given that, we have a set of rules that we follow when considering
 exception use.
 

From e10e1d8ef1c0c6c7f67f00aabb71babaca9b972f Mon Sep 17 00:00:00 2001
From: Carlos Zamora <carlos.zamora@microsoft.com>
Date: Mon, 25 Oct 2021 04:16:49 -0700
Subject: [PATCH 05/16] Remove feature flag code for editable actions page
 (#11576)

## Summary of the Pull Request
Removes the feature flag code for the editable actions page. Pretty straightforward.

## PR Checklist
Closes #11482
---
 .../TerminalSettingsEditor/MainPage.cpp       |  17 +-
 ...Microsoft.Terminal.Settings.Editor.vcxproj |  13 -
 ...t.Terminal.Settings.Editor.vcxproj.filters |   1 -
 .../ReadOnlyActions.cpp                       |  64 -----
 .../TerminalSettingsEditor/ReadOnlyActions.h  |  57 -----
 .../ReadOnlyActions.idl                       |  23 --
 .../ReadOnlyActions.xaml                      | 222 ------------------
 src/features.xml                              |   6 -
 8 files changed, 1 insertion(+), 402 deletions(-)
 delete mode 100644 src/cascadia/TerminalSettingsEditor/ReadOnlyActions.cpp
 delete mode 100644 src/cascadia/TerminalSettingsEditor/ReadOnlyActions.h
 delete mode 100644 src/cascadia/TerminalSettingsEditor/ReadOnlyActions.idl
 delete mode 100644 src/cascadia/TerminalSettingsEditor/ReadOnlyActions.xaml

diff --git a/src/cascadia/TerminalSettingsEditor/MainPage.cpp b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
index 414bd4f0d2a..e7b13ce5316 100644
--- a/src/cascadia/TerminalSettingsEditor/MainPage.cpp
+++ b/src/cascadia/TerminalSettingsEditor/MainPage.cpp
@@ -8,7 +8,6 @@
 #include "Interaction.h"
 #include "Rendering.h"
 #include "Actions.h"
-#include "ReadOnlyActions.h"
 #include "Profiles.h"
 #include "GlobalAppearance.h"
 #include "ColorSchemes.h"
@@ -293,21 +292,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
         else if (clickedItemTag == actionsTag)
         {
-            if constexpr (Feature_EditableActionsPage::IsEnabled())
-            {
-                contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<ActionsPageNavigationState>(_settingsClone));
-            }
-            else
-            {
-                auto actionsState{ winrt::make<ReadOnlyActionsPageNavigationState>(_settingsClone) };
-                actionsState.OpenJson([weakThis = get_weak()](auto&&, auto&& arg) {
-                    if (auto self{ weakThis.get() })
-                    {
-                        self->_OpenJsonHandlers(nullptr, arg);
-                    }
-                });
-                contentFrame().Navigate(xaml_typename<Editor::ReadOnlyActions>(), actionsState);
-            }
+            contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<ActionsPageNavigationState>(_settingsClone));
         }
         else if (clickedItemTag == globalProfileTag)
         {
diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
index e4335126c48..36caf5524e3 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj
@@ -77,9 +77,6 @@
       <DependentUpon>Appearances.xaml</DependentUpon>
       <SubType>Code</SubType>
     </ClInclude>
-    <ClInclude Include="ReadOnlyActions.h">
-      <DependentUpon>ReadOnlyActions.xaml</DependentUpon>
-    </ClInclude>
     <ClInclude Include="Rendering.h">
       <DependentUpon>Rendering.xaml</DependentUpon>
     </ClInclude>
@@ -121,9 +118,6 @@
     <Page Include="Profiles.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="ReadOnlyActions.xaml">
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Appearances.xaml">
       <SubType>Designer</SubType>
     </Page>
@@ -177,9 +171,6 @@
       <DependentUpon>Appearances.xaml</DependentUpon>
       <SubType>Code</SubType>
     </ClCompile>
-    <ClCompile Include="ReadOnlyActions.cpp">
-      <DependentUpon>ReadOnlyActions.xaml</DependentUpon>
-    </ClCompile>
     <ClCompile Include="Rendering.cpp">
       <DependentUpon>Rendering.xaml</DependentUpon>
     </ClCompile>
@@ -223,10 +214,6 @@
       <DependentUpon>Interaction.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Midl>
-    <Midl Include="ReadOnlyActions.idl">
-      <DependentUpon>ReadOnlyActions.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Midl>
     <Midl Include="Rendering.idl">
       <DependentUpon>Rendering.xaml</DependentUpon>
       <SubType>Code</SubType>
diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
index 3b0b9186e6a..373fb3061a0 100644
--- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
+++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj.filters
@@ -40,7 +40,6 @@
     <Page Include="Actions.xaml" />
     <Page Include="SettingContainerStyle.xaml" />
     <Page Include="AddProfile.xaml" />
-    <Page Include="ReadOnlyActions.xaml" />
     <Page Include="KeyChordListener.xaml" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.cpp b/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.cpp
deleted file mode 100644
index 50403383d88..00000000000
--- a/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "ReadOnlyActions.h"
-#include "ReadOnlyActions.g.cpp"
-#include "ReadOnlyActionsPageNavigationState.g.cpp"
-#include "EnumEntry.h"
-
-using namespace winrt::Windows::Foundation;
-using namespace winrt::Windows::System;
-using namespace winrt::Windows::UI::Core;
-using namespace winrt::Windows::UI::Xaml::Navigation;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    ReadOnlyActions::ReadOnlyActions()
-    {
-        InitializeComponent();
-
-        _filteredActions = winrt::single_threaded_observable_vector<Command>();
-    }
-
-    void ReadOnlyActions::OnNavigatedTo(const NavigationEventArgs& e)
-    {
-        _State = e.Parameter().as<Editor::ReadOnlyActionsPageNavigationState>();
-
-        std::vector<Command> keyBindingList;
-        for (const auto& [_, command] : _State.Settings().GlobalSettings().ActionMap().NameMap())
-        {
-            // Filter out nested commands, and commands that aren't bound to a
-            // key. This page is currently just for displaying the actions that
-            // _are_ bound to keys.
-            if (command.HasNestedCommands() || !command.Keys())
-            {
-                continue;
-            }
-            keyBindingList.push_back(command);
-        }
-        std::sort(begin(keyBindingList), end(keyBindingList), CommandComparator{});
-        _filteredActions = single_threaded_observable_vector<Command>(std::move(keyBindingList));
-    }
-
-    Collections::IObservableVector<Command> ReadOnlyActions::FilteredActions()
-    {
-        return _filteredActions;
-    }
-
-    void ReadOnlyActions::_OpenSettingsClick(const IInspectable& /*sender*/,
-                                             const Windows::UI::Xaml::RoutedEventArgs& /*eventArgs*/)
-    {
-        const CoreWindow window = CoreWindow::GetForCurrentThread();
-        const auto rAltState = window.GetKeyState(VirtualKey::RightMenu);
-        const auto lAltState = window.GetKeyState(VirtualKey::LeftMenu);
-        const bool altPressed = WI_IsFlagSet(lAltState, CoreVirtualKeyStates::Down) ||
-                                WI_IsFlagSet(rAltState, CoreVirtualKeyStates::Down);
-
-        const auto target = altPressed ? SettingsTarget::DefaultsFile : SettingsTarget::SettingsFile;
-
-        _State.RequestOpenJson(target);
-    }
-
-}
diff --git a/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.h b/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.h
deleted file mode 100644
index 274fcb164c7..00000000000
--- a/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-#include "ReadOnlyActions.g.h"
-#include "ReadOnlyActionsPageNavigationState.g.h"
-#include "Utils.h"
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
-{
-    struct CommandComparator
-    {
-        bool operator()(const Model::Command& lhs, const Model::Command& rhs) const
-        {
-            return lhs.Name() < rhs.Name();
-        }
-    };
-
-    struct ReadOnlyActionsPageNavigationState : ReadOnlyActionsPageNavigationStateT<ReadOnlyActionsPageNavigationState>
-    {
-    public:
-        ReadOnlyActionsPageNavigationState(const Model::CascadiaSettings& settings) :
-            _Settings{ settings } {}
-
-        void RequestOpenJson(const Model::SettingsTarget target)
-        {
-            _OpenJsonHandlers(nullptr, target);
-        }
-
-        WINRT_PROPERTY(Model::CascadiaSettings, Settings, nullptr)
-        TYPED_EVENT(OpenJson, Windows::Foundation::IInspectable, Model::SettingsTarget);
-    };
-
-    struct ReadOnlyActions : public HasScrollViewer<ReadOnlyActions>, ReadOnlyActionsT<ReadOnlyActions>
-    {
-    public:
-        ReadOnlyActions();
-
-        void OnNavigatedTo(const winrt::Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
-
-        Windows::Foundation::Collections::IObservableVector<winrt::Microsoft::Terminal::Settings::Model::Command> FilteredActions();
-
-        WINRT_PROPERTY(Editor::ReadOnlyActionsPageNavigationState, State, nullptr);
-
-    private:
-        friend struct ReadOnlyActionsT<ReadOnlyActions>; // for Xaml to bind events
-        Windows::Foundation::Collections::IObservableVector<winrt::Microsoft::Terminal::Settings::Model::Command> _filteredActions{ nullptr };
-
-        void _OpenSettingsClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
-    };
-}
-
-namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
-{
-    BASIC_FACTORY(ReadOnlyActions);
-}
diff --git a/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.idl b/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.idl
deleted file mode 100644
index 49e01bf5769..00000000000
--- a/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import "EnumEntry.idl";
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    runtimeclass ReadOnlyActionsPageNavigationState
-    {
-        Microsoft.Terminal.Settings.Model.CascadiaSettings Settings;
-        void RequestOpenJson(Microsoft.Terminal.Settings.Model.SettingsTarget target);
-        event Windows.Foundation.TypedEventHandler<Object, Microsoft.Terminal.Settings.Model.SettingsTarget> OpenJson;
-    };
-
-    [default_interface] runtimeclass ReadOnlyActions : Windows.UI.Xaml.Controls.Page
-    {
-        ReadOnlyActions();
-        ReadOnlyActionsPageNavigationState State { get; };
-
-        IObservableVector<Microsoft.Terminal.Settings.Model.Command> FilteredActions { get; };
-
-    }
-}
diff --git a/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.xaml b/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.xaml
deleted file mode 100644
index c5c1844cc98..00000000000
--- a/src/cascadia/TerminalSettingsEditor/ReadOnlyActions.xaml
+++ /dev/null
@@ -1,222 +0,0 @@
-<!--
-    Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
-    the MIT License. See LICENSE in the project root for license information.
--->
-<Page x:Class="Microsoft.Terminal.Settings.Editor.ReadOnlyActions"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:SettingsModel="using:Microsoft.Terminal.Settings.Model"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:local="using:Microsoft.Terminal.Settings.Editor"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-      mc:Ignorable="d">
-
-    <Page.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="CommonResources.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-            <!--
-                Template for actions. This is _heavily_ copied from the command
-                palette, with modifications:
-                * We don't need to use a HighlightedTextControl, because we're
-                not filtering this list
-                * We don't need the chevron for nested commands
-                * We're not displaying the icon
-                * We're binding directly to a Command, not a FilteredCommand
-                
-                If we wanted to reuse the command palette's list more directly,
-                that's theoretically possible, but then it would need to be
-                lifted out of TerminalApp and either moved into the
-                TerminalSettingsEditor or moved to it's own project consumed by
-                both TSE and TerminalApp.
-            -->
-            <DataTemplate x:Key="GeneralItemTemplate"
-                          x:DataType="SettingsModel:Command">
-
-                <!--
-                    This HorizontalContentAlignment="Stretch" is important
-                    to make sure it takes the entire width of the line
-                -->
-                <ListViewItem HorizontalContentAlignment="Stretch"
-                              AutomationProperties.AcceleratorKey="{x:Bind KeyChordText, Mode=OneWay}"
-                              AutomationProperties.Name="{x:Bind Name, Mode=OneWay}">
-
-                    <Grid HorizontalAlignment="Stretch"
-                          ColumnSpacing="8">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="Auto" />
-                            <!--  command label  -->
-                            <ColumnDefinition Width="*" />
-                            <!--  key chord  -->
-                            <ColumnDefinition Width="32" />
-                            <!--  gutter for scrollbar  -->
-                        </Grid.ColumnDefinitions>
-
-                        <TextBlock Grid.Column="0"
-                                   HorizontalAlignment="Left"
-                                   Text="{x:Bind Name, Mode=OneWay}" />
-
-                        <!--
-                            Inexplicably, we don't need to set the
-                            AutomationProperties to Raw here, unlike in the
-                            CommandPalette. We're not quite sure why.
-                        -->
-                        <Border Grid.Column="1"
-                                Padding="2,0,2,0"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Center"
-                                Style="{ThemeResource KeyChordBorderStyle}">
-
-                            <TextBlock FontSize="12"
-                                       Style="{ThemeResource KeyChordTextBlockStyle}"
-                                       Text="{x:Bind KeyChordText, Mode=OneWay}" />
-                        </Border>
-                    </Grid>
-                </ListViewItem>
-            </DataTemplate>
-
-            <!--  These resources again, HEAVILY copied from the command palette  -->
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Dark">
-                    <!--  TextBox colors !  -->
-                    <SolidColorBrush x:Key="TextControlBackground"
-                                     Color="#333333" />
-                    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush"
-                                     Color="#B5B5B5" />
-                    <SolidColorBrush x:Key="TextControlForeground"
-                                     Color="#B5B5B5" />
-                    <SolidColorBrush x:Key="TextControlBorderBrush"
-                                     Color="#404040" />
-                    <SolidColorBrush x:Key="TextControlButtonForeground"
-                                     Color="#B5B5B5" />
-
-                    <SolidColorBrush x:Key="TextControlBackgroundPointerOver"
-                                     Color="#404040" />
-                    <SolidColorBrush x:Key="TextControlForegroundPointerOver"
-                                     Color="#FFFFFF" />
-                    <SolidColorBrush x:Key="TextControlBorderBrushPointerOver"
-                                     Color="#404040" />
-                    <SolidColorBrush x:Key="TextControlButtonForegroundPointerOver"
-                                     Color="#FF4343" />
-
-                    <SolidColorBrush x:Key="TextControlBackgroundFocused"
-                                     Color="#333333" />
-                    <SolidColorBrush x:Key="TextControlForegroundFocused"
-                                     Color="#FFFFFF" />
-                    <SolidColorBrush x:Key="TextControlBorderBrushFocused"
-                                     Color="#404040" />
-                    <SolidColorBrush x:Key="TextControlButtonForegroundPressed"
-                                     Color="#FFFFFF" />
-                    <SolidColorBrush x:Key="TextControlButtonBackgroundPressed"
-                                     Color="#FF4343" />
-
-                    <!--  KeyChordText styles  -->
-                    <Style x:Key="KeyChordBorderStyle"
-                           TargetType="Border">
-                        <Setter Property="BorderThickness" Value="1" />
-                        <Setter Property="CornerRadius" Value="1" />
-                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
-                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
-                    </Style>
-                    <Style x:Key="KeyChordTextBlockStyle"
-                           TargetType="TextBlock">
-                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
-                    </Style>
-
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Light">
-                    <!--  TextBox colors !  -->
-                    <SolidColorBrush x:Key="TextControlBackground"
-                                     Color="#CCCCCC" />
-                    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush"
-                                     Color="#636363" />
-                    <SolidColorBrush x:Key="TextControlBorderBrush"
-                                     Color="#636363" />
-                    <SolidColorBrush x:Key="TextControlButtonForeground"
-                                     Color="#636363" />
-
-                    <SolidColorBrush x:Key="TextControlBackgroundPointerOver"
-                                     Color="#DADADA" />
-                    <SolidColorBrush x:Key="TextControlBorderBrushPointerOver"
-                                     Color="#636363" />
-                    <SolidColorBrush x:Key="TextControlButtonForegroundPointerOver"
-                                     Color="#FF4343" />
-
-                    <SolidColorBrush x:Key="TextControlBackgroundFocused"
-                                     Color="#CCCCCC" />
-                    <SolidColorBrush x:Key="TextControlBorderBrushFocused"
-                                     Color="#636363" />
-                    <SolidColorBrush x:Key="TextControlButtonForegroundPressed"
-                                     Color="#FFFFFF" />
-                    <SolidColorBrush x:Key="TextControlButtonBackgroundPressed"
-                                     Color="#FF4343" />
-
-                    <!--  KeyChordText styles  -->
-                    <Style x:Key="KeyChordBorderStyle"
-                           TargetType="Border">
-                        <Setter Property="BorderThickness" Value="1" />
-                        <Setter Property="CornerRadius" Value="1" />
-                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
-                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
-                    </Style>
-                    <Style x:Key="KeyChordTextBlockStyle"
-                           TargetType="TextBlock">
-                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
-                    </Style>
-
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="HighContrast">
-
-                    <!--  KeyChordText styles (use XAML defaults for High Contrast theme)  -->
-                    <Style x:Key="KeyChordBorderStyle"
-                           TargetType="Border" />
-                    <Style x:Key="KeyChordTextBlockStyle"
-                           TargetType="TextBlock" />
-
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-
-
-        </ResourceDictionary>
-    </Page.Resources>
-
-    <ScrollViewer ViewChanging="ViewChanging">
-        <StackPanel Style="{StaticResource SettingsStackStyle}">
-            <TextBlock x:Uid="Globals_KeybindingsDisclaimer"
-                       Style="{StaticResource DisclaimerStyle}" />
-
-            <!--
-                The Nav_OpenJSON resource just so happens to have a .Content
-                and .Tooltip that are _exactly_ what we're looking for here.
-            -->
-
-            <HyperlinkButton x:Uid="Nav_OpenJSON"
-                             Click="_OpenSettingsClick" />
-
-            <!--  Keybindings  -->
-
-            <!--
-                NOTE: Globals_Keybindings.Header is not defined, because that
-                would result in the page having "Keybindings" displayed twice, which
-                looks quite redundant
-            -->
-            <ContentPresenter x:Uid="Globals_Keybindings"
-                              Margin="0">
-
-                <ListView HorizontalAlignment="Stretch"
-                          VerticalAlignment="Stretch"
-                          AllowDrop="False"
-                          CanReorderItems="False"
-                          IsItemClickEnabled="False"
-                          ItemTemplate="{StaticResource GeneralItemTemplate}"
-                          ItemsSource="{x:Bind FilteredActions, Mode=OneWay}"
-                          SelectionMode="None" />
-
-            </ContentPresenter>
-
-        </StackPanel>
-
-    </ScrollViewer>
-</Page>
diff --git a/src/features.xml b/src/features.xml
index 464cd547277..86fd1e2d3b2 100644
--- a/src/features.xml
+++ b/src/features.xml
@@ -10,12 +10,6 @@
         </alwaysDisabledBrandingTokens>
     </feature>
 
-    <feature>
-        <name>Feature_EditableActionsPage</name>
-        <description>The Actions page in the settings UI should allow users to edit actions.</description>
-        <stage>AlwaysEnabled</stage>
-    </feature>
-
     <feature>
         <name>Feature_EditableUnfocusedAppearance</name>
         <description>The unfocused appearance section in profiles in the SUI that allows users to create and edit unfocused appearances.</description>

From f63159db59d7cf297e48467dd1997d84b24d97b0 Mon Sep 17 00:00:00 2001
From: Sergey <45919738+serd2011@users.noreply.github.com>
Date: Mon, 25 Oct 2021 14:17:18 +0300
Subject: [PATCH 06/16] Adds exception handling of uri creation in profile
 background image update (#11542)

<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
Moves baskgroung image update releated code into separate function and adds uri path construction exeption handling.
<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References

<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #11361
* [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA
* [ ] Tests added/passed
* [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx
* [ ] Schema updated.
* [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx

<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
Tried to put garbage as a path. Terminal didn't crashed.
---
 src/cascadia/TerminalControl/TermControl.cpp | 83 ++++++++++++--------
 src/cascadia/TerminalControl/TermControl.h   |  1 +
 2 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp
index 32bd45f6b9e..afae49d9dae 100644
--- a/src/cascadia/TerminalControl/TermControl.cpp
+++ b/src/cascadia/TerminalControl/TermControl.cpp
@@ -297,37 +297,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
             return;
         }
 
-        if (!newAppearance.BackgroundImage().empty())
-        {
-            Windows::Foundation::Uri imageUri{ newAppearance.BackgroundImage() };
-
-            // Check if the image brush is already pointing to the image
-            // in the modified settings; if it isn't (or isn't there),
-            // set a new image source for the brush
-            auto imageSource = BackgroundImage().Source().try_as<Media::Imaging::BitmapImage>();
-
-            if (imageSource == nullptr ||
-                imageSource.UriSource() == nullptr ||
-                imageSource.UriSource().RawUri() != imageUri.RawUri())
-            {
-                // Note that BitmapImage handles the image load asynchronously,
-                // which is especially important since the image
-                // may well be both large and somewhere out on the
-                // internet.
-                Media::Imaging::BitmapImage image(imageUri);
-                BackgroundImage().Source(image);
-            }
-
-            // Apply stretch, opacity and alignment settings
-            BackgroundImage().Stretch(newAppearance.BackgroundImageStretchMode());
-            BackgroundImage().Opacity(newAppearance.BackgroundImageOpacity());
-            BackgroundImage().HorizontalAlignment(newAppearance.BackgroundImageHorizontalAlignment());
-            BackgroundImage().VerticalAlignment(newAppearance.BackgroundImageVerticalAlignment());
-        }
-        else
-        {
-            BackgroundImage().Source(nullptr);
-        }
+        _SetBackgroundImage(newAppearance);
 
         // Update our control settings
         const auto bg = newAppearance.DefaultBackground();
@@ -412,6 +382,57 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         }
     }
 
+    // Method Description:
+    // - Sets background image and applies its settings (stretch, opacity and alignment)
+    // - Checks path validity
+    // Arguments:
+    // - newAppearance
+    // Return Value:
+    // - <none>
+    void TermControl::_SetBackgroundImage(const IControlAppearance& newAppearance)
+    {
+        if (newAppearance.BackgroundImage().empty())
+        {
+            BackgroundImage().Source(nullptr);
+            return;
+        }
+
+        Windows::Foundation::Uri imageUri{ nullptr };
+        try
+        {
+            imageUri = Windows::Foundation::Uri{ newAppearance.BackgroundImage() };
+        }
+        catch (...)
+        {
+            LOG_CAUGHT_EXCEPTION();
+            BackgroundImage().Source(nullptr);
+            return;
+        }
+
+        // Check if the image brush is already pointing to the image
+        // in the modified settings; if it isn't (or isn't there),
+        // set a new image source for the brush
+        auto imageSource = BackgroundImage().Source().try_as<Media::Imaging::BitmapImage>();
+
+        if (imageSource == nullptr ||
+            imageSource.UriSource() == nullptr ||
+            imageSource.UriSource().RawUri() != imageUri.RawUri())
+        {
+            // Note that BitmapImage handles the image load asynchronously,
+            // which is especially important since the image
+            // may well be both large and somewhere out on the
+            // internet.
+            Media::Imaging::BitmapImage image(imageUri);
+            BackgroundImage().Source(image);
+        }
+
+        // Apply stretch, opacity and alignment settings
+        BackgroundImage().Stretch(newAppearance.BackgroundImageStretchMode());
+        BackgroundImage().Opacity(newAppearance.BackgroundImageOpacity());
+        BackgroundImage().HorizontalAlignment(newAppearance.BackgroundImageHorizontalAlignment());
+        BackgroundImage().VerticalAlignment(newAppearance.BackgroundImageVerticalAlignment());
+    }
+
     // Method Description:
     // - Set up each layer's brush used to display the control's background.
     // - Respects the settings for acrylic, background image and opacity from
diff --git a/src/cascadia/TerminalControl/TermControl.h b/src/cascadia/TerminalControl/TermControl.h
index 9d0f22e339f..8f758fb69dd 100644
--- a/src/cascadia/TerminalControl/TermControl.h
+++ b/src/cascadia/TerminalControl/TermControl.h
@@ -202,6 +202,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         void _UpdateSettingsFromUIThread(IControlSettings newSettings);
         void _UpdateAppearanceFromUIThread(IControlAppearance newAppearance);
         void _ApplyUISettings(const IControlSettings&);
+        void _SetBackgroundImage(const IControlAppearance& newAppearance);
 
         void _InitializeBackgroundBrush();
         void _BackgroundColorChangedHandler(const IInspectable& sender, const IInspectable& args);

From 9662bc69102e2e152a062a9060cb63d2742582d3 Mon Sep 17 00:00:00 2001
From: Ian O'Neill <ianjoneill@users.noreply.github.com>
Date: Mon, 25 Oct 2021 12:17:48 +0100
Subject: [PATCH 07/16] Ensure the background image path is displayed in the
 settings UI (#11580)

## Summary of the Pull Request
Ensures that the background image path is displayed in the settings UI.

## References
One of the items on #11353

## PR Checklist
* [x] Closes #11541
* [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA

## Validation Steps Performed
Set the background image path and saw that it was displayed in the settings UI.
---
 .../TerminalSettingsEditor/Appearances.xaml        |  2 +-
 src/cascadia/TerminalSettingsEditor/Converters.cpp | 14 +++++++++++---
 src/cascadia/TerminalSettingsEditor/Converters.h   |  2 +-
 src/cascadia/TerminalSettingsEditor/Converters.idl |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/cascadia/TerminalSettingsEditor/Appearances.xaml b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
index c1f3253766c..497b7349a2a 100644
--- a/src/cascadia/TerminalSettingsEditor/Appearances.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Appearances.xaml
@@ -220,7 +220,7 @@
                         <TextBox IsEnabled="{x:Bind local:Converters.StringsAreNotEqual('desktopWallpaper', Appearance.BackgroundImagePath), Mode=OneWay}"
                                  IsSpellCheckEnabled="False"
                                  Style="{StaticResource TextBoxSettingStyle}"
-                                 Text="{x:Bind local:Converters.StringFallBackToEmptyString('desktopWallpaper', Appearance.BackgroundImagePath), Mode=TwoWay, BindBack=Appearance.SetBackgroundImagePath}" />
+                                 Text="{x:Bind local:Converters.StringOrEmptyIfPlaceholder('desktopWallpaper', Appearance.BackgroundImagePath), Mode=TwoWay, BindBack=Appearance.SetBackgroundImagePath}" />
                         <Button x:Uid="Profile_BackgroundImageBrowse"
                                 Click="BackgroundImage_Click"
                                 IsEnabled="{x:Bind local:Converters.StringsAreNotEqual('desktopWallpaper', Appearance.BackgroundImagePath), Mode=OneWay}"
diff --git a/src/cascadia/TerminalSettingsEditor/Converters.cpp b/src/cascadia/TerminalSettingsEditor/Converters.cpp
index d9cff642ed7..20e3fe0ec27 100644
--- a/src/cascadia/TerminalSettingsEditor/Converters.cpp
+++ b/src/cascadia/TerminalSettingsEditor/Converters.cpp
@@ -1,4 +1,4 @@
-#include "pch.h"
+#include "pch.h"
 #include "Converters.h"
 #if __has_include("Converters.g.cpp")
 #include "Converters.g.cpp"
@@ -99,8 +99,16 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     {
         return value.empty() ? winrt::Windows::UI::Xaml::Visibility::Collapsed : winrt::Windows::UI::Xaml::Visibility::Visible;
     }
-    winrt::hstring Converters::StringFallBackToEmptyString(winrt::hstring expected, winrt::hstring actual)
+
+    // Method Description:
+    // - Returns the value string, unless it matches the placeholder in which case the empty string.
+    // Arguments:
+    // - placeholder - the placeholder string.
+    // - value - the value string.
+    // Return Value:
+    // - The value string, unless it matches the placeholder in which case the empty string.
+    winrt::hstring Converters::StringOrEmptyIfPlaceholder(winrt::hstring placeholder, winrt::hstring value)
     {
-        return expected == actual ? expected : L"";
+        return placeholder == value ? L"" : value;
     }
 }
diff --git a/src/cascadia/TerminalSettingsEditor/Converters.h b/src/cascadia/TerminalSettingsEditor/Converters.h
index d7f99cbf2d6..2bde550e839 100644
--- a/src/cascadia/TerminalSettingsEditor/Converters.h
+++ b/src/cascadia/TerminalSettingsEditor/Converters.h
@@ -21,7 +21,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         static double PercentageValueToPercentage(double value);
         static bool StringsAreNotEqual(winrt::hstring expected, winrt::hstring actual);
         static winrt::Windows::UI::Xaml::Visibility StringNotEmptyToVisibility(winrt::hstring value);
-        static winrt::hstring StringFallBackToEmptyString(winrt::hstring expected, winrt::hstring actual);
+        static winrt::hstring StringOrEmptyIfPlaceholder(winrt::hstring placeholder, winrt::hstring value);
     };
 }
 
diff --git a/src/cascadia/TerminalSettingsEditor/Converters.idl b/src/cascadia/TerminalSettingsEditor/Converters.idl
index a5b79d5fce0..3429bef4079 100644
--- a/src/cascadia/TerminalSettingsEditor/Converters.idl
+++ b/src/cascadia/TerminalSettingsEditor/Converters.idl
@@ -20,6 +20,6 @@ namespace Microsoft.Terminal.Settings.Editor
         static Double PercentageValueToPercentage(Double value);
         static Boolean StringsAreNotEqual(String expected, String actual);
         static Windows.UI.Xaml.Visibility StringNotEmptyToVisibility(String value);
-        static String StringFallBackToEmptyString(String expected, String actual);
+        static String StringOrEmptyIfPlaceholder(String placeholder, String value);
     }
 }

From def1bdd693046fc40ada9e9f004f1001adf0160b Mon Sep 17 00:00:00 2001
From: Leonard Hecker <lhecker@microsoft.com>
Date: Tue, 26 Oct 2021 21:08:49 +0200
Subject: [PATCH 08/16] Compile OpenConsoleProxy without CRT (#11610)

After this commit OpenConsoleProxy will be built without a CRT.
This cuts down its binary size and DLL dependency bloat.
We hope that this fixes a COM server activation bug if the
user doesn't have a CRT installed globally on their system.

Fixes #11529
---
 .github/actions/spelling/expect/expect.txt |  3 +++
 src/common.build.pre.props                 |  3 ++-
 src/cppwinrt.build.pre.props               |  2 +-
 src/host/proxy/Host.Proxy.vcxproj          | 19 +++++++++++++++----
 src/host/proxy/Host.Proxy.vcxproj.filters  |  3 +++
 src/host/proxy/nodefaultlib_shim.h         | 18 ++++++++++++++++++
 6 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 src/host/proxy/nodefaultlib_shim.h

diff --git a/.github/actions/spelling/expect/expect.txt b/.github/actions/spelling/expect/expect.txt
index dccd6d7405a..c18d880e46f 100644
--- a/.github/actions/spelling/expect/expect.txt
+++ b/.github/actions/spelling/expect/expect.txt
@@ -938,6 +938,7 @@ GTP
 guc
 gui
 guidatom
+guiddef
 GValue
 GWL
 GWLP
@@ -1535,6 +1536,7 @@ NOCOLOR
 NOCOMM
 NOCONTEXTHELP
 NOCOPYBITS
+nodefaultlib
 nodiscard
 NODUP
 noexcept
@@ -2232,6 +2234,7 @@ STARTWPARMSW
 Statusline
 stdafx
 STDAPI
+stdc
 stdcall
 stdcpp
 stderr
diff --git a/src/common.build.pre.props b/src/common.build.pre.props
index ca15b0a0436..1ec821e3f03 100644
--- a/src/common.build.pre.props
+++ b/src/common.build.pre.props
@@ -107,7 +107,7 @@
         C4467: usage of ATL attributes is deprecated
           Conhost code still uses ATL.
       -->
-      <DisableSpecificWarnings>4103;4201;4312;4467;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4103;4201;4312;4467;5105;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <PreprocessorDefinitions>_WINDOWS;EXTERNAL_BUILD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
       <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
@@ -117,6 +117,7 @@
       <MinimalRebuild>false</MinimalRebuild>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard_C>stdc17</LanguageStandard_C>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <FloatingPointModel>Fast</FloatingPointModel>
diff --git a/src/cppwinrt.build.pre.props b/src/cppwinrt.build.pre.props
index 4587ab3ead8..2022dbc7f51 100644
--- a/src/cppwinrt.build.pre.props
+++ b/src/cppwinrt.build.pre.props
@@ -75,7 +75,7 @@
       <ConformanceMode>true</ConformanceMode>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
       <AdditionalOptions>%(AdditionalOptions) /bigobj /Zc:twoPhase-</AdditionalOptions>
-      <DisableSpecificWarnings>5104;5105;28204;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>5104;28204;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 
       <AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
     </ClCompile>
diff --git a/src/host/proxy/Host.Proxy.vcxproj b/src/host/proxy/Host.Proxy.vcxproj
index 45fc697f255..5888ce0c3cc 100644
--- a/src/host/proxy/Host.Proxy.vcxproj
+++ b/src/host/proxy/Host.Proxy.vcxproj
@@ -11,7 +11,7 @@
   <Import Project="$(SolutionDir)src\common.build.pre.props" />
   <ItemGroup>
     <Midl Include="IConsoleHandoff.idl">
-      <!-- 
+      <!--
         In Razzle, IDL files generate %FileName%.h
         In Visual Studio, IDL files generate %FileName%_h.h
         Visual Studio is easier to override than Razzle.
@@ -31,6 +31,7 @@
   <ItemGroup>
     <ClInclude Include="$(IntDir)\IConsoleHandoff.h" />
     <ClInclude Include="$(IntDir)\ITerminalHandoff.h" />
+    <ClInclude Include="nodefaultlib_shim.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(IntDir)\dlldata.c" />
@@ -56,16 +57,26 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CallingConvention>StdCall</CallingConvention>
+      <AdditionalIncludeDirectories>.;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <CallingConvention Condition="'$(Platform)'!='ARM64'">StdCall</CallingConvention>
       <!-- Must be Stdcall on all platforms to resolve _ObjectStublessClient3 -->
       <PreprocessorDefinitions>REGISTER_PROXY_DLL;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <SDLCheck>false</SDLCheck>
+      <ForcedIncludeFiles>nodefaultlib_shim.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
     </ClCompile>
     <Link>
       <ModuleDefinitionFile>OpenConsoleProxy.def</ModuleDefinitionFile>
+      <!--
+        Not depending on the CRT cuts binary size by half and prevents issues if this DLL
+        is copied elsewhere and executed outside of our app package without our bundled CRT present.
+      -->
+      <AdditionalDependencies />
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+      <EntryPointSymbol>DllMain</EntryPointSymbol>
     </Link>
   </ItemDefinitionGroup>
   <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
   <Import Project="$(SolutionDir)src\common.build.post.props" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/host/proxy/Host.Proxy.vcxproj.filters b/src/host/proxy/Host.Proxy.vcxproj.filters
index df6bcbd10c6..1cdf7ca2512 100644
--- a/src/host/proxy/Host.Proxy.vcxproj.filters
+++ b/src/host/proxy/Host.Proxy.vcxproj.filters
@@ -41,6 +41,9 @@
     <ClInclude Include="$(IntDir)\ITerminalHandoff.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="nodefaultlib_shim.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Midl Include="IConsoleHandoff.idl">
diff --git a/src/host/proxy/nodefaultlib_shim.h b/src/host/proxy/nodefaultlib_shim.h
new file mode 100644
index 00000000000..09c0ad53c8e
--- /dev/null
+++ b/src/host/proxy/nodefaultlib_shim.h
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include <guiddef.h>
+
+#if !defined(_M_IX86) && !defined(_M_X64)
+
+// ARM64 doesn't define a (__builtin_)memcmp function without CRT,
+// but we need one to compile IID_GENERIC_CHECK_IID.
+// Luckily we only ever use memcmp for IIDs.
+#pragma function(memcmp)
+inline int memcmp(const IID* a, const IID* b, size_t count)
+{
+    (void)(count);
+    return 1 - InlineIsEqualGUID(a, b);
+}
+
+#endif

From a916a5d9de450bc6a008d257d3c5c5cfd27e07ec Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Tue, 26 Oct 2021 15:12:22 -0500
Subject: [PATCH 09/16] Make sure the infobar is inserted before the tab
 content, not on top of (#11609)

Fixes #11606

This is weird, but the infobars would appear totally on top of the
TerminalPage when `showTabsInTitlebar:false`. This would result in the infobar
obscuring the tabs.

Now, the infobars are strictly inserted after the tabs, before the content. So
when they appear, they will reduce the amount of space usable for the control.
That is a little annoying, but preferable to the tabs totally not existing.

Relevant conversation notes from #10798:

> > If the info bar is not local to the tab, then its location between the tab
> > bar (when the title bar is hidden) and the terminal panes feels
> > misleading. Should it instead be above the tab bar or below the terminal
> > panes?
>
> You're... not wrong here. It's maybe not the best place for it, but _on top_
> of the tabs would look insane, and probably wouldn't even work easily, given
> the way we reparent the tab row into the titlebar.
>
> In the pane itself would make more sense, but that runs abreast of all sorts
> of things like #9024, #4998, which might make more sense.

I'm just gonna go with this now, because it's _better_ than before, while we
work out what's _best_.

![gh-11606-fix](https://user-images.githubusercontent.com/18356694/138729178-b96b7003-0dd2-4521-8fff-0fd2a5989f22.gif)
---
 src/cascadia/TerminalApp/TerminalPage.xaml | 87 +++++++++++-----------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/src/cascadia/TerminalApp/TerminalPage.xaml b/src/cascadia/TerminalApp/TerminalPage.xaml
index ef16f6a7a0e..6c07054370d 100644
--- a/src/cascadia/TerminalApp/TerminalPage.xaml
+++ b/src/cascadia/TerminalApp/TerminalPage.xaml
@@ -15,6 +15,7 @@
     <Grid x:Name="Root"
           Background="Transparent">
         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
@@ -22,8 +23,50 @@
         <local:TabRowControl x:Name="TabRow"
                              Grid.Row="0" />
 
+        <StackPanel Grid.Row="1">
+            <mux:InfoBar x:Name="KeyboardServiceWarningInfoBar"
+                         x:Load="False"
+                         IsClosable="True"
+                         IsIconVisible="True"
+                         IsOpen="False"
+                         Message="{x:Bind KeyboardServiceDisabledText, Mode=OneWay}"
+                         Severity="Warning">
+                <mux:InfoBar.ActionButton>
+                    <Button x:Uid="InfoBarDismissButton"
+                            Click="_KeyboardServiceWarningInfoDismissHandler" />
+                </mux:InfoBar.ActionButton>
+            </mux:InfoBar>
+
+            <mux:InfoBar x:Name="CloseOnExitInfoBar"
+                         x:Uid="CloseOnExitInfoBar"
+                         x:Load="False"
+                         IsClosable="True"
+                         IsIconVisible="True"
+                         IsOpen="False"
+                         Severity="Informational">
+                <mux:InfoBar.ActionButton>
+                    <Button x:Uid="InfoBarDismissButton"
+                            Click="_CloseOnExitInfoDismissHandler" />
+                </mux:InfoBar.ActionButton>
+            </mux:InfoBar>
+
+            <mux:InfoBar x:Name="SetAsDefaultInfoBar"
+                         x:Uid="SetAsDefaultInfoBar"
+                         x:Load="False"
+                         CloseButtonClick="_SetAsDefaultDismissHandler"
+                         IsClosable="True"
+                         IsIconVisible="True"
+                         IsOpen="False"
+                         Severity="Informational">
+                <mux:InfoBar.ActionButton>
+                    <HyperlinkButton x:Uid="SetAsDefaultTip_OpenSettingsLink"
+                                     Click="_SetAsDefaultOpenSettingsHandler" />
+                </mux:InfoBar.ActionButton>
+            </mux:InfoBar>
+        </StackPanel>
+
         <Grid x:Name="TabContent"
-              Grid.Row="1"
+              Grid.Row="2"
               HorizontalAlignment="Stretch"
               VerticalAlignment="Stretch" />
 
@@ -115,48 +158,6 @@
                               PreviewKeyDown="_KeyDownHandler"
                               Visibility="Collapsed" />
 
-        <StackPanel>
-            <mux:InfoBar x:Name="KeyboardServiceWarningInfoBar"
-                         x:Load="False"
-                         IsClosable="True"
-                         IsIconVisible="True"
-                         IsOpen="False"
-                         Message="{x:Bind KeyboardServiceDisabledText, Mode=OneWay}"
-                         Severity="Warning">
-                <mux:InfoBar.ActionButton>
-                    <Button x:Uid="InfoBarDismissButton"
-                            Click="_KeyboardServiceWarningInfoDismissHandler" />
-                </mux:InfoBar.ActionButton>
-            </mux:InfoBar>
-
-            <mux:InfoBar x:Name="CloseOnExitInfoBar"
-                         x:Uid="CloseOnExitInfoBar"
-                         x:Load="False"
-                         IsClosable="True"
-                         IsIconVisible="True"
-                         IsOpen="False"
-                         Severity="Informational">
-                <mux:InfoBar.ActionButton>
-                    <Button x:Uid="InfoBarDismissButton"
-                            Click="_CloseOnExitInfoDismissHandler" />
-                </mux:InfoBar.ActionButton>
-            </mux:InfoBar>
-
-            <mux:InfoBar x:Name="SetAsDefaultInfoBar"
-                         x:Uid="SetAsDefaultInfoBar"
-                         x:Load="False"
-                         CloseButtonClick="_SetAsDefaultDismissHandler"
-                         IsClosable="True"
-                         IsIconVisible="True"
-                         IsOpen="False"
-                         Severity="Informational">
-                <mux:InfoBar.ActionButton>
-                    <HyperlinkButton x:Uid="SetAsDefaultTip_OpenSettingsLink"
-                                     Click="_SetAsDefaultOpenSettingsHandler" />
-                </mux:InfoBar.ActionButton>
-            </mux:InfoBar>
-        </StackPanel>
-
         <!--
             A TeachingTip with IsLightDismissEnabled="True" will immediately
             dismiss itself if the window is unfocused (In Xaml Islands). This is

From 7b7dea009c268dcb5929409234449c028bde0649 Mon Sep 17 00:00:00 2001
From: James Holderness <j4_james@hotmail.com>
Date: Tue, 26 Oct 2021 22:12:22 +0100
Subject: [PATCH 10/16] Consolidate the interfaces for setting VT input modes
 (#11384)

Instead of having a separate method for setting each mouse and keyboard
mode, this PR consolidates them all into a single method which takes a
mode parameter, and stores the modes in a `til::enumset` rather than
having a separate `bool` for each mode.

This enables us to get rid of a lot of boilerplate code, and makes the
code easier to extend when we want to introduce additional modes in the
future. It'll also makes it easier to read back the state of the various
modes when implementing the `DECRQM` query.

Most of the complication is in the `TerminalInput` class, which had to
be adjusted to work with an `enumset` in place of all the `bool` fields.
For the rest, it was largely a matter of replacing calls to all the old
mode setting methods with the new `SetInputMode` method, and deleting a
bunch of unused code.

One thing worth mentioning is that the `AdaptDispatch` implementation
used to have a `_ShouldPassThroughInputModeChange` method that was
called after every mode change. This code has now been moved up into the
`SetInputMode` implementation in `ConhostInternalGetSet` so it's just
handled in one place. Keeping this out of the dispatch class will also
be beneficial for sharing the implementation with `TerminalDispatch`.

## Validation

The updated interface necessitated some adjustments to the tests in
`AdapterTest` and `MouseInputTest`, but the essential structure of the
tests remains unchanged, and everything still passes.

I've also tested the keyboard and mouse modes in Vttest and confirmed
they still work at least as well as they did before (both conhost and
Windows Terminal), and I tested the alternate scroll mode manually
(conhost only).

Simplifying the `ConGetSet` and `ITerminalApi` is also part of the plan
to de-duplicate the `AdaptDispatch` and `TerminalDispatch`
implementation (#3849).
---
 src/cascadia/TerminalCore/ITerminalApi.hpp    |  12 +-
 src/cascadia/TerminalCore/Terminal.hpp        |  11 +-
 src/cascadia/TerminalCore/TerminalApi.cpp     |  54 +-----
 .../TerminalCore/TerminalDispatch.cpp         |  20 +--
 src/host/getset.cpp                           | 121 -------------
 src/host/getset.h                             |  11 --
 src/host/outputStream.cpp                     | 136 ++------------
 src/host/outputStream.hpp                     |  10 +-
 src/terminal/adapter/adaptDispatch.cpp        | 109 +-----------
 src/terminal/adapter/adaptDispatch.hpp        |   2 -
 src/terminal/adapter/conGetSet.hpp            |  12 +-
 .../adapter/ut_adapter/MouseInputTest.cpp     |  36 ++--
 .../adapter/ut_adapter/adapterTest.cpp        | 167 +++++-------------
 src/terminal/input/mouseInput.cpp             |  53 +++---
 src/terminal/input/mouseInputState.cpp        |  85 ---------
 src/terminal/input/terminalInput.cpp          |  35 ++--
 src/terminal/input/terminalInput.hpp          |  59 +++----
 17 files changed, 181 insertions(+), 752 deletions(-)

diff --git a/src/cascadia/TerminalCore/ITerminalApi.hpp b/src/cascadia/TerminalCore/ITerminalApi.hpp
index 24e484ddfa7..3f09cea8f02 100644
--- a/src/cascadia/TerminalCore/ITerminalApi.hpp
+++ b/src/cascadia/TerminalCore/ITerminalApi.hpp
@@ -3,6 +3,7 @@
 #pragma once
 
 #include "../../terminal/adapter/DispatchTypes.hpp"
+#include "../../terminal/input/terminalInput.hpp"
 #include "../../buffer/out/TextAttribute.hpp"
 #include "../../types/inc/Viewport.hpp"
 
@@ -47,16 +48,9 @@ namespace Microsoft::Terminal::Core
         virtual bool SetDefaultForeground(const DWORD color) noexcept = 0;
         virtual bool SetDefaultBackground(const DWORD color) noexcept = 0;
 
-        virtual bool EnableWin32InputMode(const bool win32InputMode) noexcept = 0;
-        virtual bool SetCursorKeysMode(const bool applicationMode) noexcept = 0;
-        virtual bool SetKeypadMode(const bool applicationMode) noexcept = 0;
+        virtual bool SetInputMode(const ::Microsoft::Console::VirtualTerminal::TerminalInput::Mode mode, const bool enabled) noexcept = 0;
+
         virtual bool SetScreenMode(const bool reverseMode) noexcept = 0;
-        virtual bool EnableVT200MouseMode(const bool enabled) noexcept = 0;
-        virtual bool EnableUTF8ExtendedMouseMode(const bool enabled) noexcept = 0;
-        virtual bool EnableSGRExtendedMouseMode(const bool enabled) noexcept = 0;
-        virtual bool EnableButtonEventMouseMode(const bool enabled) noexcept = 0;
-        virtual bool EnableAnyEventMouseMode(const bool enabled) noexcept = 0;
-        virtual bool EnableAlternateScrollMode(const bool enabled) noexcept = 0;
         virtual bool EnableXtermBracketedPasteMode(const bool enabled) noexcept = 0;
         virtual bool IsXtermBracketedPasteModeEnabled() const = 0;
 
diff --git a/src/cascadia/TerminalCore/Terminal.hpp b/src/cascadia/TerminalCore/Terminal.hpp
index 3a2f3dff175..5a7b0875165 100644
--- a/src/cascadia/TerminalCore/Terminal.hpp
+++ b/src/cascadia/TerminalCore/Terminal.hpp
@@ -112,16 +112,9 @@ class Microsoft::Terminal::Core::Terminal final :
     bool SetDefaultForeground(const COLORREF color) noexcept override;
     bool SetDefaultBackground(const COLORREF color) noexcept override;
 
-    bool EnableWin32InputMode(const bool win32InputMode) noexcept override;
-    bool SetCursorKeysMode(const bool applicationMode) noexcept override;
-    bool SetKeypadMode(const bool applicationMode) noexcept override;
+    bool SetInputMode(const ::Microsoft::Console::VirtualTerminal::TerminalInput::Mode mode, const bool enabled) noexcept override;
+
     bool SetScreenMode(const bool reverseMode) noexcept override;
-    bool EnableVT200MouseMode(const bool enabled) noexcept override;
-    bool EnableUTF8ExtendedMouseMode(const bool enabled) noexcept override;
-    bool EnableSGRExtendedMouseMode(const bool enabled) noexcept override;
-    bool EnableButtonEventMouseMode(const bool enabled) noexcept override;
-    bool EnableAnyEventMouseMode(const bool enabled) noexcept override;
-    bool EnableAlternateScrollMode(const bool enabled) noexcept override;
     bool EnableXtermBracketedPasteMode(const bool enabled) noexcept override;
     bool IsXtermBracketedPasteModeEnabled() const noexcept override;
 
diff --git a/src/cascadia/TerminalCore/TerminalApi.cpp b/src/cascadia/TerminalCore/TerminalApi.cpp
index 83c898e4757..455851ac8de 100644
--- a/src/cascadia/TerminalCore/TerminalApi.cpp
+++ b/src/cascadia/TerminalCore/TerminalApi.cpp
@@ -482,23 +482,13 @@ til::color Terminal::GetDefaultBackground() const noexcept
     return _defaultBg;
 }
 
-bool Terminal::EnableWin32InputMode(const bool win32InputMode) noexcept
-{
-    _terminalInput->ChangeWin32InputMode(win32InputMode);
-    return true;
-}
-
-bool Terminal::SetCursorKeysMode(const bool applicationMode) noexcept
-{
-    _terminalInput->ChangeCursorKeysMode(applicationMode);
-    return true;
-}
-
-bool Terminal::SetKeypadMode(const bool applicationMode) noexcept
+bool Terminal::SetInputMode(const TerminalInput::Mode mode, const bool enabled) noexcept
+try
 {
-    _terminalInput->ChangeKeypadMode(applicationMode);
+    _terminalInput->SetInputMode(mode, enabled);
     return true;
 }
+CATCH_RETURN_FALSE()
 
 bool Terminal::SetScreenMode(const bool reverseMode) noexcept
 try
@@ -511,42 +501,6 @@ try
 }
 CATCH_RETURN_FALSE()
 
-bool Terminal::EnableVT200MouseMode(const bool enabled) noexcept
-{
-    _terminalInput->EnableDefaultTracking(enabled);
-    return true;
-}
-
-bool Terminal::EnableUTF8ExtendedMouseMode(const bool enabled) noexcept
-{
-    _terminalInput->SetUtf8ExtendedMode(enabled);
-    return true;
-}
-
-bool Terminal::EnableSGRExtendedMouseMode(const bool enabled) noexcept
-{
-    _terminalInput->SetSGRExtendedMode(enabled);
-    return true;
-}
-
-bool Terminal::EnableButtonEventMouseMode(const bool enabled) noexcept
-{
-    _terminalInput->EnableButtonEventTracking(enabled);
-    return true;
-}
-
-bool Terminal::EnableAnyEventMouseMode(const bool enabled) noexcept
-{
-    _terminalInput->EnableAnyEventTracking(enabled);
-    return true;
-}
-
-bool Terminal::EnableAlternateScrollMode(const bool enabled) noexcept
-{
-    _terminalInput->EnableAlternateScroll(enabled);
-    return true;
-}
-
 bool Terminal::EnableXtermBracketedPasteMode(const bool enabled) noexcept
 {
     _bracketedPasteMode = enabled;
diff --git a/src/cascadia/TerminalCore/TerminalDispatch.cpp b/src/cascadia/TerminalCore/TerminalDispatch.cpp
index 725521f567a..414291cb0a1 100644
--- a/src/cascadia/TerminalCore/TerminalDispatch.cpp
+++ b/src/cascadia/TerminalCore/TerminalDispatch.cpp
@@ -321,9 +321,9 @@ CATCH_LOG_RETURN_FALSE()
 // - applicationMode - set to true to enable Application Mode Input, false for Numeric Mode Input.
 // Return Value:
 // - True if handled successfully. False otherwise.
-bool TerminalDispatch::SetKeypadMode(const bool fApplicationMode) noexcept
+bool TerminalDispatch::SetKeypadMode(const bool applicationMode) noexcept
 {
-    _terminalApi.SetKeypadMode(fApplicationMode);
+    _terminalApi.SetInputMode(TerminalInput::Mode::Keypad, applicationMode);
     return true;
 }
 
@@ -334,7 +334,7 @@ bool TerminalDispatch::SetKeypadMode(const bool fApplicationMode) noexcept
 // - True if handled successfully. False otherwise.
 bool TerminalDispatch::SetCursorKeysMode(const bool applicationMode) noexcept
 {
-    _terminalApi.SetCursorKeysMode(applicationMode);
+    _terminalApi.SetInputMode(TerminalInput::Mode::CursorKey, applicationMode);
     return true;
 }
 
@@ -359,7 +359,7 @@ bool TerminalDispatch::SetScreenMode(const bool reverseMode) noexcept
 // - True if handled successfully. False otherwise.
 bool TerminalDispatch::EnableWin32InputMode(const bool win32Mode) noexcept
 {
-    _terminalApi.EnableWin32InputMode(win32Mode);
+    _terminalApi.SetInputMode(TerminalInput::Mode::Win32, win32Mode);
     return true;
 }
 
@@ -371,7 +371,7 @@ bool TerminalDispatch::EnableWin32InputMode(const bool win32Mode) noexcept
 // True if handled successfully. False otherwise.
 bool TerminalDispatch::EnableVT200MouseMode(const bool enabled) noexcept
 {
-    _terminalApi.EnableVT200MouseMode(enabled);
+    _terminalApi.SetInputMode(TerminalInput::Mode::DefaultMouseTracking, enabled);
     return true;
 }
 
@@ -384,7 +384,7 @@ bool TerminalDispatch::EnableVT200MouseMode(const bool enabled) noexcept
 // True if handled successfully. False otherwise.
 bool TerminalDispatch::EnableUTF8ExtendedMouseMode(const bool enabled) noexcept
 {
-    _terminalApi.EnableUTF8ExtendedMouseMode(enabled);
+    _terminalApi.SetInputMode(TerminalInput::Mode::Utf8MouseEncoding, enabled);
     return true;
 }
 
@@ -397,7 +397,7 @@ bool TerminalDispatch::EnableUTF8ExtendedMouseMode(const bool enabled) noexcept
 // True if handled successfully. False otherwise.
 bool TerminalDispatch::EnableSGRExtendedMouseMode(const bool enabled) noexcept
 {
-    _terminalApi.EnableSGRExtendedMouseMode(enabled);
+    _terminalApi.SetInputMode(TerminalInput::Mode::SgrMouseEncoding, enabled);
     return true;
 }
 
@@ -409,7 +409,7 @@ bool TerminalDispatch::EnableSGRExtendedMouseMode(const bool enabled) noexcept
 // True if handled successfully. False otherwise.
 bool TerminalDispatch::EnableButtonEventMouseMode(const bool enabled) noexcept
 {
-    _terminalApi.EnableButtonEventMouseMode(enabled);
+    _terminalApi.SetInputMode(TerminalInput::Mode::ButtonEventMouseTracking, enabled);
     return true;
 }
 
@@ -422,7 +422,7 @@ bool TerminalDispatch::EnableButtonEventMouseMode(const bool enabled) noexcept
 // True if handled successfully. False otherwise.
 bool TerminalDispatch::EnableAnyEventMouseMode(const bool enabled) noexcept
 {
-    _terminalApi.EnableAnyEventMouseMode(enabled);
+    _terminalApi.SetInputMode(TerminalInput::Mode::AnyEventMouseTracking, enabled);
     return true;
 }
 
@@ -435,7 +435,7 @@ bool TerminalDispatch::EnableAnyEventMouseMode(const bool enabled) noexcept
 // True if handled successfully. False otherwise.
 bool TerminalDispatch::EnableAlternateScroll(const bool enabled) noexcept
 {
-    _terminalApi.EnableAlternateScrollMode(enabled);
+    _terminalApi.SetInputMode(TerminalInput::Mode::AlternateScroll, enabled);
     return true;
 }
 
diff --git a/src/host/getset.cpp b/src/host/getset.cpp
index c4e32b015d9..5ee114e6d82 100644
--- a/src/host/getset.cpp
+++ b/src/host/getset.cpp
@@ -1248,55 +1248,6 @@ void ApiRoutines::GetConsoleDisplayModeImpl(ULONG& flags) noexcept
     CATCH_RETURN();
 }
 
-// Routine Description:
-// - A private API call for changing the cursor keys input mode between normal and application mode.
-//     The cursor keys are the arrows, plus Home and End.
-// Parameters:
-// - fApplicationMode - set to true to enable Application Mode Input, false for Numeric Mode Input.
-// Return value:
-// - True if handled successfully. False otherwise.
-[[nodiscard]] NTSTATUS DoSrvPrivateSetCursorKeysMode(_In_ bool fApplicationMode)
-{
-    CONSOLE_INFORMATION& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
-    if (gci.pInputBuffer == nullptr)
-    {
-        return STATUS_UNSUCCESSFUL;
-    }
-    gci.pInputBuffer->GetTerminalInput().ChangeCursorKeysMode(fApplicationMode);
-    return STATUS_SUCCESS;
-}
-
-// Routine Description:
-// - A private API call for changing the keypad input mode between numeric and application mode.
-//     This controls what the keys on the numpad translate to.
-// Parameters:
-// - fApplicationMode - set to true to enable Application Mode Input, false for Numeric Mode Input.
-// Return value:
-// - True if handled successfully. False otherwise.
-[[nodiscard]] NTSTATUS DoSrvPrivateSetKeypadMode(_In_ bool fApplicationMode)
-{
-    CONSOLE_INFORMATION& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
-    if (gci.pInputBuffer == nullptr)
-    {
-        return STATUS_UNSUCCESSFUL;
-    }
-    gci.pInputBuffer->GetTerminalInput().ChangeKeypadMode(fApplicationMode);
-    return STATUS_SUCCESS;
-}
-
-// Function Description:
-// - A private API call which enables/disables sending full input records
-//   encoded as a string of characters to the client application.
-// Parameters:
-// - win32InputMode - set to true to enable win32-input-mode, false to disable.
-// Return value:
-// - <none>
-void DoSrvPrivateEnableWin32InputMode(const bool win32InputMode)
-{
-    CONSOLE_INFORMATION& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
-    gci.pInputBuffer->GetTerminalInput().ChangeWin32InputMode(win32InputMode);
-}
-
 // Routine Description:
 // - A private API call for changing the screen mode between normal and reverse.
 //    When in reverse screen mode, the background and foreground colors are switched.
@@ -1525,78 +1476,6 @@ void DoSrvPrivateUseMainScreenBuffer(SCREEN_INFORMATION& screenInfo)
     screenInfo.GetActiveBuffer().UseMainScreenBuffer();
 }
 
-// Routine Description:
-// - A private API call for enabling VT200 style mouse mode.
-// Parameters:
-// - fEnable - true to enable default tracking mode, false to disable mouse mode.
-// Return value:
-// - None
-void DoSrvPrivateEnableVT200MouseMode(const bool fEnable)
-{
-    CONSOLE_INFORMATION& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
-    gci.GetActiveInputBuffer()->GetTerminalInput().EnableDefaultTracking(fEnable);
-}
-
-// Routine Description:
-// - A private API call for enabling utf8 style mouse mode.
-// Parameters:
-// - fEnable - true to enable, false to disable.
-// Return value:
-// - None
-void DoSrvPrivateEnableUTF8ExtendedMouseMode(const bool fEnable)
-{
-    CONSOLE_INFORMATION& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
-    gci.GetActiveInputBuffer()->GetTerminalInput().SetUtf8ExtendedMode(fEnable);
-}
-
-// Routine Description:
-// - A private API call for enabling SGR style mouse mode.
-// Parameters:
-// - fEnable - true to enable, false to disable.
-// Return value:
-// - None
-void DoSrvPrivateEnableSGRExtendedMouseMode(const bool fEnable)
-{
-    CONSOLE_INFORMATION& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
-    gci.GetActiveInputBuffer()->GetTerminalInput().SetSGRExtendedMode(fEnable);
-}
-
-// Routine Description:
-// - A private API call for enabling button-event mouse mode.
-// Parameters:
-// - fEnable - true to enable button-event mode, false to disable mouse mode.
-// Return value:
-// - None
-void DoSrvPrivateEnableButtonEventMouseMode(const bool fEnable)
-{
-    CONSOLE_INFORMATION& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
-    gci.GetActiveInputBuffer()->GetTerminalInput().EnableButtonEventTracking(fEnable);
-}
-
-// Routine Description:
-// - A private API call for enabling any-event mouse mode.
-// Parameters:
-// - fEnable - true to enable any-event mode, false to disable mouse mode.
-// Return value:
-// - None
-void DoSrvPrivateEnableAnyEventMouseMode(const bool fEnable)
-{
-    CONSOLE_INFORMATION& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
-    gci.GetActiveInputBuffer()->GetTerminalInput().EnableAnyEventTracking(fEnable);
-}
-
-// Routine Description:
-// - A private API call for enabling alternate scroll mode
-// Parameters:
-// - fEnable - true to enable alternate scroll mode, false to disable.
-// Return value:
-// None
-void DoSrvPrivateEnableAlternateScroll(const bool fEnable)
-{
-    CONSOLE_INFORMATION& gci = ServiceLocator::LocateGlobals().getConsoleInformation();
-    gci.GetActiveInputBuffer()->GetTerminalInput().EnableAlternateScroll(fEnable);
-}
-
 // Routine Description:
 // - A private API call for performing a VT-style erase all operation on the buffer.
 //      See SCREEN_INFORMATION::VtEraseAll's description for details.
diff --git a/src/host/getset.h b/src/host/getset.h
index e4c5395809a..5a084d206ab 100644
--- a/src/host/getset.h
+++ b/src/host/getset.h
@@ -18,10 +18,6 @@ Revision History:
 #include "../inc/conattrs.hpp"
 class SCREEN_INFORMATION;
 
-[[nodiscard]] NTSTATUS DoSrvPrivateSetCursorKeysMode(_In_ bool fApplicationMode);
-[[nodiscard]] NTSTATUS DoSrvPrivateSetKeypadMode(_In_ bool fApplicationMode);
-void DoSrvPrivateEnableWin32InputMode(const bool win32InputMode);
-
 [[nodiscard]] NTSTATUS DoSrvPrivateSetScreenMode(const bool reverseMode);
 [[nodiscard]] NTSTATUS DoSrvPrivateSetAutoWrapMode(const bool wrapAtEOL);
 
@@ -35,13 +31,6 @@ void DoSrvPrivateAllowCursorBlinking(SCREEN_INFORMATION& screenInfo, const bool
 [[nodiscard]] NTSTATUS DoSrvPrivateUseAlternateScreenBuffer(SCREEN_INFORMATION& screenInfo);
 void DoSrvPrivateUseMainScreenBuffer(SCREEN_INFORMATION& screenInfo);
 
-void DoSrvPrivateEnableVT200MouseMode(const bool fEnable);
-void DoSrvPrivateEnableUTF8ExtendedMouseMode(const bool fEnable);
-void DoSrvPrivateEnableSGRExtendedMouseMode(const bool fEnable);
-void DoSrvPrivateEnableButtonEventMouseMode(const bool fEnable);
-void DoSrvPrivateEnableAnyEventMouseMode(const bool fEnable);
-void DoSrvPrivateEnableAlternateScroll(const bool fEnable);
-
 [[nodiscard]] HRESULT DoSrvPrivateEraseAll(SCREEN_INFORMATION& screenInfo);
 [[nodiscard]] HRESULT DoSrvPrivateClearBuffer(SCREEN_INFORMATION& screenInfo);
 
diff --git a/src/host/outputStream.cpp b/src/host/outputStream.cpp
index bc15c1cdf6c..c6c0f98684f 100644
--- a/src/host/outputStream.cpp
+++ b/src/host/outputStream.cpp
@@ -15,6 +15,7 @@
 
 using namespace Microsoft::Console;
 using Microsoft::Console::Interactivity::ServiceLocator;
+using Microsoft::Console::VirtualTerminal::TerminalInput;
 
 WriteBuffer::WriteBuffer(_In_ Microsoft::Console::IIoProvider& io) :
     _io{ io },
@@ -237,43 +238,28 @@ bool ConhostInternalGetSet::SetConsoleWindowInfo(const bool absolute, const SMAL
 }
 
 // Routine Description:
-// - Connects the PrivateSetCursorKeysMode call directly into our Driver Message servicing call inside Conhost.exe
-//   PrivateSetCursorKeysMode is an internal-only "API" call that the vt commands can execute,
+// - Sets the various terminal input modes.
+//   SetInputMode is an internal-only "API" call that the vt commands can execute,
 //     but it is not represented as a function call on out public API surface.
 // Arguments:
-// - fApplicationMode - set to true to enable Application Mode Input, false for Normal Mode.
+// - mode - the input mode to change.
+// - enabled - set to true to enable the mode, false to disable it.
 // Return Value:
-// - true if successful (see DoSrvPrivateSetCursorKeysMode). false otherwise.
-bool ConhostInternalGetSet::PrivateSetCursorKeysMode(const bool fApplicationMode)
-{
-    return NT_SUCCESS(DoSrvPrivateSetCursorKeysMode(fApplicationMode));
-}
-
-// Routine Description:
-// - Connects the PrivateSetKeypadMode call directly into our Driver Message servicing call inside Conhost.exe
-//   PrivateSetKeypadMode is an internal-only "API" call that the vt commands can execute,
-//     but it is not represented as a function call on out public API surface.
-// Arguments:
-// - fApplicationMode - set to true to enable Application Mode Input, false for Numeric Mode.
-// Return Value:
-// - true if successful (see DoSrvPrivateSetKeypadMode). false otherwise.
-bool ConhostInternalGetSet::PrivateSetKeypadMode(const bool fApplicationMode)
+// - true if successful. false otherwise.
+bool ConhostInternalGetSet::SetInputMode(const TerminalInput::Mode mode, const bool enabled)
 {
-    return NT_SUCCESS(DoSrvPrivateSetKeypadMode(fApplicationMode));
-}
+    auto& terminalInput = _io.GetActiveInputBuffer()->GetTerminalInput();
+    terminalInput.SetInputMode(mode, enabled);
 
-// Routine Description:
-// - Connects the PrivateEnableWin32InputMode call directly into our Driver Message servicing call inside Conhost.exe
-//   PrivateEnableWin32InputMode is an internal-only "API" call that the vt commands can execute,
-//     but it is not represented as a function call on out public API surface.
-// Arguments:
-// - win32InputMode - set to true to enable win32-input-mode, false to disable.
-// Return Value:
-// - true always
-bool ConhostInternalGetSet::PrivateEnableWin32InputMode(const bool win32InputMode)
-{
-    DoSrvPrivateEnableWin32InputMode(win32InputMode);
-    return true;
+    // If we're a conpty, AND WE'RE IN VT INPUT MODE, always pass input mode requests
+    // The VT Input mode check is to work around ssh.exe v7.7, which uses VT
+    // output, but not Input.
+    // The original comment said, "Once the conpty supports these types of input,
+    // this check can be removed. See GH#4911". Unfortunately, time has shown
+    // us that SSH 7.7 _also_ requests mouse input and that can have a user interface
+    // impact on the actual connected terminal. We can't remove this check,
+    // because SSH <=7.7 is out in the wild on all versions of Windows <=2004.
+    return !(IsConsolePty() && PrivateIsVtInputEnabled());
 }
 
 // Routine Description:
@@ -289,7 +275,7 @@ bool ConhostInternalGetSet::PrivateSetAnsiMode(const bool ansiMode)
     auto& stateMachine = _io.GetActiveOutputBuffer().GetStateMachine();
     stateMachine.SetAnsiMode(ansiMode);
     auto& terminalInput = _io.GetActiveInputBuffer()->GetTerminalInput();
-    terminalInput.ChangeAnsiMode(ansiMode);
+    terminalInput.SetInputMode(TerminalInput::Mode::Ansi, ansiMode);
     return true;
 }
 
@@ -448,90 +434,6 @@ bool ConhostInternalGetSet::PrivateUseMainScreenBuffer()
     return true;
 }
 
-// Routine Description:
-// - Connects the PrivateEnableVT200MouseMode call directly into our Driver Message servicing call inside Conhost.exe
-//   PrivateEnableVT200MouseMode is an internal-only "API" call that the vt commands can execute,
-//     but it is not represented as a function call on out public API surface.
-// Arguments:
-// - enabled - set to true to enable vt200 mouse mode, false to disable
-// Return Value:
-// - true if successful (see DoSrvPrivateEnableVT200MouseMode). false otherwise.
-bool ConhostInternalGetSet::PrivateEnableVT200MouseMode(const bool enabled)
-{
-    DoSrvPrivateEnableVT200MouseMode(enabled);
-    return true;
-}
-
-// Routine Description:
-// - Connects the PrivateEnableUTF8ExtendedMouseMode call directly into our Driver Message servicing call inside Conhost.exe
-//   PrivateEnableUTF8ExtendedMouseMode is an internal-only "API" call that the vt commands can execute,
-//     but it is not represented as a function call on out public API surface.
-// Arguments:
-// - enabled - set to true to enable utf8 extended mouse mode, false to disable
-// Return Value:
-// - true if successful (see DoSrvPrivateEnableUTF8ExtendedMouseMode). false otherwise.
-bool ConhostInternalGetSet::PrivateEnableUTF8ExtendedMouseMode(const bool enabled)
-{
-    DoSrvPrivateEnableUTF8ExtendedMouseMode(enabled);
-    return true;
-}
-
-// Routine Description:
-// - Connects the PrivateEnableSGRExtendedMouseMode call directly into our Driver Message servicing call inside Conhost.exe
-//   PrivateEnableSGRExtendedMouseMode is an internal-only "API" call that the vt commands can execute,
-//     but it is not represented as a function call on out public API surface.
-// Arguments:
-// - enabled - set to true to enable SGR extended mouse mode, false to disable
-// Return Value:
-// - true if successful (see DoSrvPrivateEnableSGRExtendedMouseMode). false otherwise.
-bool ConhostInternalGetSet::PrivateEnableSGRExtendedMouseMode(const bool enabled)
-{
-    DoSrvPrivateEnableSGRExtendedMouseMode(enabled);
-    return true;
-}
-
-// Routine Description:
-// - Connects the PrivateEnableButtonEventMouseMode call directly into our Driver Message servicing call inside Conhost.exe
-//   PrivateEnableButtonEventMouseMode is an internal-only "API" call that the vt commands can execute,
-//     but it is not represented as a function call on out public API surface.
-// Arguments:
-// - enabled - set to true to enable button-event mouse mode, false to disable
-// Return Value:
-// - true if successful (see DoSrvPrivateEnableButtonEventMouseMode). false otherwise.
-bool ConhostInternalGetSet::PrivateEnableButtonEventMouseMode(const bool enabled)
-{
-    DoSrvPrivateEnableButtonEventMouseMode(enabled);
-    return true;
-}
-
-// Routine Description:
-// - Connects the PrivateEnableAnyEventMouseMode call directly into our Driver Message servicing call inside Conhost.exe
-//   PrivateEnableAnyEventMouseMode is an internal-only "API" call that the vt commands can execute,
-//     but it is not represented as a function call on out public API surface.
-// Arguments:
-// - enabled - set to true to enable any-event mouse mode, false to disable
-// Return Value:
-// - true if successful (see DoSrvPrivateEnableAnyEventMouseMode). false otherwise.
-bool ConhostInternalGetSet::PrivateEnableAnyEventMouseMode(const bool enabled)
-{
-    DoSrvPrivateEnableAnyEventMouseMode(enabled);
-    return true;
-}
-
-// Routine Description:
-// - Connects the PrivateEnableAlternateScroll call directly into our Driver Message servicing call inside Conhost.exe
-//   PrivateEnableAlternateScroll is an internal-only "API" call that the vt commands can execute,
-//     but it is not represented as a function call on out public API surface.
-// Arguments:
-// - enabled - set to true to enable alternate scroll mode, false to disable
-// Return Value:
-// - true if successful (see DoSrvPrivateEnableAnyEventMouseMode). false otherwise.
-bool ConhostInternalGetSet::PrivateEnableAlternateScroll(const bool enabled)
-{
-    DoSrvPrivateEnableAlternateScroll(enabled);
-    return true;
-}
-
 // Routine Description:
 // - Connects the PrivateEraseAll call directly into our Driver Message servicing call inside Conhost.exe
 //   PrivateEraseAll is an internal-only "API" call that the vt commands can execute,
diff --git a/src/host/outputStream.hpp b/src/host/outputStream.hpp
index 9df19446fb7..51300f3a1de 100644
--- a/src/host/outputStream.hpp
+++ b/src/host/outputStream.hpp
@@ -72,9 +72,7 @@ class ConhostInternalGetSet final : public Microsoft::Console::VirtualTerminal::
     bool SetConsoleWindowInfo(bool const absolute,
                               const SMALL_RECT& window) override;
 
-    bool PrivateSetCursorKeysMode(const bool applicationMode) override;
-    bool PrivateSetKeypadMode(const bool applicationMode) override;
-    bool PrivateEnableWin32InputMode(const bool win32InputMode) override;
+    bool SetInputMode(const Microsoft::Console::VirtualTerminal::TerminalInput::Mode mode, const bool enabled) override;
 
     bool PrivateSetAnsiMode(const bool ansiMode) override;
     bool PrivateSetScreenMode(const bool reverseMode) override;
@@ -97,12 +95,6 @@ class ConhostInternalGetSet final : public Microsoft::Console::VirtualTerminal::
 
     bool PrivateUseMainScreenBuffer() override;
 
-    bool PrivateEnableVT200MouseMode(const bool enabled) override;
-    bool PrivateEnableUTF8ExtendedMouseMode(const bool enabled) override;
-    bool PrivateEnableSGRExtendedMouseMode(const bool enabled) override;
-    bool PrivateEnableButtonEventMouseMode(const bool enabled) override;
-    bool PrivateEnableAnyEventMouseMode(const bool enabled) override;
-    bool PrivateEnableAlternateScroll(const bool enabled) override;
     bool PrivateEraseAll() override;
     bool PrivateClearBuffer() override;
 
diff --git a/src/terminal/adapter/adaptDispatch.cpp b/src/terminal/adapter/adaptDispatch.cpp
index 9bf49eeee26..49a3f71a9b8 100644
--- a/src/terminal/adapter/adaptDispatch.cpp
+++ b/src/terminal/adapter/adaptDispatch.cpp
@@ -1167,15 +1167,7 @@ bool AdaptDispatch::ResetMode(const DispatchTypes::ModeParams param)
 // - True if handled successfully. False otherwise.
 bool AdaptDispatch::SetKeypadMode(const bool fApplicationMode)
 {
-    bool success = true;
-    success = _pConApi->PrivateSetKeypadMode(fApplicationMode);
-
-    if (_ShouldPassThroughInputModeChange())
-    {
-        return false;
-    }
-
-    return success;
+    return _pConApi->SetInputMode(TerminalInput::Mode::Keypad, fApplicationMode);
 }
 
 // Method Description:
@@ -1187,15 +1179,7 @@ bool AdaptDispatch::SetKeypadMode(const bool fApplicationMode)
 // - True if handled successfully. False otherwise.
 bool AdaptDispatch::EnableWin32InputMode(const bool win32InputMode)
 {
-    bool success = true;
-    success = _pConApi->PrivateEnableWin32InputMode(win32InputMode);
-
-    if (_ShouldPassThroughInputModeChange())
-    {
-        return false;
-    }
-
-    return success;
+    return _pConApi->SetInputMode(TerminalInput::Mode::Win32, win32InputMode);
 }
 
 // - DECCKM - Sets the cursor keys input mode to either Application mode or Normal mode (true, false respectively)
@@ -1205,15 +1189,7 @@ bool AdaptDispatch::EnableWin32InputMode(const bool win32InputMode)
 // - True if handled successfully. False otherwise.
 bool AdaptDispatch::SetCursorKeysMode(const bool applicationMode)
 {
-    bool success = true;
-    success = _pConApi->PrivateSetCursorKeysMode(applicationMode);
-
-    if (_ShouldPassThroughInputModeChange())
-    {
-        return false;
-    }
-
-    return success;
+    return _pConApi->SetInputMode(TerminalInput::Mode::CursorKey, applicationMode);
 }
 
 // - att610 - Enables or disables the cursor blinking.
@@ -2096,15 +2072,7 @@ bool AdaptDispatch::EnableDECCOLMSupport(const bool enabled) noexcept
 // True if handled successfully. False otherwise.
 bool AdaptDispatch::EnableVT200MouseMode(const bool enabled)
 {
-    bool success = true;
-    success = _pConApi->PrivateEnableVT200MouseMode(enabled);
-
-    if (_ShouldPassThroughInputModeChange())
-    {
-        return false;
-    }
-
-    return success;
+    return _pConApi->SetInputMode(TerminalInput::Mode::DefaultMouseTracking, enabled);
 }
 
 //Routine Description:
@@ -2116,15 +2084,7 @@ bool AdaptDispatch::EnableVT200MouseMode(const bool enabled)
 // True if handled successfully. False otherwise.
 bool AdaptDispatch::EnableUTF8ExtendedMouseMode(const bool enabled)
 {
-    bool success = true;
-    success = _pConApi->PrivateEnableUTF8ExtendedMouseMode(enabled);
-
-    if (_ShouldPassThroughInputModeChange())
-    {
-        return false;
-    }
-
-    return success;
+    return _pConApi->SetInputMode(TerminalInput::Mode::Utf8MouseEncoding, enabled);
 }
 
 //Routine Description:
@@ -2136,15 +2096,7 @@ bool AdaptDispatch::EnableUTF8ExtendedMouseMode(const bool enabled)
 // True if handled successfully. False otherwise.
 bool AdaptDispatch::EnableSGRExtendedMouseMode(const bool enabled)
 {
-    bool success = true;
-    success = _pConApi->PrivateEnableSGRExtendedMouseMode(enabled);
-
-    if (_ShouldPassThroughInputModeChange())
-    {
-        return false;
-    }
-
-    return success;
+    return _pConApi->SetInputMode(TerminalInput::Mode::SgrMouseEncoding, enabled);
 }
 
 //Routine Description:
@@ -2155,15 +2107,7 @@ bool AdaptDispatch::EnableSGRExtendedMouseMode(const bool enabled)
 // True if handled successfully. False otherwise.
 bool AdaptDispatch::EnableButtonEventMouseMode(const bool enabled)
 {
-    bool success = true;
-    success = _pConApi->PrivateEnableButtonEventMouseMode(enabled);
-
-    if (_ShouldPassThroughInputModeChange())
-    {
-        return false;
-    }
-
-    return success;
+    return _pConApi->SetInputMode(TerminalInput::Mode::ButtonEventMouseTracking, enabled);
 }
 
 //Routine Description:
@@ -2175,15 +2119,7 @@ bool AdaptDispatch::EnableButtonEventMouseMode(const bool enabled)
 // True if handled successfully. False otherwise.
 bool AdaptDispatch::EnableAnyEventMouseMode(const bool enabled)
 {
-    bool success = true;
-    success = _pConApi->PrivateEnableAnyEventMouseMode(enabled);
-
-    if (_ShouldPassThroughInputModeChange())
-    {
-        return false;
-    }
-
-    return success;
+    return _pConApi->SetInputMode(TerminalInput::Mode::AnyEventMouseTracking, enabled);
 }
 
 //Routine Description:
@@ -2195,15 +2131,7 @@ bool AdaptDispatch::EnableAnyEventMouseMode(const bool enabled)
 // True if handled successfully. False otherwise.
 bool AdaptDispatch::EnableAlternateScroll(const bool enabled)
 {
-    bool success = true;
-    success = _pConApi->PrivateEnableAlternateScroll(enabled);
-
-    if (_ShouldPassThroughInputModeChange())
-    {
-        return false;
-    }
-
-    return success;
+    return _pConApi->SetInputMode(TerminalInput::Mode::AlternateScroll, enabled);
 }
 
 //Routine Description:
@@ -2672,22 +2600,3 @@ void AdaptDispatch::_ReportDECSTBMSetting() const
     response += L"r\033\\";
     _WriteResponse(response);
 }
-
-// Routine Description:
-// - Determines whether we should pass any sequence that manipulates
-//   TerminalInput's input generator through the PTY. It encapsulates
-//   a check for whether the PTY is in use.
-// Return value:
-// True if the request should be passed.
-bool AdaptDispatch::_ShouldPassThroughInputModeChange() const
-{
-    // If we're a conpty, AND WE'RE IN VT INPUT MODE, always pass input mode requests
-    // The VT Input mode check is to work around ssh.exe v7.7, which uses VT
-    // output, but not Input.
-    // The original comment said, "Once the conpty supports these types of input,
-    // this check can be removed. See GH#4911". Unfortunately, time has shown
-    // us that SSH 7.7 _also_ requests mouse input and that can have a user interface
-    // impact on the actual connected terminal. We can't remove this check,
-    // because SSH <=7.7 is out in the wild on all versions of Windows <=2004.
-    return _pConApi->IsConsolePty() && _pConApi->PrivateIsVtInputEnabled();
-}
diff --git a/src/terminal/adapter/adaptDispatch.hpp b/src/terminal/adapter/adaptDispatch.hpp
index b77345e51a7..da53109df00 100644
--- a/src/terminal/adapter/adaptDispatch.hpp
+++ b/src/terminal/adapter/adaptDispatch.hpp
@@ -194,8 +194,6 @@ namespace Microsoft::Console::VirtualTerminal
         void _ReportSGRSetting() const;
         void _ReportDECSTBMSetting() const;
 
-        bool _ShouldPassThroughInputModeChange() const;
-
         std::vector<bool> _tabStopColumns;
         bool _initDefaultTabStops = true;
 
diff --git a/src/terminal/adapter/conGetSet.hpp b/src/terminal/adapter/conGetSet.hpp
index 7576d38012b..db61551e3a8 100644
--- a/src/terminal/adapter/conGetSet.hpp
+++ b/src/terminal/adapter/conGetSet.hpp
@@ -15,6 +15,7 @@ Author(s):
 
 #pragma once
 
+#include "../input/terminalInput.hpp"
 #include "../../types/inc/IInputEvent.hpp"
 #include "../../buffer/out/LineRendition.hpp"
 #include "../../buffer/out/TextAttribute.hpp"
@@ -46,9 +47,8 @@ namespace Microsoft::Console::VirtualTerminal
                                                size_t& eventsWritten) = 0;
         virtual bool SetConsoleWindowInfo(const bool absolute,
                                           const SMALL_RECT& window) = 0;
-        virtual bool PrivateSetCursorKeysMode(const bool applicationMode) = 0;
-        virtual bool PrivateSetKeypadMode(const bool applicationMode) = 0;
-        virtual bool PrivateEnableWin32InputMode(const bool win32InputMode) = 0;
+
+        virtual bool SetInputMode(const TerminalInput::Mode mode, const bool enabled) = 0;
 
         virtual bool PrivateSetAnsiMode(const bool ansiMode) = 0;
         virtual bool PrivateSetScreenMode(const bool reverseMode) = 0;
@@ -66,12 +66,6 @@ namespace Microsoft::Console::VirtualTerminal
         virtual bool PrivateUseAlternateScreenBuffer() = 0;
         virtual bool PrivateUseMainScreenBuffer() = 0;
 
-        virtual bool PrivateEnableVT200MouseMode(const bool enabled) = 0;
-        virtual bool PrivateEnableUTF8ExtendedMouseMode(const bool enabled) = 0;
-        virtual bool PrivateEnableSGRExtendedMouseMode(const bool enabled) = 0;
-        virtual bool PrivateEnableButtonEventMouseMode(const bool enabled) = 0;
-        virtual bool PrivateEnableAnyEventMouseMode(const bool enabled) = 0;
-        virtual bool PrivateEnableAlternateScroll(const bool enabled) = 0;
         virtual bool PrivateEraseAll() = 0;
         virtual bool PrivateClearBuffer() = 0;
         virtual bool GetUserDefaultCursorStyle(CursorType& style) = 0;
diff --git a/src/terminal/adapter/ut_adapter/MouseInputTest.cpp b/src/terminal/adapter/ut_adapter/MouseInputTest.cpp
index b16288f2b04..6841c2782f4 100644
--- a/src/terminal/adapter/ut_adapter/MouseInputTest.cpp
+++ b/src/terminal/adapter/ut_adapter/MouseInputTest.cpp
@@ -298,7 +298,7 @@ class MouseInputTest
         s_pwszInputExpected = L"\x0";
         VERIFY_ARE_EQUAL(fExpectedKeyHandled, mouseInput->HandleMouse({ 0, 0 }, uiButton, sModifierKeystate, sScrollDelta, {}));
 
-        mouseInput->EnableDefaultTracking(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::DefaultMouseTracking, true);
 
         for (int i = 0; i < s_iTestCoordsLength; i++)
         {
@@ -318,7 +318,7 @@ class MouseInputTest
                              NoThrowString().Format(L"(x,y)=(%d,%d)", Coord.X, Coord.Y));
         }
 
-        mouseInput->EnableButtonEventTracking(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::ButtonEventMouseTracking, true);
         for (int i = 0; i < s_iTestCoordsLength; i++)
         {
             COORD Coord = s_rgTestCoords[i];
@@ -337,7 +337,7 @@ class MouseInputTest
                              NoThrowString().Format(L"(x,y)=(%d,%d)", Coord.X, Coord.Y));
         }
 
-        mouseInput->EnableAnyEventTracking(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::AnyEventMouseTracking, true);
         for (int i = 0; i < s_iTestCoordsLength; i++)
         {
             COORD Coord = s_rgTestCoords[i];
@@ -381,11 +381,11 @@ class MouseInputTest
         s_pwszInputExpected = L"\x0";
         VERIFY_ARE_EQUAL(fExpectedKeyHandled, mouseInput->HandleMouse({ 0, 0 }, uiButton, sModifierKeystate, sScrollDelta, {}));
 
-        mouseInput->SetUtf8ExtendedMode(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::Utf8MouseEncoding, true);
 
         short MaxCoord = SHORT_MAX - 33;
 
-        mouseInput->EnableDefaultTracking(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::DefaultMouseTracking, true);
         for (int i = 0; i < s_iTestCoordsLength; i++)
         {
             COORD Coord = s_rgTestCoords[i];
@@ -404,7 +404,7 @@ class MouseInputTest
                              NoThrowString().Format(L"(x,y)=(%d,%d)", Coord.X, Coord.Y));
         }
 
-        mouseInput->EnableButtonEventTracking(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::ButtonEventMouseTracking, true);
         for (int i = 0; i < s_iTestCoordsLength; i++)
         {
             COORD Coord = s_rgTestCoords[i];
@@ -423,7 +423,7 @@ class MouseInputTest
                              NoThrowString().Format(L"(x,y)=(%d,%d)", Coord.X, Coord.Y));
         }
 
-        mouseInput->EnableAnyEventTracking(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::AnyEventMouseTracking, true);
         for (int i = 0; i < s_iTestCoordsLength; i++)
         {
             COORD Coord = s_rgTestCoords[i];
@@ -467,13 +467,13 @@ class MouseInputTest
         s_pwszInputExpected = L"\x0";
         VERIFY_ARE_EQUAL(fExpectedKeyHandled, mouseInput->HandleMouse({ 0, 0 }, uiButton, sModifierKeystate, sScrollDelta, {}));
 
-        mouseInput->SetSGRExtendedMode(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::SgrMouseEncoding, true);
 
         // SGR Mode should be able to handle any arbitrary coords.
         // However, mouse moves are only handled in Any Event mode
         fExpectedKeyHandled = uiButton != WM_MOUSEMOVE;
 
-        mouseInput->EnableDefaultTracking(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::DefaultMouseTracking, true);
         for (int i = 0; i < s_iTestCoordsLength; i++)
         {
             COORD Coord = s_rgTestCoords[i];
@@ -487,7 +487,7 @@ class MouseInputTest
                              NoThrowString().Format(L"(x,y)=(%d,%d)", Coord.X, Coord.Y));
         }
 
-        mouseInput->EnableButtonEventTracking(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::ButtonEventMouseTracking, true);
         for (int i = 0; i < s_iTestCoordsLength; i++)
         {
             COORD Coord = s_rgTestCoords[i];
@@ -506,7 +506,7 @@ class MouseInputTest
         }
 
         fExpectedKeyHandled = true;
-        mouseInput->EnableAnyEventTracking(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::AnyEventMouseTracking, true);
         for (int i = 0; i < s_iTestCoordsLength; i++)
         {
             COORD Coord = s_rgTestCoords[i];
@@ -550,7 +550,7 @@ class MouseInputTest
         VERIFY_ARE_EQUAL(fExpectedKeyHandled, mouseInput->HandleMouse({ 0, 0 }, uiButton, sModifierKeystate, sScrollDelta, {}));
 
         // Default Tracking, Default Encoding
-        mouseInput->EnableDefaultTracking(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::DefaultMouseTracking, true);
 
         for (int i = 0; i < s_iTestCoordsLength; i++)
         {
@@ -571,7 +571,7 @@ class MouseInputTest
         }
 
         // Default Tracking, UTF8 Encoding
-        mouseInput->SetUtf8ExtendedMode(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::Utf8MouseEncoding, true);
         short MaxCoord = SHORT_MAX - 33;
         for (int i = 0; i < s_iTestCoordsLength; i++)
         {
@@ -592,7 +592,7 @@ class MouseInputTest
         }
 
         // Default Tracking, SGR Encoding
-        mouseInput->SetSGRExtendedMode(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::SgrMouseEncoding, true);
         fExpectedKeyHandled = true; // SGR Mode should be able to handle any arbitrary coords.
         for (int i = 0; i < s_iTestCoordsLength; i++)
         {
@@ -620,7 +620,7 @@ class MouseInputTest
 
         Log::Comment(L"Enable alternate scroll mode in the alt screen buffer");
         mouseInput->UseAlternateScreenBuffer();
-        mouseInput->EnableAlternateScroll(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::AlternateScroll, true);
 
         Log::Comment(L"Test mouse wheel scrolling up");
         s_pwszInputExpected = L"\x1B[A";
@@ -631,7 +631,7 @@ class MouseInputTest
         VERIFY_IS_TRUE(mouseInput->HandleMouse({ 0, 0 }, WM_MOUSEWHEEL, noModifierKeys, -WHEEL_DELTA, {}));
 
         Log::Comment(L"Enable cursor keys mode");
-        mouseInput->ChangeCursorKeysMode(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::CursorKey, true);
 
         Log::Comment(L"Test mouse wheel scrolling up");
         s_pwszInputExpected = L"\x1BOA";
@@ -643,12 +643,12 @@ class MouseInputTest
 
         Log::Comment(L"Confirm no effect when scroll mode is disabled");
         mouseInput->UseAlternateScreenBuffer();
-        mouseInput->EnableAlternateScroll(false);
+        mouseInput->SetInputMode(TerminalInput::Mode::AlternateScroll, false);
         VERIFY_IS_FALSE(mouseInput->HandleMouse({ 0, 0 }, WM_MOUSEWHEEL, noModifierKeys, WHEEL_DELTA, {}));
 
         Log::Comment(L"Confirm no effect when using the main buffer");
         mouseInput->UseMainScreenBuffer();
-        mouseInput->EnableAlternateScroll(true);
+        mouseInput->SetInputMode(TerminalInput::Mode::AlternateScroll, true);
         VERIFY_IS_FALSE(mouseInput->HandleMouse({ 0, 0 }, WM_MOUSEWHEEL, noModifierKeys, WHEEL_DELTA, {}));
     }
 };
diff --git a/src/terminal/adapter/ut_adapter/adapterTest.cpp b/src/terminal/adapter/ut_adapter/adapterTest.cpp
index 8760114225d..b775f4c7abe 100644
--- a/src/terminal/adapter/ut_adapter/adapterTest.cpp
+++ b/src/terminal/adapter/ut_adapter/adapterTest.cpp
@@ -112,35 +112,17 @@ class TestGetSet final : public ConGetSet
         return _setConsoleWindowInfoResult;
     }
 
-    bool PrivateSetCursorKeysMode(const bool applicationMode) override
+    bool SetInputMode(const TerminalInput::Mode mode, const bool enabled) override
     {
-        Log::Comment(L"PrivateSetCursorKeysMode MOCK called...");
+        Log::Comment(L"SetInputMode MOCK called...");
 
-        if (_privateSetCursorKeysModeResult)
+        if (_setInputModeResult)
         {
-            VERIFY_ARE_EQUAL(_cursorKeysApplicationMode, applicationMode);
+            VERIFY_ARE_EQUAL(_expectedInputMode, mode);
+            VERIFY_ARE_EQUAL(_expectedInputModeEnabled, enabled);
         }
 
-        return _privateSetCursorKeysModeResult;
-    }
-
-    bool PrivateSetKeypadMode(const bool applicationMode) override
-    {
-        Log::Comment(L"PrivateSetKeypadMode MOCK called...");
-
-        if (_privateSetKeypadModeResult)
-        {
-            VERIFY_ARE_EQUAL(_keypadApplicationMode, applicationMode);
-        }
-
-        return _privateSetKeypadModeResult;
-    }
-
-    bool PrivateEnableWin32InputMode(const bool /*win32InputMode*/) override
-    {
-        Log::Comment(L"PrivateEnableWin32InputMode MOCK called...");
-
-        return true;
+        return _setInputModeResult;
     }
 
     bool PrivateSetAnsiMode(const bool ansiMode) override
@@ -352,66 +334,6 @@ class TestGetSet final : public ConGetSet
         return true;
     }
 
-    bool PrivateEnableVT200MouseMode(const bool enabled) override
-    {
-        Log::Comment(L"PrivateEnableVT200MouseMode MOCK called...");
-        if (_privateEnableVT200MouseModeResult)
-        {
-            VERIFY_ARE_EQUAL(_expectedMouseEnabled, enabled);
-        }
-        return _privateEnableVT200MouseModeResult;
-    }
-
-    bool PrivateEnableUTF8ExtendedMouseMode(const bool enabled) override
-    {
-        Log::Comment(L"PrivateEnableUTF8ExtendedMouseMode MOCK called...");
-        if (_privateEnableUTF8ExtendedMouseModeResult)
-        {
-            VERIFY_ARE_EQUAL(_expectedMouseEnabled, enabled);
-        }
-        return _privateEnableUTF8ExtendedMouseModeResult;
-    }
-
-    bool PrivateEnableSGRExtendedMouseMode(const bool enabled) override
-    {
-        Log::Comment(L"PrivateEnableSGRExtendedMouseMode MOCK called...");
-        if (_privateEnableSGRExtendedMouseModeResult)
-        {
-            VERIFY_ARE_EQUAL(_expectedMouseEnabled, enabled);
-        }
-        return _privateEnableSGRExtendedMouseModeResult;
-    }
-
-    bool PrivateEnableButtonEventMouseMode(const bool enabled) override
-    {
-        Log::Comment(L"PrivateEnableButtonEventMouseMode MOCK called...");
-        if (_privateEnableButtonEventMouseModeResult)
-        {
-            VERIFY_ARE_EQUAL(_expectedMouseEnabled, enabled);
-        }
-        return _privateEnableButtonEventMouseModeResult;
-    }
-
-    bool PrivateEnableAnyEventMouseMode(const bool enabled) override
-    {
-        Log::Comment(L"PrivateEnableAnyEventMouseMode MOCK called...");
-        if (_privateEnableAnyEventMouseModeResult)
-        {
-            VERIFY_ARE_EQUAL(_expectedMouseEnabled, enabled);
-        }
-        return _privateEnableAnyEventMouseModeResult;
-    }
-
-    bool PrivateEnableAlternateScroll(const bool enabled) override
-    {
-        Log::Comment(L"PrivateEnableAlternateScroll MOCK called...");
-        if (_privateEnableAlternateScrollResult)
-        {
-            VERIFY_ARE_EQUAL(_expectedAlternateScrollEnabled, enabled);
-        }
-        return _privateEnableAlternateScrollResult;
-    }
-
     bool PrivateEraseAll() override
     {
         Log::Comment(L"PrivateEraseAll MOCK called...");
@@ -787,10 +709,9 @@ class TestGetSet final : public ConGetSet
 
     COORD _expectedScreenBufferSize = { 0, 0 };
     SMALL_RECT _expectedScreenBufferViewport{ 0, 0, 0, 0 };
-    bool _privateSetCursorKeysModeResult = false;
-    bool _privateSetKeypadModeResult = false;
-    bool _cursorKeysApplicationMode = false;
-    bool _keypadApplicationMode = false;
+    bool _setInputModeResult = false;
+    TerminalInput::Mode _expectedInputMode;
+    bool _expectedInputModeEnabled = false;
     bool _privateSetAnsiModeResult = false;
     bool _expectedAnsiMode = false;
     bool _privateAllowCursorBlinkingResult = false;
@@ -803,14 +724,6 @@ class TestGetSet final : public ConGetSet
 
     bool _setConsoleTitleWResult = false;
     std::wstring_view _expectedWindowTitle{};
-    bool _expectedMouseEnabled = false;
-    bool _expectedAlternateScrollEnabled = false;
-    bool _privateEnableVT200MouseModeResult = false;
-    bool _privateEnableUTF8ExtendedMouseModeResult = false;
-    bool _privateEnableSGRExtendedMouseModeResult = false;
-    bool _privateEnableButtonEventMouseModeResult = false;
-    bool _privateEnableAnyEventMouseModeResult = false;
-    bool _privateEnableAlternateScrollResult = false;
     bool _setCursorStyleResult = false;
     CursorType _expectedCursorStyle;
     bool _setCursorColorResult = false;
@@ -2100,15 +2013,17 @@ class AdapterTest
         // success cases
         // set numeric mode = true
         Log::Comment(L"Test 1: application mode = false");
-        _testGetSet->_privateSetCursorKeysModeResult = TRUE;
-        _testGetSet->_cursorKeysApplicationMode = false;
+        _testGetSet->_setInputModeResult = true;
+        _testGetSet->_expectedInputMode = TerminalInput::Mode::CursorKey;
+        _testGetSet->_expectedInputModeEnabled = false;
 
         VERIFY_IS_TRUE(_pDispatch.get()->SetCursorKeysMode(false));
 
         // set numeric mode = false
         Log::Comment(L"Test 2: application mode = true");
-        _testGetSet->_privateSetCursorKeysModeResult = TRUE;
-        _testGetSet->_cursorKeysApplicationMode = true;
+        _testGetSet->_setInputModeResult = true;
+        _testGetSet->_expectedInputMode = TerminalInput::Mode::CursorKey;
+        _testGetSet->_expectedInputModeEnabled = true;
 
         VERIFY_IS_TRUE(_pDispatch.get()->SetCursorKeysMode(true));
     }
@@ -2120,15 +2035,17 @@ class AdapterTest
         // success cases
         // set numeric mode = true
         Log::Comment(L"Test 1: application mode = false");
-        _testGetSet->_privateSetKeypadModeResult = TRUE;
-        _testGetSet->_keypadApplicationMode = false;
+        _testGetSet->_setInputModeResult = true;
+        _testGetSet->_expectedInputMode = TerminalInput::Mode::Keypad;
+        _testGetSet->_expectedInputModeEnabled = false;
 
         VERIFY_IS_TRUE(_pDispatch.get()->SetKeypadMode(false));
 
         // set numeric mode = false
         Log::Comment(L"Test 2: application mode = true");
-        _testGetSet->_privateSetKeypadModeResult = TRUE;
-        _testGetSet->_keypadApplicationMode = true;
+        _testGetSet->_setInputModeResult = true;
+        _testGetSet->_expectedInputMode = TerminalInput::Mode::Keypad;
+        _testGetSet->_expectedInputModeEnabled = true;
 
         VERIFY_IS_TRUE(_pDispatch.get()->SetKeypadMode(true));
     }
@@ -2316,45 +2233,51 @@ class AdapterTest
         Log::Comment(L"Starting test...");
 
         Log::Comment(L"Test 1: Test Default Mouse Mode");
-        _testGetSet->_expectedMouseEnabled = true;
-        _testGetSet->_privateEnableVT200MouseModeResult = TRUE;
+        _testGetSet->_expectedInputModeEnabled = true;
+        _testGetSet->_expectedInputMode = TerminalInput::Mode::DefaultMouseTracking;
+        _testGetSet->_setInputModeResult = true;
         VERIFY_IS_TRUE(_pDispatch.get()->EnableVT200MouseMode(true));
-        _testGetSet->_expectedMouseEnabled = false;
+        _testGetSet->_expectedInputModeEnabled = false;
         VERIFY_IS_TRUE(_pDispatch.get()->EnableVT200MouseMode(false));
 
         Log::Comment(L"Test 2: Test UTF-8 Extended Mouse Mode");
-        _testGetSet->_expectedMouseEnabled = true;
-        _testGetSet->_privateEnableUTF8ExtendedMouseModeResult = TRUE;
+        _testGetSet->_expectedInputModeEnabled = true;
+        _testGetSet->_expectedInputMode = TerminalInput::Mode::Utf8MouseEncoding;
+        _testGetSet->_setInputModeResult = true;
         VERIFY_IS_TRUE(_pDispatch.get()->EnableUTF8ExtendedMouseMode(true));
-        _testGetSet->_expectedMouseEnabled = false;
+        _testGetSet->_expectedInputModeEnabled = false;
         VERIFY_IS_TRUE(_pDispatch.get()->EnableUTF8ExtendedMouseMode(false));
 
         Log::Comment(L"Test 3: Test SGR Extended Mouse Mode");
-        _testGetSet->_expectedMouseEnabled = true;
-        _testGetSet->_privateEnableSGRExtendedMouseModeResult = TRUE;
+        _testGetSet->_expectedInputModeEnabled = true;
+        _testGetSet->_expectedInputMode = TerminalInput::Mode::SgrMouseEncoding;
+        _testGetSet->_setInputModeResult = true;
         VERIFY_IS_TRUE(_pDispatch.get()->EnableSGRExtendedMouseMode(true));
-        _testGetSet->_expectedMouseEnabled = false;
+        _testGetSet->_expectedInputModeEnabled = false;
         VERIFY_IS_TRUE(_pDispatch.get()->EnableSGRExtendedMouseMode(false));
 
         Log::Comment(L"Test 4: Test Button-Event Mouse Mode");
-        _testGetSet->_expectedMouseEnabled = true;
-        _testGetSet->_privateEnableButtonEventMouseModeResult = TRUE;
+        _testGetSet->_expectedInputModeEnabled = true;
+        _testGetSet->_expectedInputMode = TerminalInput::Mode::ButtonEventMouseTracking;
+        _testGetSet->_setInputModeResult = true;
         VERIFY_IS_TRUE(_pDispatch.get()->EnableButtonEventMouseMode(true));
-        _testGetSet->_expectedMouseEnabled = false;
+        _testGetSet->_expectedInputModeEnabled = false;
         VERIFY_IS_TRUE(_pDispatch.get()->EnableButtonEventMouseMode(false));
 
         Log::Comment(L"Test 5: Test Any-Event Mouse Mode");
-        _testGetSet->_expectedMouseEnabled = true;
-        _testGetSet->_privateEnableAnyEventMouseModeResult = TRUE;
+        _testGetSet->_expectedInputModeEnabled = true;
+        _testGetSet->_expectedInputMode = TerminalInput::Mode::AnyEventMouseTracking;
+        _testGetSet->_setInputModeResult = true;
         VERIFY_IS_TRUE(_pDispatch.get()->EnableAnyEventMouseMode(true));
-        _testGetSet->_expectedMouseEnabled = false;
+        _testGetSet->_expectedInputModeEnabled = false;
         VERIFY_IS_TRUE(_pDispatch.get()->EnableAnyEventMouseMode(false));
 
         Log::Comment(L"Test 6: Test Alt Scroll Mouse Mode");
-        _testGetSet->_expectedAlternateScrollEnabled = true;
-        _testGetSet->_privateEnableAlternateScrollResult = TRUE;
+        _testGetSet->_expectedInputModeEnabled = true;
+        _testGetSet->_expectedInputMode = TerminalInput::Mode::AlternateScroll;
+        _testGetSet->_setInputModeResult = true;
         VERIFY_IS_TRUE(_pDispatch.get()->EnableAlternateScroll(true));
-        _testGetSet->_expectedAlternateScrollEnabled = false;
+        _testGetSet->_expectedInputModeEnabled = false;
         VERIFY_IS_TRUE(_pDispatch.get()->EnableAlternateScroll(false));
     }
 
diff --git a/src/terminal/input/mouseInput.cpp b/src/terminal/input/mouseInput.cpp
index ec02b2513ac..59c4ec910f0 100644
--- a/src/terminal/input/mouseInput.cpp
+++ b/src/terminal/input/mouseInput.cpp
@@ -285,13 +285,13 @@ static constexpr short _encodeDefaultCoordinate(const short sCoordinateValue) no
 // - true, if we are tracking mouse input. False, otherwise
 bool TerminalInput::IsTrackingMouseInput() const noexcept
 {
-    return (_mouseInputState.trackingMode != TrackingMode::None);
+    return _inputMode.any(Mode::DefaultMouseTracking, Mode::ButtonEventMouseTracking, Mode::AnyEventMouseTracking);
 }
 
 // Routine Description:
 // - Attempt to handle the given mouse coordinates and windows button as a VT-style mouse event.
 //     If the event should be transmitted in the selected mouse mode, then we'll try and
-//     encode the event according to the rules of the selected ExtendedMode, and insert those characters into the input buffer.
+//     encode the event according to the rules of the encoding mode, and insert those characters into the input buffer.
 // Parameters:
 // - position - The windows coordinates (top,left = 0,0) of the mouse event
 // - button - the message to decode.
@@ -339,7 +339,7 @@ bool TerminalInput::HandleMouse(const COORD position,
     }
     else
     {
-        success = (_mouseInputState.trackingMode != TrackingMode::None);
+        success = IsTrackingMouseInput();
         if (success)
         {
             // isHover is only true for WM_MOUSEMOVE events
@@ -363,30 +363,23 @@ bool TerminalInput::HandleMouse(const COORD position,
             // In AnyEvent, all coord change hovers are sent
             const bool physicalButtonPressed = realButton != WM_LBUTTONUP;
 
-            success = (isButton && _mouseInputState.trackingMode != TrackingMode::None) ||
-                      (isHover && _mouseInputState.trackingMode == TrackingMode::ButtonEvent && ((!sameCoord) && (physicalButtonPressed))) ||
-                      (isHover && _mouseInputState.trackingMode == TrackingMode::AnyEvent && !sameCoord);
+            success = (isButton && IsTrackingMouseInput()) ||
+                      (isHover && _inputMode.test(Mode::ButtonEventMouseTracking) && ((!sameCoord) && (physicalButtonPressed))) ||
+                      (isHover && _inputMode.test(Mode::AnyEventMouseTracking) && !sameCoord);
 
             if (success)
             {
                 std::wstring sequence;
-                switch (_mouseInputState.extendedMode)
+                if (_inputMode.test(Mode::Utf8MouseEncoding))
                 {
-                case ExtendedMode::None:
-                    sequence = _GenerateDefaultSequence(position,
-                                                        realButton,
-                                                        isHover,
-                                                        modifierKeyState,
-                                                        delta);
-                    break;
-                case ExtendedMode::Utf8:
                     sequence = _GenerateUtf8Sequence(position,
                                                      realButton,
                                                      isHover,
                                                      modifierKeyState,
                                                      delta);
-                    break;
-                case ExtendedMode::Sgr:
+                }
+                else if (_inputMode.test(Mode::SgrMouseEncoding))
+                {
                     // For SGR encoding, if no physical buttons were pressed,
                     // then we want to handle hovers with WM_MOUSEMOVE.
                     // However, if we're dragging (WM_MOUSEMOVE with a button pressed),
@@ -397,13 +390,15 @@ bool TerminalInput::HandleMouse(const COORD position,
                                                     isHover,
                                                     modifierKeyState,
                                                     delta);
-                    break;
-                case ExtendedMode::Urxvt:
-                default:
-                    success = false;
-                    break;
                 }
-
+                else
+                {
+                    sequence = _GenerateDefaultSequence(position,
+                                                        realButton,
+                                                        isHover,
+                                                        modifierKeyState,
+                                                        delta);
+                }
                 success = !sequence.empty();
 
                 if (success)
@@ -411,7 +406,7 @@ bool TerminalInput::HandleMouse(const COORD position,
                     _SendInputSequence(sequence);
                     success = true;
                 }
-                if (_mouseInputState.trackingMode == TrackingMode::ButtonEvent || _mouseInputState.trackingMode == TrackingMode::AnyEvent)
+                if (_inputMode.any(Mode::ButtonEventMouseTracking, Mode::AnyEventMouseTracking))
                 {
                     _mouseInputState.lastPos.X = position.X;
                     _mouseInputState.lastPos.Y = position.Y;
@@ -547,10 +542,10 @@ std::wstring TerminalInput::_GenerateSGRSequence(const COORD position,
 // - delta: The scroll wheel delta of the input event
 // Return value:
 // True iff the alternate buffer is active and alternate scroll mode is enabled and the event is a mouse wheel event.
-bool TerminalInput::_ShouldSendAlternateScroll(const unsigned int button, const short delta) const noexcept
+bool TerminalInput::_ShouldSendAlternateScroll(const unsigned int button, const short delta) const
 {
     return _mouseInputState.inAlternateBuffer &&
-           _mouseInputState.alternateScroll &&
+           _inputMode.test(Mode::AlternateScroll) &&
            (button == WM_MOUSEWHEEL || button == WM_MOUSEHWHEEL) && delta != 0;
 }
 
@@ -560,15 +555,15 @@ bool TerminalInput::_ShouldSendAlternateScroll(const unsigned int button, const
 // - delta: The scroll wheel delta of the input event
 // Return value:
 // True iff the input sequence was sent successfully.
-bool TerminalInput::_SendAlternateScroll(const short delta) const noexcept
+bool TerminalInput::_SendAlternateScroll(const short delta) const
 {
     if (delta > 0)
     {
-        _SendInputSequence(_cursorApplicationMode ? ApplicationUpSequence : CursorUpSequence);
+        _SendInputSequence(_inputMode.test(Mode::CursorKey) ? ApplicationUpSequence : CursorUpSequence);
     }
     else
     {
-        _SendInputSequence(_cursorApplicationMode ? ApplicationDownSequence : CursorDownSequence);
+        _SendInputSequence(_inputMode.test(Mode::CursorKey) ? ApplicationDownSequence : CursorDownSequence);
     }
     return true;
 }
diff --git a/src/terminal/input/mouseInputState.cpp b/src/terminal/input/mouseInputState.cpp
index b1c2509de74..bf94794c551 100644
--- a/src/terminal/input/mouseInputState.cpp
+++ b/src/terminal/input/mouseInputState.cpp
@@ -7,91 +7,6 @@
 
 using namespace Microsoft::Console::VirtualTerminal;
 
-// Routine Description:
-// - Either enables or disables UTF-8 extended mode encoding. This *should* cause
-//      the coordinates of a mouse event to be encoded as a UTF-8 byte stream, however, because windows' input is
-//      typically UTF-16 encoded, it emits a UTF-16 stream.
-//   Does NOT enable or disable mouse mode by itself. This matches the behavior I found in Ubuntu terminals.
-// Parameters:
-// - enable - either enable or disable.
-// Return value:
-// <none>
-void TerminalInput::SetUtf8ExtendedMode(const bool enable) noexcept
-{
-    _mouseInputState.extendedMode = enable ? ExtendedMode::Utf8 : ExtendedMode::None;
-}
-
-// Routine Description:
-// - Either enables or disables SGR extended mode encoding. This causes the
-//      coordinates of a mouse event to be emitted in a human readable format,
-//      eg, x,y=203,504 -> "^[[<B;203;504M". This way, applications don't need to worry about character encoding.
-//   Does NOT enable or disable mouse mode by itself. This matches the behavior I found in Ubuntu terminals.
-// Parameters:
-// - enable - either enable or disable.
-// Return value:
-// <none>
-void TerminalInput::SetSGRExtendedMode(const bool enable) noexcept
-{
-    _mouseInputState.extendedMode = enable ? ExtendedMode::Sgr : ExtendedMode::None;
-}
-
-// Routine Description:
-// - Either enables or disables mouse mode handling. Leaves the extended mode alone,
-//      so if we disable then re-enable mouse mode without toggling an extended mode, the mode will persist.
-// Parameters:
-// - enable - either enable or disable.
-// Return value:
-// <none>
-void TerminalInput::EnableDefaultTracking(const bool enable) noexcept
-{
-    _mouseInputState.trackingMode = enable ? TrackingMode::Default : TrackingMode::None;
-    _mouseInputState.lastPos = { -1, -1 }; // Clear out the last saved mouse position & button.
-    _mouseInputState.lastButton = 0;
-}
-
-// Routine Description:
-// - Either enables or disables ButtonEvent mouse handling. Button Event mode
-//      sends additional sequences when a button is pressed and the mouse changes character cells.
-//   Leaves the extended mode alone, so if we disable then re-enable mouse mode
-//      without toggling an extended mode, the mode will persist.
-// Parameters:
-// - enable - either enable or disable.
-// Return value:
-// <none>
-void TerminalInput::EnableButtonEventTracking(const bool enable) noexcept
-{
-    _mouseInputState.trackingMode = enable ? TrackingMode::ButtonEvent : TrackingMode::None;
-    _mouseInputState.lastPos = { -1, -1 }; // Clear out the last saved mouse position & button.
-    _mouseInputState.lastButton = 0;
-}
-
-// Routine Description:
-// - Either enables or disables AnyEvent mouse handling. Any Event mode sends sequences
-//      for any and every mouse event, regardless if a button is pressed or not.
-//   Leaves the extended mode alone, so if we disable then re-enable mouse mode
-//      without toggling an extended mode, the mode will persist.
-// Parameters:
-// - enable - either enable or disable.
-// Return value:
-// <none>
-void TerminalInput::EnableAnyEventTracking(const bool enable) noexcept
-{
-    _mouseInputState.trackingMode = enable ? TrackingMode::AnyEvent : TrackingMode::None;
-    _mouseInputState.lastPos = { -1, -1 }; // Clear out the last saved mouse position & button.
-    _mouseInputState.lastButton = 0;
-}
-
-// Routine Description:
-// - Enables alternate scroll mode. This sends Cursor Up/down sequences when in the alternate buffer
-// Parameters:
-// - enable - either enable or disable.
-// Return value:
-// <none>
-void TerminalInput::EnableAlternateScroll(const bool enable) noexcept
-{
-    _mouseInputState.alternateScroll = enable;
-}
-
 // Routine Description:
 // - Notify the MouseInput handler that the screen buffer has been swapped to the alternate buffer
 // Parameters:
diff --git a/src/terminal/input/terminalInput.cpp b/src/terminal/input/terminalInput.cpp
index 7430345b4a2..2d66699de1e 100644
--- a/src/terminal/input/terminalInput.cpp
+++ b/src/terminal/input/terminalInput.cpp
@@ -250,25 +250,32 @@ const wchar_t* const CTRL_QUESTIONMARK_SEQUENCE = L"\x7F";
 const wchar_t* const CTRL_ALT_SLASH_SEQUENCE = L"\x1b\x1f";
 const wchar_t* const CTRL_ALT_QUESTIONMARK_SEQUENCE = L"\x1b\x7F";
 
-void TerminalInput::ChangeAnsiMode(const bool ansiMode) noexcept
+void TerminalInput::SetInputMode(const Mode mode, const bool enabled)
 {
-    _ansiMode = ansiMode;
-}
+    // If we're changing a tracking mode, we always clear other tracking modes first.
+    // We also clear out the last saved mouse position & button.
+    if (mode == Mode::DefaultMouseTracking || mode == Mode::ButtonEventMouseTracking || mode == Mode::AnyEventMouseTracking)
+    {
+        _inputMode.reset_all(Mode::DefaultMouseTracking, Mode::ButtonEventMouseTracking, Mode::AnyEventMouseTracking);
+        _mouseInputState.lastPos = { -1, -1 };
+        _mouseInputState.lastButton = 0;
+    }
 
-void TerminalInput::ChangeKeypadMode(const bool applicationMode) noexcept
-{
-    _keypadApplicationMode = applicationMode;
-}
+    // But if we're changing the encoding, we only clear out the other encoding modes
+    // when enabling a new encoding - not when disabling.
+    if ((mode == Mode::Utf8MouseEncoding || mode == Mode::SgrMouseEncoding) && enabled)
+    {
+        _inputMode.reset_all(Mode::Utf8MouseEncoding, Mode::SgrMouseEncoding);
+    }
 
-void TerminalInput::ChangeCursorKeysMode(const bool applicationMode) noexcept
-{
-    _cursorApplicationMode = applicationMode;
+    _inputMode.set(mode, enabled);
 }
 
-void TerminalInput::ChangeWin32InputMode(const bool win32InputMode) noexcept
+bool TerminalInput::GetInputMode(const Mode mode) const
 {
-    _win32InputMode = win32InputMode;
+    return _inputMode.test(mode);
 }
+
 void TerminalInput::ForceDisableWin32InputMode(const bool win32InputMode) noexcept
 {
     _forceDisableWin32InputMode = win32InputMode;
@@ -530,7 +537,7 @@ bool TerminalInput::HandleKey(const IInputEvent* const pInEvent)
     // GH#4999 - If we're in win32-input mode, skip straight to doing that.
     // Since this mode handles all types of key events, do nothing else.
     // Only do this if win32-input-mode support isn't manually disabled.
-    if (_win32InputMode && !_forceDisableWin32InputMode)
+    if (_inputMode.test(Mode::Win32) && !_forceDisableWin32InputMode)
     {
         const auto seq = _GenerateWin32KeySequence(keyEvent);
         _SendInputSequence(seq);
@@ -655,7 +662,7 @@ bool TerminalInput::HandleKey(const IInputEvent* const pInEvent)
     // Check any other key mappings (like those for the F1-F12 keys).
     // These mappings will kick in no matter which modifiers are pressed and as such
     // must be checked last, or otherwise we'd override more complex key combinations.
-    const auto mapping = _getKeyMapping(keyEvent, _ansiMode, _cursorApplicationMode, _keypadApplicationMode);
+    const auto mapping = _getKeyMapping(keyEvent, _inputMode.test(Mode::Ansi), _inputMode.test(Mode::CursorKey), _inputMode.test(Mode::Keypad));
     if (_translateDefaultMapping(keyEvent, mapping, senderFunc))
     {
         return true;
diff --git a/src/terminal/input/terminalInput.hpp b/src/terminal/input/terminalInput.hpp
index 0405ecca36b..cb01937f9eb 100644
--- a/src/terminal/input/terminalInput.hpp
+++ b/src/terminal/input/terminalInput.hpp
@@ -34,11 +34,26 @@ namespace Microsoft::Console::VirtualTerminal
         ~TerminalInput() = default;
 
         bool HandleKey(const IInputEvent* const pInEvent);
-        void ChangeAnsiMode(const bool ansiMode) noexcept;
-        void ChangeKeypadMode(const bool applicationMode) noexcept;
-        void ChangeCursorKeysMode(const bool applicationMode) noexcept;
 
-        void ChangeWin32InputMode(const bool win32InputMode) noexcept;
+        enum class Mode : size_t
+        {
+            Ansi,
+            Keypad,
+            CursorKey,
+            Win32,
+
+            Utf8MouseEncoding,
+            SgrMouseEncoding,
+
+            DefaultMouseTracking,
+            ButtonEventMouseTracking,
+            AnyEventMouseTracking,
+
+            AlternateScroll
+        };
+
+        void SetInputMode(const Mode mode, const bool enabled);
+        bool GetInputMode(const Mode mode) const;
         void ForceDisableWin32InputMode(const bool win32InputMode) noexcept;
 
 #pragma region MouseInput
@@ -62,14 +77,6 @@ namespace Microsoft::Console::VirtualTerminal
 
 #pragma region MouseInputState Management
         // These methods are defined in mouseInputState.cpp
-        void SetUtf8ExtendedMode(const bool enable) noexcept;
-        void SetSGRExtendedMode(const bool enable) noexcept;
-
-        void EnableDefaultTracking(const bool enable) noexcept;
-        void EnableButtonEventTracking(const bool enable) noexcept;
-        void EnableAnyEventTracking(const bool enable) noexcept;
-
-        void EnableAlternateScroll(const bool enable) noexcept;
         void UseAlternateScreenBuffer() noexcept;
         void UseMainScreenBuffer() noexcept;
 #pragma endregion
@@ -80,10 +87,7 @@ namespace Microsoft::Console::VirtualTerminal
         // storage location for the leading surrogate of a utf-16 surrogate pair
         std::optional<wchar_t> _leadingSurrogate;
 
-        bool _ansiMode{ true };
-        bool _keypadApplicationMode{ false };
-        bool _cursorApplicationMode{ false };
-        bool _win32InputMode{ false };
+        til::enumset<Mode> _inputMode{ Mode::Ansi };
         bool _forceDisableWin32InputMode{ false };
 
         void _SendChar(const wchar_t ch);
@@ -94,27 +98,8 @@ namespace Microsoft::Console::VirtualTerminal
 
 #pragma region MouseInputState Management
         // These methods are defined in mouseInputState.cpp
-        enum class ExtendedMode : unsigned int
-        {
-            None,
-            Utf8,
-            Sgr,
-            Urxvt
-        };
-
-        enum class TrackingMode : unsigned int
-        {
-            None,
-            Default,
-            ButtonEvent,
-            AnyEvent
-        };
-
         struct MouseInputState
         {
-            ExtendedMode extendedMode{ ExtendedMode::None };
-            TrackingMode trackingMode{ TrackingMode::None };
-            bool alternateScroll{ false };
             bool inAlternateBuffer{ false };
             COORD lastPos{ -1, -1 };
             unsigned int lastButton{ 0 };
@@ -142,8 +127,8 @@ namespace Microsoft::Console::VirtualTerminal
                                                  const short modifierKeyState,
                                                  const short delta);
 
-        bool _ShouldSendAlternateScroll(const unsigned int button, const short delta) const noexcept;
-        bool _SendAlternateScroll(const short delta) const noexcept;
+        bool _ShouldSendAlternateScroll(const unsigned int button, const short delta) const;
+        bool _SendAlternateScroll(const short delta) const;
 
         static constexpr unsigned int s_GetPressedButton(const MouseButtonState state) noexcept;
 #pragma endregion

From 9aa4a115aab72e4228ca5c46c28de226821a7d47 Mon Sep 17 00:00:00 2001
From: Leonard Hecker <lhecker@microsoft.com>
Date: Tue, 26 Oct 2021 23:30:25 +0200
Subject: [PATCH 11/16] Improve Base64::Decode performance (#11467)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This commit renames `Base64::s_Decode` into `Base64::Decode` and improves its
average performance on short strings of less than 200 characters by 4.5x.
This is achieved by implementing a classic base64 decoder that reads 4
characters at a time and produces 3 output bytes. Furthermore a small
128 byte lookup table is used to quickly map characters to values.

## PR Checklist
* [x] I work here
* [x] Tests added/passed

## Validation Steps Performed
* Run WSL in Windows Terminal
* Run `printf "\033]52;c;aHR0cHM6Ly9naXRodWIuY29tL21pY3Jvc29mdC90ZXJtaW5hbC9wdWxsLzExNDY3\a"`
* Clipboard contains `https://github.com/microsoft/terminal/pull/11467` ✔️
---
 .github/actions/spelling/excludes.txt         |   1 +
 .../parser/OutputStateMachineEngine.cpp       |  26 +-
 src/terminal/parser/base64.cpp                | 289 ++++++++----------
 src/terminal/parser/base64.hpp                |   6 +-
 src/terminal/parser/ut_parser/Base64Test.cpp  | 127 ++++----
 .../parser/ut_parser/OutputEngineTest.cpp     |   2 +-
 6 files changed, 215 insertions(+), 236 deletions(-)

diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt
index 81bfde27718..8d751a187ff 100644
--- a/.github/actions/spelling/excludes.txt
+++ b/.github/actions/spelling/excludes.txt
@@ -67,6 +67,7 @@ SUMS$
 ^src/terminal/parser/ft_fuzzer/run\.bat$
 ^src/terminal/parser/ft_fuzzer/VTCommandFuzzer\.cpp$
 ^src/terminal/parser/ft_fuzzwrapper/run\.bat$
+^src/terminal/parser/ut_parser/Base64Test.cpp$
 ^src/terminal/parser/ut_parser/run\.bat$
 ^src/tools/integrity/packageuwp/ConsoleUWP\.appxSources$
 ^src/tools/lnkd/lnkd\.bat$
diff --git a/src/terminal/parser/OutputStateMachineEngine.cpp b/src/terminal/parser/OutputStateMachineEngine.cpp
index bc9299d0db3..948ffaa4ee7 100644
--- a/src/terminal/parser/OutputStateMachineEngine.cpp
+++ b/src/terminal/parser/OutputStateMachineEngine.cpp
@@ -1101,22 +1101,22 @@ bool OutputStateMachineEngine::_GetOscSetClipboard(const std::wstring_view strin
                                                    std::wstring& content,
                                                    bool& queryClipboard) const noexcept
 {
-    const size_t pos = string.find(';');
-    if (pos != std::wstring_view::npos)
+    const auto pos = string.find(L';');
+    if (pos == std::wstring_view::npos)
     {
-        const std::wstring_view substr = string.substr(pos + 1);
-        if (substr == L"?")
-        {
-            queryClipboard = true;
-            return true;
-        }
-        else
-        {
-            return Base64::s_Decode(substr, content);
-        }
+        return false;
     }
 
-    return false;
+    const auto substr = string.substr(pos + 1);
+    if (substr == L"?")
+    {
+        queryClipboard = true;
+        return true;
+    }
+
+// Log_IfFailed has the following description: "Should be decorated WI_NOEXCEPT, but conflicts with forceinline."
+#pragma warning(suppress : 26447) // The function is declared 'noexcept' but calls function 'Log_IfFailed()' which may throw exceptions (f.6).
+    return SUCCEEDED_LOG(Base64::Decode(substr, content));
 }
 
 // Method Description:
diff --git a/src/terminal/parser/base64.cpp b/src/terminal/parser/base64.cpp
index 48e22833ece..83a85028278 100644
--- a/src/terminal/parser/base64.cpp
+++ b/src/terminal/parser/base64.cpp
@@ -4,190 +4,155 @@
 #include "precomp.h"
 #include "base64.hpp"
 
-using namespace Microsoft::Console::VirtualTerminal;
-
-static const char base64Chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-static const char padChar = '=';
-
-#pragma warning(disable : 26446 26447 26482 26485 26493 26494)
-
-// Routine Description:
-// - Encode a string using base64. When there are not enough characters
-//      for one quantum, paddings are added.
-// Arguments:
-// - src - String to base64 encode.
-// Return Value:
-// - the encoded string.
-std::wstring Base64::s_Encode(const std::wstring_view src) noexcept
-{
-    std::wstring dst;
-    wchar_t input[3];
-
-    const auto len = (src.size() + 2) / 3 * 4;
-    if (len == 0)
-    {
-        return dst;
-    }
-    dst.reserve(len);
-
-    auto iter = src.cbegin();
-    // Encode each three chars into one quantum (four chars).
-    while (iter < src.cend() - 2)
-    {
-        input[0] = *iter++;
-        input[1] = *iter++;
-        input[2] = *iter++;
-        dst.push_back(base64Chars[input[0] >> 2]);
-        dst.push_back(base64Chars[(input[0] & 0x03) << 4 | input[1] >> 4]);
-        dst.push_back(base64Chars[(input[1] & 0x0f) << 2 | input[2] >> 6]);
-        dst.push_back(base64Chars[(input[2] & 0x3f)]);
-    }
-
-    // Here only zero, or one, or two chars are left. We may need to add paddings.
-    if (iter < src.cend())
-    {
-        input[0] = *iter++;
-        dst.push_back(base64Chars[input[0] >> 2]);
-        if (iter < src.cend()) // Two chars left.
-        {
-            input[1] = *iter++;
-            dst.push_back(base64Chars[(input[0] & 0x03) << 4 | input[1] >> 4]);
-            dst.push_back(base64Chars[(input[1] & 0x0f) << 2]);
-        }
-        else // Only one char left.
-        {
-            dst.push_back(base64Chars[(input[0] & 0x03) << 4]);
-            dst.push_back(padChar);
-        }
-        dst.push_back(padChar);
-    }
+#pragma warning(disable : 26446) // Prefer to use gsl::at() instead of unchecked subscript operator (bounds.4).
+// I didn't want to handle out of memory errors. There's no reasonable mode of
+// operation for this application without the ability to allocate memory anyways.
+#pragma warning(disable : 26447) // The function is declared 'noexcept' but calls function '...' which may throw exceptions (f.6).
+#pragma warning(disable : 26481) // Don't use pointer arithmetic. Use span instead (bounds.1).
+#pragma warning(disable : 26482) // Only index into arrays using constant expressions (bounds.2).
 
-    return dst;
-}
+using namespace Microsoft::Console::VirtualTerminal;
 
-// Routine Description:
-// - Decode a base64 string. This requires the base64 string is properly padded.
-//      Otherwise, false will be returned.
-// Arguments:
-// - src - String to decode.
-// - dst - Destination to decode into.
-// Return Value:
-// - true if decoding successfully, otherwise false.
-bool Base64::s_Decode(const std::wstring_view src, std::wstring& dst) noexcept
+// clang-format off
+static constexpr uint8_t decodeTable[128] = {
+    255 /* NUL */, 255 /* SOH */, 255 /* STX */, 255 /* ETX */, 255 /* EOT */, 255 /* ENQ */, 255 /* ACK */, 255 /* BEL */, 255 /* BS  */, 255 /* HT  */, 255 /* LF  */, 255 /* VT  */, 255 /* FF  */, 255 /* CR  */, 255 /* SO  */, 255 /* SI  */,
+    255 /* DLE */, 255 /* DC1 */, 255 /* DC2 */, 255 /* DC3 */, 255 /* DC4 */, 255 /* NAK */, 255 /* SYN */, 255 /* ETB */, 255 /* CAN */, 255 /* EM  */, 255 /* SUB */, 255 /* ESC */, 255 /* FS  */, 255 /* GS  */, 255 /* RS  */, 255 /* US  */,
+    255 /* SP  */, 255 /* !   */, 255 /* "   */, 255 /* #   */, 255 /* $   */, 255 /* %   */, 255 /* &   */, 255 /* '   */, 255 /* (   */, 255 /* )   */, 255 /* *   */, 62  /* +   */, 255 /* ,   */, 62  /* -   */, 255 /* .   */, 63  /* /   */,
+    52  /* 0   */, 53  /* 1   */, 54  /* 2   */, 55  /* 3   */, 56  /* 4   */, 57  /* 5   */, 58  /* 6   */, 59  /* 7   */, 60  /* 8   */, 61  /* 9   */, 255 /* :   */, 255 /* ;   */, 255 /* <   */, 255 /* =   */, 255 /* >   */, 255 /* ?   */,
+    255 /* @   */, 0   /* A   */, 1   /* B   */, 2   /* C   */, 3   /* D   */, 4   /* E   */, 5   /* F   */, 6   /* G   */, 7   /* H   */, 8   /* I   */, 9   /* J   */, 10  /* K   */, 11  /* L   */, 12  /* M   */, 13  /* N   */, 14  /* O   */,
+    15  /* P   */, 16  /* Q   */, 17  /* R   */, 18  /* S   */, 19  /* T   */, 20  /* U   */, 21  /* V   */, 22  /* W   */, 23  /* X   */, 24  /* Y   */, 25  /* Z   */, 255 /* [   */, 255 /* \   */, 255 /* ]   */, 255 /* ^   */, 63  /* _   */,
+    255 /* `   */, 26  /* a   */, 27  /* b   */, 28  /* c   */, 29  /* d   */, 30  /* e   */, 31  /* f   */, 32  /* g   */, 33  /* h   */, 34  /* i   */, 35  /* j   */, 36  /* k   */, 37  /* l   */, 38  /* m   */, 39  /* n   */, 40  /* o   */,
+    41  /* p   */, 42  /* q   */, 43  /* r   */, 44  /* s   */, 45  /* t   */, 46  /* u   */, 47  /* v   */, 48  /* w   */, 49  /* x   */, 50  /* y   */, 51  /* z   */, 255 /* {   */, 255 /* |   */, 255 /* }   */, 255 /* ~   */, 255 /* DEL */,
+};
+// clang-format on
+
+// Decodes an UTF8 string encoded with RFC 4648 (Base64) and returns it as UTF16 in dst.
+// It supports both variants of the RFC (base64 and base64url), but
+// throws an error for non-alphabet characters, including newlines.
+// * Throws an exception for all invalid base64 inputs.
+// * Doesn't support whitespace and will throw an exception for such strings.
+// * Doesn't validate the number of trailing "=". Those are basically ignored.
+//   Strings like "YQ===" will be accepted as valid input and simply result in "a".
+HRESULT Base64::Decode(const std::wstring_view& src, std::wstring& dst) noexcept
 {
-    std::string mbStr;
-    int state = 0;
-    char tmp;
-
-    const auto len = src.size() / 4 * 3;
-    if (len == 0)
+    std::string result;
+    result.resize(((src.size() + 3) / 4) * 3);
+
+    // in and inEnd may be nullptr if src.empty().
+    // The remaining code in this function ensures not to read from in if src.empty().
+#pragma warning(suppress : 26429) // Symbol 'in' is never tested for nullness, it can be marked as not_null (f.23).
+    auto in = src.data();
+    const auto inEnd = in + src.size();
+    // Sometimes in programming you have to ask yourself what the right offset for a pointer is.
+    // Is 4 enough? Certainly not. 6 on the other hand is just way too much. Clearly 5 is just right.
+    //
+    // In all seriousness however the offset is 5, because the batched loop reads 4 characters at a time,
+    // a base64 string can end with two "=" and the batched loop doesn't handle any such "=".
+    // Additionally the while() condition of the batched loop would make a lot more sense if it were using <=,
+    // but for reasons outlined below it needs to use < so we need to add 1 back again.
+    // We thus get -4-2+1 which is -5.
+    //
+    // There's a special reason we need to use < and not <= for the loop:
+    // In C++ it's undefined behavior to perform any pointer arithmetic that leads to unallocated memory,
+    // which is why we can't just write `inEnd - 6` as that might be UB if `src.size()` is less than 6.
+    // We thus would need write `inEnd - min(6, src.size())` in combination with `<=` for the batched loop.
+    // But if `src.size()` is actually less than 6 then `inEnd` is equal to the initial `in`, aka: an empty range.
+    // In such cases we'd enter the batched loop and read from `in` despite us not wanting to enter the loop.
+    // We can fix the issue by using < instead and adding +1 to the offset.
+    //
+    // Yes this works.
+    const auto inEndBatched = inEnd - std::min<size_t>(5, src.size());
+
+    // outBeg and out may be nullptr if src.empty().
+    // The remaining code in this function ensures not to write to out if src.empty().
+    const auto outBeg = result.data();
+#pragma warning(suppress : 26429) // Symbol 'out' is never tested for nullness, it can be marked as not_null (f.23).
+    auto out = outBeg;
+
+    // r is just a generic "remainder" we use to accumulate 4 base64 chars into 3 output bytes.
+    uint_fast32_t r = 0;
+    // error is treated as a boolean. If it's not 0 we had an invalid input character.
+    uint_fast16_t error = 0;
+
+    // Capturing r/error by reference produces less optimal assembly.
+    static constexpr auto accumulate = [](auto& r, auto& error, auto ch) {
+        // n will be in the range [0, 0x3f] for valid ch
+        // and exactly 0xff for invalid ch.
+        const auto n = decodeTable[ch & 0x7f];
+        // Both ch > 0x7f, as well as n > 0x7f are invalid values and count as an error.
+        // We can add the error state by checking if any bits ~0x7f are set (which is 0xff80).
+        error |= (ch | n) & 0xff80;
+        r = r << 6 | n;
+    };
+
+    // If src.empty() then `in == inEndBatched == nullptr` and this is skipped.
+    while (in < inEndBatched)
     {
-        return false;
+        const auto ch0 = *in++;
+        const auto ch1 = *in++;
+        const auto ch2 = *in++;
+        const auto ch3 = *in++;
+
+        // Most other base64 libraries do something like this:
+        //   const auto n0 = decodeTable[a];
+        //   const auto n1 = decodeTable[b];
+        //   const auto n2 = decodeTable[c];
+        //   const auto n3 = decodeTable[d];
+        //   *out++ = n0 << 2 | n1 >> 4;
+        //   *out++ = (n1 & 0xf) << 4 | n2 >> 2;
+        //   *out++ = (n2 & 0x3) << 6 | n3;
+        //
+        // But on all modern CPUs I tested (well even those 10 years old at this point) shifting base64
+        // characters into a single register (here: r) is faster than the traditional approach.
+        // I believe this is due to reducing the dependency of instructions on prior calculations.
+        accumulate(r, error, ch0);
+        accumulate(r, error, ch1);
+        accumulate(r, error, ch2);
+        accumulate(r, error, ch3);
+
+        *out++ = gsl::narrow_cast<char>(r >> 16);
+        *out++ = gsl::narrow_cast<char>(r >> 8);
+        *out++ = gsl::narrow_cast<char>(r >> 0);
     }
-    mbStr.reserve(len);
 
-    auto iter = src.cbegin();
-    while (iter < src.cend())
     {
-        if (s_IsSpace(*iter)) // Skip whitespace anywhere.
-        {
-            iter++;
-            continue;
-        }
+        uint_fast8_t ri = 0;
 
-        if (*iter == padChar)
+        // If src.empty() then `in == inEnd == nullptr` and this is skipped.
+        for (; in < inEnd; ++in)
         {
-            break;
-        }
-
-        auto pos = strchr(base64Chars, *iter);
-        if (!pos) // A non-base64 character found.
-        {
-            return false;
+            if (const auto ch = *in; ch != '=')
+            {
+                accumulate(r, error, ch);
+                ri++;
+            }
         }
 
-        switch (state)
+        switch (ri)
         {
-        case 0:
-            tmp = (char)(pos - base64Chars) << 2;
-            state = 1;
-            break;
-        case 1:
-            tmp |= (char)(pos - base64Chars) >> 4;
-            mbStr += tmp;
-            tmp = (char)((pos - base64Chars) & 0x0f) << 4;
-            state = 2;
-            break;
         case 2:
-            tmp |= (char)(pos - base64Chars) >> 2;
-            mbStr += tmp;
-            tmp = (char)((pos - base64Chars) & 0x03) << 6;
-            state = 3;
+            *out++ = gsl::narrow_cast<char>(r >> 4);
             break;
         case 3:
-            tmp |= pos - base64Chars;
-            mbStr += tmp;
-            state = 0;
+            *out++ = gsl::narrow_cast<char>(r >> 10);
+            *out++ = gsl::narrow_cast<char>(r >> 2);
             break;
-        default:
-            break;
-        }
-
-        iter++;
-    }
-
-    if (iter < src.cend()) // Padding char is met.
-    {
-        iter++;
-        switch (state)
-        {
-        // Invalid when state is 0 or 1.
-        case 0:
-        case 1:
-            return false;
-        case 2:
-            // Skip any number of spaces.
-            while (iter < src.cend() && s_IsSpace(*iter))
-            {
-                iter++;
-            }
-            // Make sure there is another trailing padding character.
-            if (iter == src.cend() || *iter != padChar)
-            {
-                return false;
-            }
-            iter++; // Skip the padding character and fallthrough to "single trailing padding character" case.
-            [[fallthrough]];
-        case 3:
-            while (iter < src.cend())
-            {
-                if (!s_IsSpace(*iter))
-                {
-                    return false;
-                }
-                iter++;
-            }
+        case 4:
+            *out++ = gsl::narrow_cast<char>(r >> 16);
+            *out++ = gsl::narrow_cast<char>(r >> 8);
+            *out++ = gsl::narrow_cast<char>(r >> 0);
             break;
         default:
+            error |= ri;
             break;
         }
     }
-    else if (state != 0) // When no padding, we must be in state 0.
+
+    if (error)
     {
-        return false;
+        return HRESULT_FROM_WIN32(ERROR_INVALID_DATA);
     }
 
-    return SUCCEEDED(til::u8u16(mbStr, dst));
-}
-
-// Routine Description:
-// - Check if parameter is a base64 whitespace. Only carriage return or line feed
-//      is valid whitespace.
-// Arguments:
-// - ch - Character to check.
-// Return Value:
-// - true iff ch is a carriage return or line feed.
-constexpr bool Base64::s_IsSpace(const wchar_t ch) noexcept
-{
-    return ch == L'\r' || ch == L'\n';
+    result.resize(out - outBeg);
+    return til::u8u16(result, dst);
 }
diff --git a/src/terminal/parser/base64.hpp b/src/terminal/parser/base64.hpp
index 976bcc5209a..da8f22ec509 100644
--- a/src/terminal/parser/base64.hpp
+++ b/src/terminal/parser/base64.hpp
@@ -16,10 +16,6 @@ namespace Microsoft::Console::VirtualTerminal
     class Base64
     {
     public:
-        static std::wstring s_Encode(const std::wstring_view src) noexcept;
-        static bool s_Decode(const std::wstring_view src, std::wstring& dst) noexcept;
-
-    private:
-        static constexpr bool s_IsSpace(const wchar_t ch) noexcept;
+        static HRESULT Decode(const std::wstring_view& src, std::wstring& dst) noexcept;
     };
 }
diff --git a/src/terminal/parser/ut_parser/Base64Test.cpp b/src/terminal/parser/ut_parser/Base64Test.cpp
index e3d9e5f29fc..5374a303ac9 100644
--- a/src/terminal/parser/ut_parser/Base64Test.cpp
+++ b/src/terminal/parser/ut_parser/Base64Test.cpp
@@ -3,7 +3,8 @@
 
 #include "precomp.h"
 #include "WexTestClass.h"
-#include "../../inc/consoletaeftemplates.hpp"
+
+#include <til/rand.h>
 
 #include "base64.hpp"
 
@@ -28,74 +29,90 @@ class Microsoft::Console::VirtualTerminal::Base64Test
 {
     TEST_CLASS(Base64Test);
 
-    TEST_METHOD(TestBase64Encode)
-    {
-        VERIFY_ARE_EQUAL(L"Zm9v", Base64::s_Encode(L"foo"));
-        VERIFY_ARE_EQUAL(L"Zm9vYg==", Base64::s_Encode(L"foob"));
-        VERIFY_ARE_EQUAL(L"Zm9vYmE=", Base64::s_Encode(L"fooba"));
-        VERIFY_ARE_EQUAL(L"Zm9vYmFy", Base64::s_Encode(L"foobar"));
-        VERIFY_ARE_EQUAL(L"Zm9vYmFyDQo=", Base64::s_Encode(L"foobar\r\n"));
-    }
-
-    TEST_METHOD(TestBase64Decode)
+    TEST_METHOD(DecodeFuzz)
     {
-        std::wstring result;
-        bool success;
-
-        success = Base64::s_Decode(L"Zm9v", result);
-        VERIFY_ARE_EQUAL(true, success);
-        VERIFY_ARE_EQUAL(L"foo", result);
-
-        result = L"";
-        success = Base64::s_Decode(L"Zm9vYg==", result);
-        VERIFY_ARE_EQUAL(true, success);
-        VERIFY_ARE_EQUAL(L"foob", result);
+        // NOTE: Modify testRounds to get the feeling of running a fuzz test on Base64::Decode.
+        static constexpr auto testRounds = 8;
+        pcg_engines::oneseq_dxsm_64_32 rng{ til::gen_random<uint64_t>() };
 
-        result = L"";
-        success = Base64::s_Decode(L"Zm9vYmE=", result);
-        VERIFY_ARE_EQUAL(true, success);
-        VERIFY_ARE_EQUAL(L"fooba", result);
-
-        result = L"";
-        success = Base64::s_Decode(L"Zm9vYmFy", result);
-        VERIFY_ARE_EQUAL(true, success);
-        VERIFY_ARE_EQUAL(L"foobar", result);
+        // Fills referenceData with random ASCII characters.
+        // We use ASCII as Base64::Decode uses til:u8u16 internally and I don't want to test that.
+        char referenceData[128];
+        {
+            uint32_t randomData[sizeof(referenceData) / sizeof(uint32_t)];
+            for (auto& i : randomData)
+            {
+                i = rng();
+            }
 
-        result = L"";
-        success = Base64::s_Decode(L"Zm9vYmFyDQo=", result);
-        VERIFY_ARE_EQUAL(true, success);
-        VERIFY_ARE_EQUAL(L"foobar\r\n", result);
+            const std::string_view randomDataView{ reinterpret_cast<const char*>(randomData), sizeof(randomData) };
+            auto out = std::begin(referenceData);
 
-        result = L"";
-        success = Base64::s_Decode(L"Zm9v\rYmFy", result);
-        VERIFY_ARE_EQUAL(true, success);
-        VERIFY_ARE_EQUAL(L"foobar", result);
+            for (const auto& ch : randomDataView)
+            {
+                *out++ = static_cast<char>(ch & 0x7f);
+            }
+        }
 
-        result = L"";
-        success = Base64::s_Decode(L"Zm9v\r\nYmFy\n", result);
-        VERIFY_ARE_EQUAL(true, success);
-        VERIFY_ARE_EQUAL(L"foobar", result);
+        wchar_t wideReferenceData[std::size(referenceData)];
+        std::copy_n(std::begin(referenceData), std::size(referenceData), std::begin(wideReferenceData));
 
-        success = Base64::s_Decode(L"Z", result);
-        VERIFY_ARE_EQUAL(false, success);
+        std::wstring encoded;
+        std::wstring decoded;
 
-        success = Base64::s_Decode(L"Zm9vYg", result);
-        VERIFY_ARE_EQUAL(false, success);
+        for (auto i = 0; i < testRounds; ++i)
+        {
+            const auto referenceLength = rng(static_cast<uint32_t>(std::size(referenceData)));
+            const std::wstring_view wideReference{ std::begin(wideReferenceData), referenceLength };
+
+            if (!referenceLength)
+            {
+                encoded.clear();
+            }
+            else
+            {
+                const auto reference = reinterpret_cast<const BYTE*>(std::begin(referenceData));
+                DWORD encodedLen;
+                THROW_IF_WIN32_BOOL_FALSE(CryptBinaryToStringW(reference, referenceLength, CRYPT_STRING_BASE64 | CRYPT_STRING_NOCRLF, nullptr, &encodedLen));
+
+                // encodedLen is returned by CryptBinaryToStringW including the trailing null byte.
+                encoded.resize(encodedLen - 1);
+
+                THROW_IF_WIN32_BOOL_FALSE(CryptBinaryToStringW(reference, referenceLength, CRYPT_STRING_BASE64 | CRYPT_STRING_NOCRLF, encoded.data(), &encodedLen));
+            }
+
+            // Test whether Decode() handles strings with and without trailing "=".
+            if (rng(2))
+            {
+                while (!encoded.empty() && encoded.back() == '=')
+                {
+                    encoded.pop_back();
+                }
+            }
+
+            // Test whether Decode() handles null-pointer arguments correctly.
+            std::wstring_view encodedView{ encoded };
+            if (encodedView.empty() && rng(2))
+            {
+                encodedView = {};
+            }
+
+            Base64::Decode(encodedView, decoded);
+            VERIFY_ARE_EQUAL(wideReference, decoded);
+        }
+    }
 
-        success = Base64::s_Decode(L"Zm9vYg=", result);
-        VERIFY_ARE_EQUAL(false, success);
+    TEST_METHOD(DecodeUTF8)
+    {
+        std::wstring result;
 
         // U+306b U+307b U+3093 U+3054 U+6c49 U+8bed U+d55c U+ad6d
-        result = L"";
-        success = Base64::s_Decode(L"44Gr44G744KT44GU5rGJ6K+t7ZWc6rWt", result);
-        VERIFY_ARE_EQUAL(true, success);
+        Base64::Decode(L"44Gr44G744KT44GU5rGJ6K+t7ZWc6rWt", result);
         VERIFY_ARE_EQUAL(L"にほんご汉语한국", result);
 
         // U+d83d U+dc4d U+d83d U+dc4d U+d83c U+dffb U+d83d U+dc4d U+d83c U+dffc U+d83d
         // U+dc4d U+d83c U+dffd U+d83d U+dc4d U+d83c U+dffe U+d83d U+dc4d U+d83c U+dfff
-        result = L"";
-        success = Base64::s_Decode(L"8J+RjfCfkY3wn4+78J+RjfCfj7zwn5GN8J+PvfCfkY3wn4++8J+RjfCfj78=", result);
-        VERIFY_ARE_EQUAL(true, success);
+        Base64::Decode(L"8J+RjfCfkY3wn4+78J+RjfCfj7zwn5GN8J+PvfCfkY3wn4++8J+RjfCfj78=", result);
         VERIFY_ARE_EQUAL(L"👍👍🏻👍🏼👍🏽👍🏾👍🏿", result);
     }
 };
diff --git a/src/terminal/parser/ut_parser/OutputEngineTest.cpp b/src/terminal/parser/ut_parser/OutputEngineTest.cpp
index c5b9647312d..f9471f47fa2 100644
--- a/src/terminal/parser/ut_parser/OutputEngineTest.cpp
+++ b/src/terminal/parser/ut_parser/OutputEngineTest.cpp
@@ -3255,7 +3255,7 @@ class StateMachineExternalTest final
 
         pDispatch->_copyContent = L"UNCHANGED";
         // Passing a non-base64 `Pd` param is illegal, won't change the content.
-        mach.ProcessString(L"\x1b]52;;foo\x07");
+        mach.ProcessString(L"\x1b]52;;???\x07");
         VERIFY_ARE_EQUAL(L"UNCHANGED", pDispatch->_copyContent);
 
         pDispatch->ClearState();

From 6d091f37b3cf21955cbdbd70ca988ea1dd0ec143 Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Tue, 26 Oct 2021 16:31:41 -0500
Subject: [PATCH 12/16] More roadmap updates circa October 2021 (#11575)

We don't actually have a hard date for 2.0 anymore, so I'm removing those dates to make room for 1.13, 1.14, etc. Also updated the list of milestones with the current state. We're actually doing pretty darn good (considering there was a bit of a global pandemic to contend with!)
---
 doc/terminal-v2-roadmap.md | 54 ++++++++++++++++++++------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/doc/terminal-v2-roadmap.md b/doc/terminal-v2-roadmap.md
index 34fe686ee2e..9db0aa65298 100644
--- a/doc/terminal-v2-roadmap.md
+++ b/doc/terminal-v2-roadmap.md
@@ -2,7 +2,7 @@
 
 ## Overview
 
-This document outlines the roadmap towards delivering Windows Terminal 2.0 by Winter 2021.
+This document outlines the roadmap towards delivering Windows Terminal 2.0.
 
 ## Milestones
 
@@ -32,8 +32,8 @@ Below is the schedule for when milestones will be included in release builds of
 | 2021-07-14 | [1.10] in Windows Terminal Preview<br>[1.9] in Windows Terminal | [Windows Terminal Preview 1.10 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-10-release/) |
 | 2021-08-31 | [1.11] in Windows Terminal Preview<br>[1.10] in Windows Terminal | [Windows Terminal Preview 1.11 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-11-release/) |
 | 2021-10-20 | [1.12] in Windows Terminal Preview<br>[1.11] in Windows Terminal | [Windows Terminal Preview 1.12 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-12-release/) |
-| 2021-11-30 | 2.0 RC in Windows Terminal Preview<br>2.0 RC in Windows Terminal | |
-| 2021-12-31 | [2.0] in Windows Terminal Preview<br>[2.0] in Windows Terminal | |
+|  | 2.0 RC in Windows Terminal Preview<br>2.0 RC in Windows Terminal | |
+|  | [2.0] in Windows Terminal Preview<br>[2.0] in Windows Terminal | |
 
 ## Issue Triage & Prioritization
 
@@ -49,28 +49,32 @@ The following are a list of the key scenarios we're aiming to deliver for Termin
 
 > 👉 Note: There are many other features that don't fit within 2.0, but will be re-assessed and prioritized for 3.0, the plan for which will be published in 2021.
 
-| Priority\* | Scenario | Description/Notes |
-| ---------- | -------- | ----------------- |
-| 0 | Settings UI | A user interface that connects to settings.json. This provides a way for people to edit their settings without having to edit a JSON file.<br><br>Issue: [#1564]<br>Specs: [#6720], [#6904]<br>Implementation: [#7283], [#7370], [#8048] |
-| 0 | Command palette | A popup menu to list possible actions and commands.<br><br>Issues: [#5400], [#2046]<br>Spec: [#2193]<br>Implementation: [#6635] |
-| 1 | Tab tear-off | The ability to tear a tab out of the current window and spawn a new window or attach it to a separate window.<br><br>Issue: [#1256], [#5000]<br>Spec: [#2080], [#7240] |
-| 1 | Clickable links | Hyperlinking any links that appear in the text buffer. When clicking on the link, the link will open in your default browser.<br><br>Issue: [#574]<br>Implementation: [#7251] |
-| 1 | Default terminal | If a command-line application is spawned, it should open in Windows Terminal (if installed) or your preferred terminal<br><br>Issue: [#492]<br>Spec: [#2080], [#7414] |
-| 1 | Overall theme support | Tab coloring, title bar coloring, pane border coloring, pane border width, definition of what makes a theme<br><br>Issue: [#3327]<br>Spec: [#5772] |
-| 1 | Open profile elevated | Configure profiles to always open elevated (if Terminal was run unelevated)<br><br>Issue: [#5000], [#632]<br>Spec: [#8455] |
-| 1 | Open tab in existing window | Open new tabs in existing Terminal windows<br><br>Issue: [#5000], [#4472]<br>Spec: [#8135] |
-| 1 | Traditional opacity | Have a transparent background without the acrylic blur.<br><br>Issue: [#603] <br>**Current State**: Blocked on WinUI 3.0 |
-| 2 | SnapOnOutput, scroll lock | Pause output or scrolling on click.<br><br>Issue: [#980]<br>Spec: [#2529]<br>Implementation: [#6062] |
-| 2 | Infinite scrollback | Have an infinite history for the text buffer.<br><br>Issue: [#1410] |
-| 2 | Pane management | All issues listed out in the original issue. Some features include pane resizing with mouse, pane zooming, and opening a pane by prompting which profile to use.<br><br>Issue: [#1000] |
-| 2 | Theme marketplace | Marketplace for creation and distribution of themes.<br>Dependent on overall theming |
-| 2 | Jump list | Show profiles from task bar (on right click)/start menu.<br><br>Issue: [#576]<br>Implementation: [#7515] |
-| 2 | Open with multiple tabs | A setting that allows Windows Terminal to launch with a specific tab configuration (not using only command line arguments).<br><br>Issue: [#756] |
-| 3 | Open in Windows Terminal | Functionality to right click on a file or folder and select Open in Windows Terminal.<br><br>Issue: [#1060]<br>Implementation: [#6100] |
-| 3 | Session restoration | Launch Windows Terminal and the previous session is restored with the proper tab and pane configuration and starting directories.<br><br>Issues: [#961], [#960], [#766] |
-| 3 | Quake mode | Provide a quick launch terminal that appears and disappears when a hotkey is pressed.<br><br>Issue: [#653] |
-| 3 | Settings migration infrastructure | Migrate people's settings without breaking them. Hand-in-hand with settings UI. |
-| 3 | Pointer bindings | Provide settings that can be bound to the mouse.<br><br>Issue: [#1553] |
+| Priority\* | Scenario | Description/Notes | State |
+| ---------- | -------- | ----------------- | ----- |
+| 0 | Settings UI | A user interface that connects to settings.json. This provides a way for people to edit their settings without having to edit a JSON file.<br><br>Issue: [#1564]<br>Specs: [#6720], [#6904]<br>Implementation: [#7283], [#7370], [#8048] | ✔️ |
+| 0 | Command palette | A popup menu to list possible actions and commands.<br><br>Issues: [#5400], [#2046]<br>Spec: [#2193]<br>Implementation: [#6635] | ✔️ |
+| 1 | Tab tear-off | The ability to tear a tab out of the current window and spawn a new window or attach it to a separate window.<br><br>Issue: [#1256], [#5000]<br>Spec: [#2080], [#7240] | 📝 |
+| 1 | Clickable links | Hyperlinking any links that appear in the text buffer. When clicking on the link, the link will open in your default browser.<br><br>Issue: [#574]<br>Implementation: [#7251] | ✔️ |
+| 1 | Default terminal | If a command-line application is spawned, it should open in Windows Terminal (if installed) or your preferred terminal<br><br>Issue: [#492]<br>Spec: [#2080], [#7414] | ✔️ |
+| 1 | Overall theme support | Tab coloring, title bar coloring, pane border coloring, pane border width, definition of what makes a theme<br><br>Issue: [#3327]<br>Spec: [#5772] | 🦶 |
+| 1 | Open profile elevated | Configure profiles to always open elevated (if Terminal was run unelevated)<br><br>Issue: [#5000], [#632]<br>Spec: [#8455] | 📝 |
+| 1 | Open tab in existing window | Open new tabs in existing Terminal windows<br><br>Issue: [#5000], [#4472]<br>Spec: [#8135] | ✔️ |
+| 1 | Traditional opacity | Have a transparent background without the acrylic blur.<br><br>Issue: [#603] | ✔️ |
+| 2 | SnapOnOutput, scroll lock | Pause output or scrolling on click.<br><br>Issue: [#980]<br>Spec: [#2529]<br>Implementation: [#6062] | ✔️ |
+| 2 | Infinite scrollback | Have an infinite history for the text buffer.<br><br>Issue: [#1410] | 🦶 |
+| 2 | Pane management | All issues listed out in the original issue. Some features include pane resizing with mouse, pane zooming, and opening a pane by prompting which profile to use.<br><br>Issue: [#1000] | 📝 |
+| 2 | Theme marketplace | Marketplace for creation and distribution of themes.<br>Dependent on overall theming | 🦶 |
+| 2 | Jump list | Show profiles from task bar (on right click)/start menu.<br><br>Issue: [#576]<br>Implementation: [#7515] | ✔️ |
+| 2 | Open with multiple tabs | A setting that allows Windows Terminal to launch with a specific tab configuration (not using only command line arguments).<br><br>Issue: [#756] | ✔️ |
+| 3 | Open in Windows Terminal | Functionality to right click on a file or folder and select Open in Windows Terminal.<br><br>Issue: [#1060]<br>Implementation: [#6100] | ✔️ |
+| 3 | Session restoration | Launch Windows Terminal and the previous session is restored with the proper tab and pane configuration and starting directories.<br><br>Issues: [#961], [#960], [#766] | ✔️ |
+| 3 | Quake mode | Provide a quick launch terminal that appears and disappears when a hotkey is pressed.<br><br>Issue: [#653] | ✔️ |
+| 3 | Settings migration infrastructure | Migrate people's settings without breaking them. Hand-in-hand with settings UI. | 🦶 |
+| 3 | Pointer bindings | Provide settings that can be bound to the mouse.<br><br>Issue: [#1553] | 🦶 |
+
+* 📝: The feature is currently in progress
+* ✔️: The feature is complete and shipped in a Preview build
+* 🦶: The feature is at risk of being punted to a future release cycle (beyond 2.0)
 
 Feature Notes:
 

From fe26a6efc0d7fdadfa8aebea7861ee43ab0043a3 Mon Sep 17 00:00:00 2001
From: Leonard Hecker <lhecker@microsoft.com>
Date: Wed, 27 Oct 2021 03:43:10 +0200
Subject: [PATCH 13/16] Fix loading of fragments that update multiple profiles
 (#11598)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The "updates" key is an alternative "guid" key for fragment profiles.
But SettingsLoader::_appendProfile stores and deduplicates profiles according
to their "guid" only. We need to modify the function to optionally store
profiles by their "updates" key as well, otherwise multiple fragment
profiles without "guid" might collide as they produce the same default GUID.

## PR Checklist
* [x] Closes #11597
* [x] I work here
* [ ] Tests added/passed
* [ ] Schema updated.
* [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx

## Validation Steps Performed
* Unit tests pass ✔️
* Issue #11597 doesn't reproduce anymore ✔️
---
 .../DeserializationTests.cpp                  | 33 ++++++++++
 .../TerminalSettingsModel/CascadiaSettings.h  |  3 +-
 .../CascadiaSettingsSerialization.cpp         | 62 +++++++++++--------
 3 files changed, 72 insertions(+), 26 deletions(-)

diff --git a/src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp b/src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp
index ea603c9420f..c20a9a853e4 100644
--- a/src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp
+++ b/src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp
@@ -7,7 +7,9 @@
 #include "../TerminalSettingsModel/CascadiaSettings.h"
 #include "JsonTestClass.h"
 #include "TestUtils.h"
+
 #include <defaults.h>
+#include <userDefaults.h>
 
 using namespace Microsoft::Console;
 using namespace WEX::Logging;
@@ -70,6 +72,7 @@ namespace SettingsModelLocalTests
         TEST_METHOD(TestCloneInheritanceTree);
         TEST_METHOD(TestValidDefaults);
         TEST_METHOD(TestInheritedCommand);
+        TEST_METHOD(LoadFragmentsWithMultipleUpdates);
 
     private:
         static winrt::com_ptr<implementation::CascadiaSettings> createSettings(const std::string_view& userJSON)
@@ -1979,4 +1982,34 @@ namespace SettingsModelLocalTests
             VERIFY_IS_NULL(actualKeyChord);
         }
     }
+
+    // This test ensures GH#11597 doesn't regress.
+    void DeserializationTests::LoadFragmentsWithMultipleUpdates()
+    {
+        static constexpr std::wstring_view fragmentSource{ L"fragment" };
+        static constexpr std::string_view fragmentJson{ R"({
+            "profiles": [
+                {
+                    "updates": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
+                    "cursorShape": "filledBox"
+                },
+                {
+                    "updates": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
+                    "cursorShape": "filledBox"
+                },
+                {
+                    "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
+                    "commandline": "cmd.exe"
+                }
+            ]
+        })" };
+
+        implementation::SettingsLoader loader{ std::string_view{}, DefaultJson };
+        loader.MergeInboxIntoUserSettings();
+        loader.MergeFragmentIntoUserSettings(winrt::hstring{ fragmentSource }, fragmentJson);
+        loader.FinalizeLayering();
+
+        VERIFY_IS_FALSE(loader.duplicateProfile);
+        VERIFY_ARE_EQUAL(3u, loader.userSettings.profiles.size());
+    }
 }
diff --git a/src/cascadia/TerminalSettingsModel/CascadiaSettings.h b/src/cascadia/TerminalSettingsModel/CascadiaSettings.h
index b96e299ff0a..f74eb90d1ec 100644
--- a/src/cascadia/TerminalSettingsModel/CascadiaSettings.h
+++ b/src/cascadia/TerminalSettingsModel/CascadiaSettings.h
@@ -57,6 +57,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         void ApplyRuntimeInitialSettings();
         void MergeInboxIntoUserSettings();
         void FindFragmentsAndMergeIntoUserSettings();
+        void MergeFragmentIntoUserSettings(const winrt::hstring& source, const std::string_view& content);
         void FinalizeLayering();
         bool DisableDeletedProfiles();
 
@@ -82,7 +83,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         void _parseFragment(const winrt::hstring& source, const std::string_view& content, ParsedSettings& settings);
         static JsonSettings _parseJson(const std::string_view& content);
         static winrt::com_ptr<implementation::Profile> _parseProfile(const OriginTag origin, const winrt::hstring& source, const Json::Value& profileJson);
-        void _appendProfile(winrt::com_ptr<implementation::Profile>&& profile, ParsedSettings& settings);
+        void _appendProfile(winrt::com_ptr<Profile>&& profile, const winrt::guid& guid, ParsedSettings& settings);
         static void _addParentProfile(const winrt::com_ptr<implementation::Profile>& profile, ParsedSettings& settings);
         void _executeGenerator(const IDynamicProfileGenerator& generator);
 
diff --git a/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp b/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp
index 83f0952c267..aa8402af18a 100644
--- a/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp
+++ b/src/cascadia/TerminalSettingsModel/CascadiaSettingsSerialization.cpp
@@ -207,26 +207,6 @@ void SettingsLoader::FindFragmentsAndMergeIntoUserSettings()
                 {
                     const auto content = ReadUTF8File(fragmentExt.path());
                     _parseFragment(source, content, fragmentSettings);
-
-                    for (const auto& fragmentProfile : fragmentSettings.profiles)
-                    {
-                        if (const auto updates = fragmentProfile->Updates(); updates != winrt::guid{})
-                        {
-                            if (const auto it = userSettings.profilesByGuid.find(updates); it != userSettings.profilesByGuid.end())
-                            {
-                                it->second->InsertParent(0, fragmentProfile);
-                            }
-                        }
-                        else
-                        {
-                            _addParentProfile(fragmentProfile, userSettings);
-                        }
-                    }
-
-                    for (const auto& kv : fragmentSettings.globals->ColorSchemes())
-                    {
-                        userSettings.globals->AddColorScheme(kv.Value());
-                    }
                 }
                 CATCH_LOG();
             }
@@ -289,6 +269,15 @@ void SettingsLoader::FindFragmentsAndMergeIntoUserSettings()
     }
 }
 
+// See FindFragmentsAndMergeIntoUserSettings.
+// This function does the same, but for a single given JSON blob and source
+// and at the time of writing is used for unit tests only.
+void SettingsLoader::MergeFragmentIntoUserSettings(const winrt::hstring& source, const std::string_view& content)
+{
+    ParsedSettings fragmentSettings;
+    _parseFragment(source, content, fragmentSettings);
+}
+
 // Call this method before passing SettingsLoader to the CascadiaSettings constructor.
 // It layers all remaining objects onto each other (those that aren't covered
 // by MergeInboxIntoUserSettings/FindFragmentsAndMergeIntoUserSettings).
@@ -475,7 +464,7 @@ void SettingsLoader::_parse(const OriginTag origin, const winrt::hstring& source
             // GH#9962: Discard Guid-less, Name-less profiles.
             if (profile->HasGuid())
             {
-                _appendProfile(std::move(profile), settings);
+                _appendProfile(std::move(profile), profile->Guid(), settings);
             }
         }
     }
@@ -517,14 +506,37 @@ void SettingsLoader::_parseFragment(const winrt::hstring& source, const std::str
                 auto profile = _parseProfile(OriginTag::Fragment, source, profileJson);
                 // GH#9962: Discard Guid-less, Name-less profiles, but...
                 // allow ones with an Updates field, as those are special for fragments.
-                if (profile->HasGuid() || profile->Updates() != winrt::guid{})
+                // We need to make sure to only call Guid() if HasGuid() is true,
+                // as Guid() will dynamically generate a return value otherwise.
+                const auto guid = profile->HasGuid() ? profile->Guid() : profile->Updates();
+                if (guid != winrt::guid{})
                 {
-                    _appendProfile(std::move(profile), settings);
+                    _appendProfile(std::move(profile), guid, settings);
                 }
             }
             CATCH_LOG()
         }
     }
+
+    for (const auto& fragmentProfile : settings.profiles)
+    {
+        if (const auto updates = fragmentProfile->Updates(); updates != winrt::guid{})
+        {
+            if (const auto it = userSettings.profilesByGuid.find(updates); it != userSettings.profilesByGuid.end())
+            {
+                it->second->InsertParent(0, fragmentProfile);
+            }
+        }
+        else
+        {
+            _addParentProfile(fragmentProfile, userSettings);
+        }
+    }
+
+    for (const auto& kv : settings.globals->ColorSchemes())
+    {
+        userSettings.globals->AddColorScheme(kv.Value());
+    }
 }
 
 SettingsLoader::JsonSettings SettingsLoader::_parseJson(const std::string_view& content)
@@ -564,11 +576,11 @@ winrt::com_ptr<Profile> SettingsLoader::_parseProfile(const OriginTag origin, co
 
 // Adds a profile to the ParsedSettings instance. Takes ownership of the profile.
 // It ensures no duplicate GUIDs are added to the ParsedSettings instance.
-void SettingsLoader::_appendProfile(winrt::com_ptr<Profile>&& profile, ParsedSettings& settings)
+void SettingsLoader::_appendProfile(winrt::com_ptr<Profile>&& profile, const winrt::guid& guid, ParsedSettings& settings)
 {
     // FYI: The static_cast ensures we don't move the profile into
     // `profilesByGuid`, even though we still need it later for `profiles`.
-    if (settings.profilesByGuid.emplace(profile->Guid(), static_cast<const winrt::com_ptr<Profile>&>(profile)).second)
+    if (settings.profilesByGuid.emplace(guid, static_cast<const winrt::com_ptr<Profile>&>(profile)).second)
     {
         settings.profiles.emplace_back(profile);
     }

From 8560b4adfb58f708bd0a4158999b1fa4e2e29f98 Mon Sep 17 00:00:00 2001
From: Leonard Hecker <lhecker@microsoft.com>
Date: Wed, 27 Oct 2021 19:59:28 +0200
Subject: [PATCH 14/16] Fix OpenConsoleProxy for Debug builds (#11632)

---
 src/host/proxy/Host.Proxy.vcxproj  |  1 +
 src/host/proxy/nodefaultlib_shim.h | 16 +++-------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/host/proxy/Host.Proxy.vcxproj b/src/host/proxy/Host.Proxy.vcxproj
index 5888ce0c3cc..ed7283eba0a 100644
--- a/src/host/proxy/Host.Proxy.vcxproj
+++ b/src/host/proxy/Host.Proxy.vcxproj
@@ -62,6 +62,7 @@
       <!-- Must be Stdcall on all platforms to resolve _ObjectStublessClient3 -->
       <PreprocessorDefinitions>REGISTER_PROXY_DLL;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <BufferSecurityCheck>false</BufferSecurityCheck>
       <SDLCheck>false</SDLCheck>
       <ForcedIncludeFiles>nodefaultlib_shim.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
diff --git a/src/host/proxy/nodefaultlib_shim.h b/src/host/proxy/nodefaultlib_shim.h
index 09c0ad53c8e..4face4e49f2 100644
--- a/src/host/proxy/nodefaultlib_shim.h
+++ b/src/host/proxy/nodefaultlib_shim.h
@@ -1,18 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-#include <guiddef.h>
-
-#if !defined(_M_IX86) && !defined(_M_X64)
+#pragma once
 
-// ARM64 doesn't define a (__builtin_)memcmp function without CRT,
-// but we need one to compile IID_GENERIC_CHECK_IID.
-// Luckily we only ever use memcmp for IIDs.
-#pragma function(memcmp)
-inline int memcmp(const IID* a, const IID* b, size_t count)
-{
-    (void)(count);
-    return 1 - InlineIsEqualGUID(a, b);
-}
+#include <guiddef.h>
 
-#endif
+#define memcmp(a, b, c) (!InlineIsEqualGUID(a, b))

From 5bc094e12a3b1334ec712537c4e6bf42c8a0c718 Mon Sep 17 00:00:00 2001
From: Leonard Hecker <lhecker@microsoft.com>
Date: Thu, 28 Oct 2021 14:08:53 +0200
Subject: [PATCH 15/16] Improve conhost CPU usage during text selection
 (#11634)

---
 src/host/selection.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/host/selection.cpp b/src/host/selection.cpp
index 7814bfae9c9..90bb5668f3e 100644
--- a/src/host/selection.cpp
+++ b/src/host/selection.cpp
@@ -255,6 +255,14 @@ void Selection::ExtendSelection(_In_ COORD coordBufferPos)
         srNewSelection.Top = _coordSelectionAnchor.Y;
     }
 
+    // This function is called on WM_MOUSEMOVE.
+    // Prevent triggering an invalidation just because the mouse moved
+    // in the same cell without changing the actual (visible) selection.
+    if (_srSelectionRect == srNewSelection)
+    {
+        return;
+    }
+
     // call special update method to modify the displayed selection in-place
     // NOTE: Using HideSelection, editing the rectangle, then ShowSelection will cause flicker.
     //_PaintUpdateSelection(&srNewSelection);

From 756fd444b1d443320cf2ed6887d4b65aa67a9a03 Mon Sep 17 00:00:00 2001
From: Love F <lovef.code@gmail.com>
Date: Thu, 28 Oct 2021 17:38:23 +0200
Subject: [PATCH 16/16] Trim trailing whitespace option (#11473)

<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
Opt in setting to trim trailing white space when pasting a text into the terminal

<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References

<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #9400
* [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA
* [ ] Tests added/passed
* [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx
* [ ] Schema updated.
* [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx

<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments

<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
Manually testing to paste text with and without trailing white spaces, with and without the option activated
---
 .../SerializationTests.cpp                       |  1 +
 src/cascadia/TerminalApp/TerminalPage.cpp        | 16 ++++++++++++++++
 .../TerminalSettingsEditor/Interaction.xaml      |  5 +++++
 .../Resources/en-US/Resources.resw               |  6 +++++-
 .../TerminalSettingsModel/GlobalAppSettings.cpp  |  4 ++++
 .../TerminalSettingsModel/GlobalAppSettings.h    |  1 +
 .../TerminalSettingsModel/GlobalAppSettings.idl  |  1 +
 src/cascadia/TerminalSettingsModel/defaults.json |  1 +
 8 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp b/src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp
index 10214b861e6..ff2aefdb6b8 100644
--- a/src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp
+++ b/src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp
@@ -97,6 +97,7 @@ namespace SettingsModelLocalTests
                 "confirmCloseAllTabs": true,
                 "largePasteWarning": true,
                 "multiLinePasteWarning": true,
+                "trimPaste": true,
 
                 "experimental.input.forceVT": false,
                 "experimental.rendering.forceFullRepaint": false,
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index b779b506918..7a2a7162f07 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -1869,6 +1869,22 @@ namespace winrt::TerminalApp::implementation
                 }
             }
 
+            if (_settings.GlobalSettings().TrimPaste())
+            {
+                std::wstring_view textView{ text };
+                const auto pos = textView.find_last_not_of(L"\t\n\v\f\r ");
+                if (pos == textView.npos)
+                {
+                    // Text is all white space, nothing to paste
+                    co_return;
+                }
+                else if (const auto toRemove = textView.size() - 1 - pos; toRemove > 0)
+                {
+                    textView.remove_suffix(toRemove);
+                    text = { textView };
+                }
+            }
+
             bool warnMultiLine = _settings.GlobalSettings().WarnAboutMultiLinePaste();
             if (warnMultiLine)
             {
diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.xaml b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
index 6b93c5847fb..8bdf829f65b 100644
--- a/src/cascadia/TerminalSettingsEditor/Interaction.xaml
+++ b/src/cascadia/TerminalSettingsEditor/Interaction.xaml
@@ -45,6 +45,11 @@
                 <ToggleSwitch IsOn="{x:Bind State.Globals.TrimBlockSelection, Mode=TwoWay}" />
             </local:SettingContainer>
 
+            <!--  Trim Paste  -->
+            <local:SettingContainer x:Uid="Globals_TrimPaste">
+                <ToggleSwitch IsOn="{x:Bind State.Globals.TrimPaste, Mode=TwoWay}" />
+            </local:SettingContainer>
+
             <!--  Word Delimiters  -->
             <local:SettingContainer x:Uid="Globals_WordDelimiters">
                 <TextBox IsSpellCheckEnabled="False"
diff --git a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
index ae939a52a98..0ebd1cef410 100644
--- a/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
+++ b/src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -247,6 +247,10 @@
     <value>Remove trailing white-space in rectangular selection</value>
     <comment>Header for a control to toggle whether a text selected with block selection should be trimmed of white spaces when copied to the clipboard, or not.</comment>
   </data>
+  <data name="Globals_TrimPaste.Header" xml:space="preserve">
+    <value>Remove trailing white-space when pasting</value>
+    <comment>Header for a control to toggle whether pasted text should be trimmed of white spaces, or not.</comment>
+  </data>
   <data name="Globals_KeybindingsDisclaimer.Text" xml:space="preserve">
     <value>Below are the currently bound keys, which can be modified by editing the JSON settings file.</value>
     <comment>A disclaimer located at the top of the actions page that presents the list of keybindings.</comment>
diff --git a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp
index 53c0fd90f7a..2680cb85758 100644
--- a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp
+++ b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp
@@ -35,6 +35,7 @@ static constexpr std::string_view CopyOnSelectKey{ "copyOnSelect" };
 static constexpr std::string_view CopyFormattingKey{ "copyFormatting" };
 static constexpr std::string_view WarnAboutLargePasteKey{ "largePasteWarning" };
 static constexpr std::string_view WarnAboutMultiLinePasteKey{ "multiLinePasteWarning" };
+static constexpr std::string_view TrimPasteKey{ "trimPaste" };
 static constexpr std::string_view LaunchModeKey{ "launchMode" };
 static constexpr std::string_view ConfirmCloseAllKey{ "confirmCloseAllTabs" };
 static constexpr std::string_view SnapToGridOnResizeKey{ "snapToGridOnResize" };
@@ -101,6 +102,7 @@ winrt::com_ptr<GlobalAppSettings> GlobalAppSettings::Copy() const
     globals->_CopyFormatting = _CopyFormatting;
     globals->_WarnAboutLargePaste = _WarnAboutLargePaste;
     globals->_WarnAboutMultiLinePaste = _WarnAboutMultiLinePaste;
+    globals->_TrimPaste = _TrimPaste;
     globals->_InitialPosition = _InitialPosition;
     globals->_CenterOnLaunch = _CenterOnLaunch;
     globals->_LaunchMode = _LaunchMode;
@@ -201,6 +203,7 @@ void GlobalAppSettings::LayerJson(const Json::Value& json)
     JsonUtils::GetValueForKey(json, CopyFormattingKey, _CopyFormatting);
     JsonUtils::GetValueForKey(json, WarnAboutLargePasteKey, _WarnAboutLargePaste);
     JsonUtils::GetValueForKey(json, WarnAboutMultiLinePasteKey, _WarnAboutMultiLinePaste);
+    JsonUtils::GetValueForKey(json, TrimPasteKey, _TrimPaste);
     JsonUtils::GetValueForKey(json, FirstWindowPreferenceKey, _FirstWindowPreference);
     JsonUtils::GetValueForKey(json, LaunchModeKey, _LaunchMode);
     JsonUtils::GetValueForKey(json, LanguageKey, _Language);
@@ -306,6 +309,7 @@ Json::Value GlobalAppSettings::ToJson() const
     JsonUtils::SetValueForKey(json, CopyFormattingKey,              _CopyFormatting);
     JsonUtils::SetValueForKey(json, WarnAboutLargePasteKey,         _WarnAboutLargePaste);
     JsonUtils::SetValueForKey(json, WarnAboutMultiLinePasteKey,     _WarnAboutMultiLinePaste);
+    JsonUtils::SetValueForKey(json, TrimPasteKey,                   _TrimPaste);
     JsonUtils::SetValueForKey(json, FirstWindowPreferenceKey,       _FirstWindowPreference);
     JsonUtils::SetValueForKey(json, LaunchModeKey,                  _LaunchMode);
     JsonUtils::SetValueForKey(json, LanguageKey,                    _Language);
diff --git a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.h b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.h
index 32f73cafec1..022700264c2 100644
--- a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.h
+++ b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.h
@@ -77,6 +77,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         INHERITABLE_SETTING(Model::GlobalAppSettings, winrt::Microsoft::Terminal::Control::CopyFormat, CopyFormatting, 0);
         INHERITABLE_SETTING(Model::GlobalAppSettings, bool, WarnAboutLargePaste, true);
         INHERITABLE_SETTING(Model::GlobalAppSettings, bool, WarnAboutMultiLinePaste, true);
+        INHERITABLE_SETTING(Model::GlobalAppSettings, bool, TrimPaste, true);
         INHERITABLE_SETTING(Model::GlobalAppSettings, Model::LaunchPosition, InitialPosition, nullptr, nullptr);
         INHERITABLE_SETTING(Model::GlobalAppSettings, bool, CenterOnLaunch, false);
         INHERITABLE_SETTING(Model::GlobalAppSettings, Model::FirstWindowPreference, FirstWindowPreference, FirstWindowPreference::DefaultProfile);
diff --git a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl
index 66b2125df8e..09448b57971 100644
--- a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl
+++ b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl
@@ -63,6 +63,7 @@ namespace Microsoft.Terminal.Settings.Model
         INHERITABLE_SETTING(Microsoft.Terminal.Control.CopyFormat, CopyFormatting);
         INHERITABLE_SETTING(Boolean, WarnAboutLargePaste);
         INHERITABLE_SETTING(Boolean, WarnAboutMultiLinePaste);
+        INHERITABLE_SETTING(Boolean, TrimPaste);
         INHERITABLE_SETTING(LaunchPosition, InitialPosition);
         INHERITABLE_SETTING(Boolean, CenterOnLaunch);
         INHERITABLE_SETTING(FirstWindowPreference, FirstWindowPreference);
diff --git a/src/cascadia/TerminalSettingsModel/defaults.json b/src/cascadia/TerminalSettingsModel/defaults.json
index 1c7f734f70c..8123a2aac47 100644
--- a/src/cascadia/TerminalSettingsModel/defaults.json
+++ b/src/cascadia/TerminalSettingsModel/defaults.json
@@ -12,6 +12,7 @@
     "copyOnSelect": false,
     "copyFormatting": true,
     "trimBlockSelection": false,
+    "trimPaste": true,
     "wordDelimiters": " /\\()\"'-.,:;<>~!@#$%^&*|+=[]{}~?\u2502",
 
     // Tab UI