Migrate spelling-0.0.21 changes from main

.github/linters/.markdown-lint.yml

@@ -1,40 +0,0 @@
----
-###########################
-###########################
-## Markdown Linter rules ##
-###########################
-###########################
-
-# Linter rules doc:
-# - https://github.com/DavidAnson/markdownlint
-#
-# Note:
-# To comment out a single error:
-#   <!-- markdownlint-disable -->
-#   any violations you want
-#   <!-- markdownlint-restore -->
-#
-# To run the linter locally:
-# 1. install the npm package:
-#    `npm install -g markdownlint-cli`
-# 2. Then run it in the root of the repo with
-#    `markdownlint -c .github\linters\.markdown-lint.yml ./*.md`
-
-###############
-# Rules by id #
-###############
-MD004: false                  # Unordered list style
-MD007:
-  indent: 2                   # Unordered list indentation
-MD013:
-  line_length: 400            # Line length 80 is far to short
-MD026:
-  punctuation: ".,;:!。，；:"  # List of not allowed
-MD029: false                  # Ordered list item prefix
-MD033: false                  # Allow inline HTML
-MD036: false                  # Emphasis used instead of a heading
-
-#################
-# Rules by tags #
-#################
-blank_lines: false  # Error on blank lines

.github/workflows/linter.yml

@@ -1,51 +0,0 @@
----
-###########################
-###########################
-## Linter GitHub Actions ##
-###########################
-###########################
-name: Lint Code Base
-
-#
-# Documentation:
-# https://help.github.com/en/articles/workflow-syntax-for-github-actions
-#
-
-#############################
-# Start the job on all push #
-#############################
-on:
-  pull_request:
-    branches: [master]
-
-###############
-# Set the Job #
-###############
-jobs:
-  build:
-    # Name the Job
-    name: Lint Code Base
-    # Set the agent to run on
-    runs-on: ubuntu-latest
-
-    ##################
-    # Load all steps #
-    ##################
-    steps:
-      ##########################
-      # Checkout the code base #
-      ##########################
-      - name: Checkout Code
-        uses: actions/checkout@v2
-
-      ################################
-      # Run Linter against code base #
-      ################################
-      - name: Lint Code Base
-        uses: github/super-linter@v3.10.0
-        env:
-          VALIDATE_ALL_CODEBASE: false
-          DEFAULT_BRANCH: master
-          MARKDOWN_CONFIG_FILE: .markdown-lint.yml
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VALIDATE_EDITORCONFIG: false

CONTRIBUTING.md

@@ -140,13 +140,6 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and you
 1. Create & push a feature branch
 1. Create a [Draft Pull Request (PR)](https://github.blog/2019-02-14-introducing-draft-pull-requests/)
 1. Work on your changes
-1. Build and see if it works. Consult [How to build OpenConsole](./doc/building.md) if you have problems.
-
-### Testing
-
-Testing is a key component in the development workflow. Both Windows Terminal and Windows Console use TAEF(the Test Authoring and Execution Framework) as the main framework for testing.
-
-If your changes affect existing test cases, or you're working on brand new features and also the accompanying test cases, see [TAEF](./doc/TAEF.md) for more information about how to validate your work locally.
 
 ### Code Review
 

README.md

@@ -7,25 +7,21 @@ This repository contains the source code for:
 * The Windows console host (`conhost.exe`)
 * Components shared between the two projects
 * [ColorTool](https://github.com/Microsoft/Terminal/tree/master/src/tools/ColorTool)
-* [Sample projects](https://github.com/Microsoft/Terminal/tree/master/samples)
-  that show how to consume the Windows Console APIs
+* [Sample projects](https://github.com/Microsoft/Terminal/tree/master/samples) that show how to consume the Windows Console APIs
 
 Related repositories include:
 
-* [Windows Terminal Documentation](https://docs.microsoft.com/windows/terminal)
-  ([Repo: Contribute to the docs](https://github.com/MicrosoftDocs/terminal))
+* [Windows Terminal Documentation](https://docs.microsoft.com/windows/terminal) ([Repo: Contribute to the docs](https://github.com/MicrosoftDocs/terminal))
 * [Console API Documentation](https://github.com/MicrosoftDocs/Console-Docs)
 * [Cascadia Code Font](https://github.com/Microsoft/Cascadia-Code)
 
 ## Installing and running Windows Terminal
 
-> 🔴 Note: Windows Terminal requires Windows 10 1903 (build 18362) or later
+> 👉 Note: Windows Terminal requires Windows 10 1903 (build 18362) or later
 
 ### Microsoft Store [Recommended]
 
-Install the [Windows Terminal from the Microsoft Store][store-install-link].
-This allows you to always be on the latest version when we release new builds
-with automatic upgrades.
+Install the [Windows Terminal from the Microsoft Store][store-install-link]. This allows you to always be on the latest version when we release new builds with automatic upgrades.
 
 This is our preferred method.
 
@@ -33,21 +29,16 @@ This is our preferred method.
 
 #### Via GitHub
 
-For users who are unable to install Terminal from the Microsoft Store, Terminal
-builds can be manually downloaded from this repository's [Releases
-page](https://github.com/microsoft/terminal/releases).
+For users who are unable to install Terminal from the Microsoft Store, Terminal builds can be manually downloaded from this repository's [Releases page](https://github.com/microsoft/terminal/releases).
 
-> 🔴 Note: If you install Terminal manually:
+> ⚠ Note: If you install Terminal manually:
 >
-> * Terminal will not auto-update when new builds are released so you will need
->   to regularly install the latest Terminal release to receive all the latest
->   fixes and improvements!
+> * Be sure to install the [Desktop Bridge VC++ v14 Redistributable Package](https://www.microsoft.com/en-us/download/details.aspx?id=53175) otherwise Terminal may not install and/or run and may crash at startup
+> * Terminal will not auto-update when new builds are released so you will need to regularly install the latest Terminal release to receive all the latest fixes and improvements!
 
 #### Via Windows Package Manager CLI (aka winget)
 
-[winget](https://github.com/microsoft/winget-cli) users can download and install
-the latest Terminal release by installing the `Microsoft.WindowsTerminal`
-package:
+[winget](https://github.com/microsoft/winget-cli) users can download and install the latest Terminal release by installing the `Microsoft.WindowsTerminal` package:
 
 ```powershell
 winget install --id=Microsoft.WindowsTerminal -e
@@ -55,8 +46,7 @@ winget install --id=Microsoft.WindowsTerminal -e
 
 #### Via Chocolatey (unofficial)
 
-[Chocolatey](https://chocolatey.org) users can download and install the latest
-Terminal release by installing the `microsoft-windows-terminal` package:
+[Chocolatey](https://chocolatey.org) users can download and install the latest Terminal release by installing the `microsoft-windows-terminal` package:
 
 ```powershell
 choco install microsoft-windows-terminal
@@ -68,15 +58,11 @@ To upgrade Windows Terminal using Chocolatey, run the following:
 choco upgrade microsoft-windows-terminal
 ```
 
-If you have any issues when installing/upgrading the package please go to the
-[Windows Terminal package
-page](https://chocolatey.org/packages/microsoft-windows-terminal) and follow the
-[Chocolatey triage process](https://chocolatey.org/docs/package-triage-process)
+If you have any issues when installing/upgrading the package please go to the [Windows Terminal package page](https://chocolatey.org/packages/microsoft-windows-terminal) and follow the [Chocolatey triage process](https://chocolatey.org/docs/package-triage-process)
 
 #### Via Scoop (unofficial)
 
-[Scoop](https://scoop.sh) users can download and install the latest Terminal
-release by installing the `windows-terminal` package:
+[Scoop](https://scoop.sh) users can download and install the latest Terminal release by installing the `windows-terminal` package:
 
 ```powershell
 scoop install windows-terminal
@@ -88,123 +74,70 @@ To update Windows Terminal using Scoop, run the following:
 scoop update windows-terminal
 ```
 
-If you have any issues when installing/updating the package, please search for
-or report the same on the [issues
-page](https://github.com/lukesampson/scoop-extras/issues) of Scoop Extras bucket
-repository.
+If you have any issues when installing/updating the package, please search for or report the same on the [issues page](https://github.com/lukesampson/scoop-extras/issues) of Scoop Extras bucket repository.  
 
 ---
 
 ## Windows Terminal 2.0 Roadmap
 
-The plan for delivering Windows Terminal 2.0 [is described
-here](/doc/terminal-v2-roadmap.md) and will be updated as the project proceeds.
+The plan for delivering Windows Terminal 2.0 [is described here](/doc/terminal-v2-roadmap.md) and will be updated as the project proceeds.
 
 ## Project Build Status
 
 Project|Build Status
 ---|---
-Terminal|[![Terminal Build Status](https://dev.azure.com/ms/Terminal/_apis/build/status/Terminal%20CI?branchName=master)](https://dev.azure.com/ms/Terminal/_build?definitionId=136)
-ColorTool|![Colortool Build Status](https://microsoft.visualstudio.com/_apis/public/build/definitions/c93e867a-8815-43c1-92c4-e7dd5404f1e1/17023/badge)
+Terminal|[![Build Status](https://dev.azure.com/ms/Terminal/_apis/build/status/Terminal%20CI?branchName=master)](https://dev.azure.com/ms/Terminal/_build?definitionId=136)
+ColorTool|![](https://microsoft.visualstudio.com/_apis/public/build/definitions/c93e867a-8815-43c1-92c4-e7dd5404f1e1/17023/badge)
 
 ---
 
 ## Terminal & Console Overview
 
-Please take a few minutes to review the overview below before diving into the
-code:
+Please take a few minutes to review the overview below before diving into the code:
 
 ### Windows Terminal
 
-Windows Terminal is a new, modern, feature-rich, productive terminal application
-for command-line users. It includes many of the features most frequently
-requested by the Windows command-line community including support for tabs, rich
-text, globalization, configurability, theming & styling, and more.
+Windows Terminal is a new, modern, feature-rich, productive terminal application for command-line users. It includes many of the features most frequently requested by the Windows command-line community including support for tabs, rich text, globalization, configurability, theming & styling, and more.
 
-The Terminal will also need to meet our goals and measures to ensure it remains
-fast and efficient, and doesn't consume vast amounts of memory or power.
+The Terminal will also need to meet our goals and measures to ensure it remains fast and efficient, and doesn't consume vast amounts of memory or power.
 
 ### The Windows Console Host
 
-The Windows Console host, `conhost.exe`, is Windows' original command-line user
-experience. It also hosts Windows' command-line infrastructure and the Windows
-Console API server, input engine, rendering engine, user preferences, etc. The
-console host code in this repository is the actual source from which the
-`conhost.exe` in Windows itself is built.
+The Windows Console host, `conhost.exe`, is Windows' original command-line user experience. It also hosts Windows' command-line infrastructure and the Windows Console API server, input engine, rendering engine, user preferences, etc. The console host code in this repository is the actual source from which the `conhost.exe` in Windows itself is built.
 
-Since taking ownership of the Windows command-line in 2014, the team added
-several new features to the Console, including background transparency,
-line-based selection, support for [ANSI / Virtual Terminal
-sequences](https://en.wikipedia.org/wiki/ANSI_escape_code), [24-bit
-color](https://devblogs.microsoft.com/commandline/24-bit-color-in-the-windows-console/),
-a [Pseudoconsole
-("ConPTY")](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/),
-and more.
+Since taking ownership of the Windows command-line in 2014, the team added several new features to the Console, including background transparency, line-based selection, support for [ANSI / Virtual Terminal sequences](https://en.wikipedia.org/wiki/ANSI_escape_code), [24-bit color](https://devblogs.microsoft.com/commandline/24-bit-color-in-the-windows-console/), a [Pseudoconsole ("ConPTY")](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/), and more.
 
-However, because Windows Console's primary goal is to maintain backward
-compatibility, we have been unable to add many of the features the community
-(and the team) have been wanting for the last several years including tabs,
-unicode text, and emoji.
+However, because Windows Console's primary goal is to maintain backward compatibility, we have been unable to add many of the features the community (and the team) have been wanting for the last several years including tabs, unicode text, and emoji.
 
 These limitations led us to create the new Windows Terminal.
 
-> You can read more about the evolution of the command-line in general, and the
-> Windows command-line specifically in [this accompanying series of blog
-> posts](https://devblogs.microsoft.com/commandline/windows-command-line-backgrounder/)
-> on the Command-Line team's blog.
+> You can read more about the evolution of the command-line in general, and the Windows command-line specifically in [this accompanying series of blog posts](https://devblogs.microsoft.com/commandline/windows-command-line-backgrounder/) on the Command-Line team's blog.
 
 ### Shared Components
 
-While overhauling Windows Console, we modernized its codebase considerably,
-cleanly separating logical entities into modules and classes, introduced some
-key extensibility points, replaced several old, home-grown collections and
-containers with safer, more efficient [STL
-containers](https://docs.microsoft.com/en-us/cpp/standard-library/stl-containers?view=vs-2019),
-and made the code simpler and safer by using Microsoft's [Windows Implementation
-Libraries - WIL](https://github.com/Microsoft/wil).
+While overhauling Windows Console, we modernized its codebase considerably, cleanly separating logical entities into modules and classes, introduced some key extensibility points, replaced several old, home-grown collections and containers with safer, more efficient [STL containers](https://docs.microsoft.com/en-us/cpp/standard-library/stl-containers?view=vs-2019), and made the code simpler and safer by using Microsoft's [Windows Implementation Libraries - WIL](https://github.com/Microsoft/wil).
 
-This overhaul resulted in several of Console's key components being available
-for re-use in any terminal implementation on Windows. These components include a
-new DirectWrite-based text layout and rendering engine, a text buffer capable of
-storing both UTF-16 and UTF-8, a VT parser/emitter, and more.
+This overhaul resulted in several of Console's key components being available for re-use in any terminal implementation on Windows. These components include a new DirectWrite-based text layout and rendering engine, a text buffer capable of storing both UTF-16 and UTF-8, a VT parser/emitter, and more.
 
 ### Creating the new Windows Terminal
 
-When we started planning the new Windows Terminal application, we explored and
-evaluated several approaches and technology stacks. We ultimately decided that
-our goals would be best met by continuing our investment in our C++ codebase,
-which would allow us to reuse several of the aforementioned modernized
-components in both the existing Console and the new Terminal. Further, we
-realized that this would allow us to build much of the Terminal's core itself as
-a reusable UI control that others can incorporate into their own applications.
+When we started planning the new Windows Terminal application, we explored and evaluated several approaches and technology stacks. We ultimately decided that our goals would be best met by continuing our investment in our C++ codebase, which would allow us to reuse several of the aforementioned modernized components in both the existing Console and the new Terminal. Further, we realized that this would allow us to build much of the Terminal's core itself as a reusable UI control that others can incorporate into their own applications.
 
-The result of this work is contained within this repo and delivered as the
-Windows Terminal application you can download from the Microsoft Store, or
-[directly from this repo's
-releases](https://github.com/microsoft/terminal/releases).
+The result of this work is contained within this repo and delivered as the Windows Terminal application you can download from the Microsoft Store, or [directly from this repo's releases](https://github.com/microsoft/terminal/releases).
 
 ---
 
 ## Resources
 
-For more information about Windows Terminal, you may find some of these
-resources useful and interesting:
+For more information about Windows Terminal, you may find some of these resources useful and interesting:
 
 * [Command-Line Blog](https://devblogs.microsoft.com/commandline)
-* [Command-Line Backgrounder Blog
-  Series](https://devblogs.microsoft.com/commandline/windows-command-line-backgrounder/)
-* Windows Terminal Launch: [Terminal "Sizzle
-  Video"](https://www.youtube.com/watch?v=8gw0rXPMMPE&list=PLEHMQNlPj-Jzh9DkNpqipDGCZZuOwrQwR&index=2&t=0s)
-* Windows Terminal Launch: [Build 2019
-  Session](https://www.youtube.com/watch?v=KMudkRcwjCw)
-* Run As Radio: [Show 645 - Windows Terminal with Richard
-  Turner](http://www.runasradio.com/Shows/Show/645)
-* Azure Devops Podcast: [Episode 54 - Kayla Cinnamon and Rich Turner on DevOps
-  on the Windows
-  Terminal](http://azuredevopspodcast.clear-measure.com/kayla-cinnamon-and-rich-turner-on-devops-on-the-windows-terminal-team-episode-54)
-* Microsoft Ignite 2019 Session: [The Modern Windows Command Line: Windows
-  Terminal -
-  BRK3321](https://myignite.techcommunity.microsoft.com/sessions/81329?source=sessions)
+* [Command-Line Backgrounder Blog Series](https://devblogs.microsoft.com/commandline/windows-command-line-backgrounder/)
+* Windows Terminal Launch: [Terminal "Sizzle Video"](https://www.youtube.com/watch?v=8gw0rXPMMPE&list=PLEHMQNlPj-Jzh9DkNpqipDGCZZuOwrQwR&index=2&t=0s)
+* Windows Terminal Launch: [Build 2019 Session](https://www.youtube.com/watch?v=KMudkRcwjCw)
+* Run As Radio: [Show 645 - Windows Terminal with Richard Turner](http://www.runasradio.com/Shows/Show/645)
+* Azure Devops Podcast: [Episode 54 - Kayla Cinnamon and Rich Turner on DevOps on the Windows Terminal](http://azuredevopspodcast.clear-measure.com/kayla-cinnamon-and-rich-turner-on-devops-on-the-windows-terminal-team-episode-54)
+* Microsoft Ignite 2019 Session: [The Modern Windows Command Line: Windows Terminal - BRK3321](https://myignite.techcommunity.microsoft.com/sessions/81329?source=sessions)
 
 ---
 
@@ -214,50 +147,35 @@ resources useful and interesting:
 
 Cause: You're launching the incorrect solution in Visual Studio.
 
-Solution: Make sure you're building & deploying the `CascadiaPackage` project in
-Visual Studio.
+Solution: Make sure you're building & deploying the `CascadiaPackage` project in Visual Studio.
 
-> ⚠ Note: `OpenConsole.exe` is just a locally-built `conhost.exe`, the classic
-> Windows Console that hosts Windows' command-line infrastructure. OpenConsole
-> is used by Windows Terminal to connect to and communicate with command-line
-> applications (via
-> [ConPty](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/)).
+> ⚠ Note: `OpenConsole.exe` is just a locally-built `conhost.exe`, the classic Windows Console that hosts Windows' command-line infrastructure. OpenConsole is used by Windows Terminal to connect to and communicate with command-line applications (via [ConPty](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/)).
 
 ---
 
 ## Documentation
 
-All project documentation is located at aka.ms/terminal-docs. If you would like
-to contribute to the documentation, please submit a pull request on the [Windows
-Terminal Documentation repo](https://github.com/MicrosoftDocs/terminal).
+All project documentation is located at aka.ms/terminal-docs. If you would like to contribute to the documentation, please submit a pull request on the [Windows Terminal Documentation repo](https://github.com/MicrosoftDocs/terminal).
 
 ---
 
 ## Contributing
 
-We are excited to work alongside you, our amazing community, to build and
-enhance Windows Terminal\!
+We are excited to work alongside you, our amazing community, to build and enhance Windows Terminal\!
 
-***BEFORE you start work on a feature/fix***, please read & follow our
-[Contributor's
-Guide](https://github.com/microsoft/terminal/blob/master/CONTRIBUTING.md) to
-help avoid any wasted or duplicate effort.
+***BEFORE you start work on a feature/fix***, please read & follow our [Contributor's Guide](https://github.com/microsoft/terminal/blob/master/CONTRIBUTING.md) to help avoid any wasted or duplicate effort.
 
 ## Communicating with the Team
 
 The easiest way to communicate with the team is via GitHub issues.
 
-Please file new issues, feature requests and suggestions, but **DO search for
-similar open/closed pre-existing issues before creating a new issue.**
+Please file new issues, feature requests and suggestions, but **DO search for similar open/closed pre-existing issues before creating a new issue.**
 
-If you would like to ask a question that you feel doesn't warrant an issue
-(yet), please reach out to us via Twitter:
+If you would like to ask a question that you feel doesn't warrant an issue (yet), please reach out to us via Twitter:
 
-* Kayla Cinnamon, Program Manager:
-  [@cinnamon\_msft](https://twitter.com/cinnamon_msft)
+* Kayla Cinnamon, Program Manager: [@cinnamon\_msft](https://twitter.com/cinnamon_msft)
 * Dustin Howett, Engineering Lead: [@dhowett](https://twitter.com/DHowett)
-* Michael Niksa, Senior Developer:
-  [@michaelniksa](https://twitter.com/MichaelNiksa)
+* Michael Niksa, Senior Developer: [@michaelniksa](https://twitter.com/MichaelNiksa)
 * Mike Griese, Developer: [@zadjii](https://twitter.com/zadjii)
 * Carlos Zamora, Developer: [@cazamor_msft](https://twitter.com/cazamor_msft)
 * Leon Liang, Developer: [@leonmsft](https://twitter.com/leonmsft)
@@ -267,19 +185,11 @@ If you would like to ask a question that you feel doesn't warrant an issue
 
 ## Prerequisites
 
-* You must be running Windows 1903 (build >= 10.0.18362.0) or later to run
-  Windows Terminal
-* You must [enable Developer Mode in the Windows Settings
-  app](https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development)
-  to locally install and run Windows Terminal
-* You must have the [Windows 10 1903
-  SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk)
-  installed
-* You must have at least [VS
-  2019](https://visualstudio.microsoft.com/downloads/) installed
-* You must install the following Workloads via the VS Installer. Note: Opening
-  the solution in VS 2019 will [prompt you to install missing components
-  automatically](https://devblogs.microsoft.com/setup/configure-visual-studio-across-your-organization-with-vsconfig/):
+* You must be running Windows 1903 (build >= 10.0.18362.0) or later to run Windows Terminal
+* You must [enable Developer Mode in the Windows Settings app](https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development) to locally install and run Windows Terminal
+* You must have the [Windows 10 1903 SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk) installed
+* You must have at least [VS 2019](https://visualstudio.microsoft.com/downloads/) installed
+* You must install the following Workloads via the VS Installer. Note: Opening the solution in VS 2019 will [prompt you to install missing components automatically](https://devblogs.microsoft.com/setup/configure-visual-studio-across-your-organization-with-vsconfig/):
   * Desktop Development with C++
   * Universal Windows Platform Development
   * **The following Individual Components**
@@ -287,17 +197,13 @@ If you would like to ask a question that you feel doesn't warrant an issue
 
 ## Building the Code
 
-This repository uses [git
-submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) for some of its
-dependencies. To make sure submodules are restored or updated, be sure to run
-the following prior to building:
+This repository uses [git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) for some of its dependencies. To make sure submodules are restored or updated, be sure to run the following prior to building:
 
 ```shell
 git submodule update --init --recursive
 ```
 
-OpenConsole.sln may be built from within Visual Studio or from the command-line
-using a set of convenience scripts & tools in the **/tools** directory:
+OpenConsole.sln may be built from within Visual Studio or from the command-line using a set of convenience scripts & tools in the **/tools** directory:
 
 ### Building in PowerShell
 
@@ -316,28 +222,19 @@ bcz
 
 ## Running & Debugging
 
-To debug the Windows Terminal in VS, right click on `CascadiaPackage` (in the
-Solution Explorer) and go to properties. In the Debug menu, change "Application
-process" and "Background task process" to "Native Only".
+To debug the Windows Terminal in VS, right click on `CascadiaPackage` (in the Solution Explorer) and go to properties. In the Debug menu, change "Application process" and "Background task process" to "Native Only".
 
-You should then be able to build & debug the Terminal project by hitting
-<kbd>F5</kbd>.
+You should then be able to build & debug the Terminal project by hitting <kbd>F5</kbd>.
 
-> 👉 You will _not_ be able to launch the Terminal directly by running the
-> WindowsTerminal.exe. For more details on why, see
-> [#926](https://github.com/microsoft/terminal/issues/926),
-> [#4043](https://github.com/microsoft/terminal/issues/4043)
+> 👉 You will _not_ be able to launch the Terminal directly by running the WindowsTerminal.exe. For more details on why, see [#926](https://github.com/microsoft/terminal/issues/926), [#4043](https://github.com/microsoft/terminal/issues/4043)
 
 ### Coding Guidance
 
 Please review these brief docs below about our coding practices.
 
-> 👉 If you find something missing from these docs, feel free to contribute to
-> any of our documentation files anywhere in the repository (or write some new
-> ones!)
+> 👉 If you find something missing from these docs, feel free to contribute to any of our documentation files anywhere in the repository (or write some new ones!)
 
-This is a work in progress as we learn what we'll need to provide people in
-order to be effective contributors to our project.
+This is a work in progress as we learn what we'll need to provide people in order to be effective contributors to our project.
 
 * [Coding Style](https://github.com/Microsoft/Terminal/blob/master/doc/STYLE.md)
 * [Code Organization](https://github.com/Microsoft/Terminal/blob/master/doc/ORGANIZATION.md)
@@ -346,12 +243,10 @@ order to be effective contributors to our project.
 
 ---
 
-## Code of Conduct
+# Code of Conduct
 
-This project has adopted the [Microsoft Open Source Code of
-Conduct][conduct-code]. For more information see the [Code of Conduct
-FAQ][conduct-FAQ] or contact [opencode@microsoft.com][conduct-email] with any
-additional questions or comments.
+This project has adopted the [Microsoft Open Source Code of Conduct][conduct-code].
+For more information see the [Code of Conduct FAQ][conduct-FAQ] or contact [opencode@microsoft.com][conduct-email] with any additional questions or comments.
 
 [conduct-code]: https://opensource.microsoft.com/codeofconduct/
 [conduct-FAQ]: https://opensource.microsoft.com/codeofconduct/faq/

build/scripts/Test-WindowsTerminalPackage.ps1

@@ -106,10 +106,6 @@ Try {
         Throw "Failed to find wt.exe/wtd.exe -- check the WAP packaging project"
     }
 
-    If ($null -eq (Get-Item "$AppxPackageRootPath\OpenConsole.exe" -EA:Ignore)) {
-        Throw "Failed to find OpenConsole.exe -- check the WAP packaging project"
-    }
-
 } Finally {
     Remove-Item -Recurse -Force $AppxPackageRootPath
 }

doc/TAEF.md

@@ -1,30 +1,9 @@
-### TAEF Overview ###
-
+### TAEF ###
 TAEF, the Test Authoring and Execution Framework, is used extensively within the Windows organization to test the operating system code in a unified manner for system, driver, and application code. As the console is a Windows OS Component, we strive to continue using the same system such that tests can be ran in a unified manner both externally to Microsoft as well as inside the official OS Build/Test system.
 
-The [official documentation](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/) for TAEF describes the basic architecture, usage, and functionality of the test system. It is similar to Visual Studio test, but a bit more comprehensive and flexible.
+The [official documentation](https://msdn.microsoft.com/en-us/library/windows/hardware/hh439725\(v=vs.85\).aspx) for TAEF describes the basic architecture, usage, and functionality of the test system. It is similar to Visual Studio test, but a bit more comprehensive and flexible.
 
-### Writing Tests
-
-You may want to read the section [Authoring Tests in C++](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/authoring-tests-in-c--) before getting your hands dirty. Note that the quoted header name in `#include "WexTestClass.h"` might be a bit confusing. You are not required to copy TAEF headers into the project folder.
-
-Use the [TAEF Verify Macros for C++](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/verify) in your test code to perform verifications.
-
-### Running Tests
-
-If you have Visual Studio and related C++ components installed, and you have successfully restored NuGets, you should have the TAEF test runner `te.exe` available locally as part of the `Taef.Redist.Wlk` package.
-
-> Note that you cannot easily run TAEF tests directly through Visual Studio. The `Taef.Redist.Wlk` NuGet package comes with an adapter that will let you browse and execute TAEF tests inside of Visual Studio, but its performance and reliability prevent us from recommending it here.
-
-In a "normal" CMD environment, `te.exe` may not be directly available. Try the following command to set up the development enviroment first:
-
-```shell
-.\tools\razzle.cmd
-```
-
-Then you should be able to use `%TAEF%` as an alias of the actual `te.exe`.
-
-For the purposes of the OpenConsole project, you can run the tests using the `te.exe` that matches the architecture for which the test was built (x86/x64):
+For the purposes of the console project, you can run the tests using the *TE.exe* that matches the architecture for which the test was build (x86/x64) in the pattern
 
 	te.exe Console.Unit.Tests.dll
 
@@ -36,15 +15,6 @@ Limiting the tests to be run is also useful with:
 
 Any pattern of class/method names can be specified after the */name:* flag with wildcard patterns.
 
-For any further details on the functionality of the TAEF test runner, please see the [Executing Tests](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/executing-tests) section in the official documentation. Or run the embedded help with
+For any further details on the functionality of the TAEF test runner, *TE.exe*, please see the documentation above or run the embedded help with
 
 	te.exe /!
-
-If you use PowerShell, try the following command:
-
-```powershell
-Import-Module .\tools\OpenConsole.psm1
-Invoke-OpenConsoleTests
-```
-
-`Invoke-OpenConsoleTests` supports a number of options, which you can enumerate by running `Invoke-OpenConsoleTests -?`.

doc/cascadia/profiles.schema.json

@@ -26,13 +26,6 @@
       ],
       "type": "string"
     },
-    "BellStyle": {
-      "enum": [
-        "none",
-        "audible"
-      ],
-      "type": "string"
-    },
     "ProfileGuid": {
       "default": "{}",
       "pattern": "^\\{[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\\}$",
@@ -555,18 +548,18 @@
         },
         "initialCols": {
           "default": 120,
-          "description": "The number of columns displayed in the window upon first load. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), this property is ignored.",
+          "description": "The number of columns displayed in the window upon first load.",
           "maximum": 999,
           "minimum": 1,
           "type": "integer"
         },
         "initialPosition": {
           "$ref": "#/definitions/Coordinates",
-          "description": "The position of the top left corner of the window upon first load. On a system with multiple displays, these coordinates are relative to the top left of the primary display. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), the window will be maximized on the monitor specified by those coordinates."
+          "description": "The position of the top left corner of the window upon first load. On a system with multiple displays, these coordinates are relative to the top left of the primary display. If \"launchMode\" is set to maximized, the window will be maximized on the monitor specified by those coordinates."
         },
         "initialRows": {
           "default": 30,
-          "description": "The number of rows displayed in the window upon first load. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), this property is ignored.",
+          "description": "The number of rows displayed in the window upon first load.",
           "maximum": 999,
           "minimum": 1,
           "type": "integer"
@@ -578,13 +571,11 @@
         },
         "launchMode": {
           "default": "default",
-          "description": "Defines whether the terminal will launch as maximized, full screen, or in a window. Setting this to \"focus\" is equivalent to launching the terminal in the \"default\" mode, but with the focus mode enabled. Similar, setting this to \"maximizedFocus\" will result in launching the terminal in a maximized window with the focus mode enabled.",
+          "description": "Defines whether the terminal will launch as maximized, full screen, or in a window.",
           "enum": [
             "fullscreen",
             "maximized",
-            "default",
-            "focus",
-            "maximizedFocus"
+            "default"
           ],
           "type": "string"
         },
@@ -724,11 +715,6 @@
           ],
           "type": "string"
         },
-        "bellStyle": {
-          "default": "audible",
-          "description": "Controls what happens when the application emits a BEL character. When set to \"audible\", the Terminal will play a sound. When set to \"none\", nothing will happen.",
-          "$ref": "#/definitions/BellStyle"
-        },
         "closeOnExit": {
           "default": "graceful",
           "description": "Sets how the profile reacts to termination or failure to launch. Possible values:\n -\"graceful\" (close when exit is typed or the process exits normally)\n -\"always\" (always close)\n -\"never\" (never close).\ntrue and false are accepted as synonyms for \"graceful\" and \"never\" respectively.",

src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp

@@ -55,7 +55,6 @@ namespace SettingsModelLocalTests
         TEST_METHOD(TestHelperFunctions);
 
         TEST_METHOD(TestProfileBackgroundImageWithEnvVar);
-        TEST_METHOD(TestProfileBackgroundImageWithDesktopWallpaper);
 
         TEST_METHOD(TestCloseOnExitParsing);
         TEST_METHOD(TestCloseOnExitCompatibilityShim);
@@ -1401,28 +1400,6 @@ namespace SettingsModelLocalTests
         VERIFY_ARE_NOT_EQUAL(0u, settings->_profiles.Size());
         VERIFY_ARE_EQUAL(expectedPath, settings->_profiles.GetAt(0).ExpandedBackgroundImagePath());
     }
-    void DeserializationTests::TestProfileBackgroundImageWithDesktopWallpaper()
-    {
-        const winrt::hstring expectedBackgroundImagePath{ winrt::to_hstring("DesktopWallpaper") };
-
-        const std::string settingsJson{ R"(
-        {
-            "profiles": [
-                {
-                    "name": "profile0",
-                    "backgroundImage": "DesktopWallpaper"
-                }
-            ]
-        })" };
-
-        VerifyParseSucceeded(settingsJson);
-
-        auto settings = winrt::make_self<implementation::CascadiaSettings>();
-        settings->_ParseJsonString(settingsJson, false);
-        settings->LayerJson(settings->_userSettings);
-        VERIFY_ARE_EQUAL(expectedBackgroundImagePath, settings->_profiles.GetAt(0).BackgroundImagePath());
-        VERIFY_ARE_NOT_EQUAL(expectedBackgroundImagePath, settings->_profiles.GetAt(0).ExpandedBackgroundImagePath());
-    }
     void DeserializationTests::TestCloseOnExitParsing()
     {
         const std::string settingsJson{ R"(

src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp

@@ -57,7 +57,6 @@ namespace TerminalAppLocalTests
         TEST_METHOD(TestSimpleExecuteCommandlineAction);
         TEST_METHOD(TestMultipleCommandExecuteCommandlineAction);
         TEST_METHOD(TestInvalidExecuteCommandlineAction);
-        TEST_METHOD(TestLaunchMode);
 
     private:
         void _buildCommandlinesHelper(AppCommandlineArgs& appArgs,
@@ -1133,95 +1132,4 @@ namespace TerminalAppLocalTests
         auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
         VERIFY_ARE_EQUAL(0u, actions.size());
     }
-
-    void CommandlineTest::TestLaunchMode()
-    {
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_FALSE(appArgs.GetLaunchMode().has_value());
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-F" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::FullscreenMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--fullscreen" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::FullscreenMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-M" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--maximized" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-f" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::FocusMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--focus" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::FocusMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-fM" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedFocusMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--maximized", L"--focus" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedFocusMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--maximized", L"--focus", L"--focus" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedFocusMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--maximized", L"--focus", L"--maximized" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedFocusMode);
-        }
-    }
 }

src/cascadia/TerminalApp/AppCommandlineArgs.cpp

@@ -171,30 +171,18 @@ void AppCommandlineArgs::_buildParser()
     };
     _app.add_flag_function("-v,--version", versionCallback, RS_A(L"CmdVersionDesc"));
 
-    // Launch mode related flags
+    // Maximized and Fullscreen flags
     //   -M,--maximized: Maximizes the window on launch
     //   -F,--fullscreen: Fullscreens the window on launch
-    //   -f,--focus: Sets the terminal into the Focus mode
-    // While fullscreen excludes both maximized and focus mode, the user can combine between the maximized and focused (-fM)
     auto maximizedCallback = [this](int64_t /*count*/) {
-        _launchMode = (_launchMode.has_value() && _launchMode.value() == LaunchMode::FocusMode) ?
-                          LaunchMode::MaximizedFocusMode :
-                          LaunchMode::MaximizedMode;
+        _launchMode = winrt::Microsoft::Terminal::Settings::Model::LaunchMode::MaximizedMode;
     };
     auto fullscreenCallback = [this](int64_t /*count*/) {
-        _launchMode = LaunchMode::FullscreenMode;
+        _launchMode = winrt::Microsoft::Terminal::Settings::Model::LaunchMode::FullscreenMode;
     };
-    auto focusCallback = [this](int64_t /*count*/) {
-        _launchMode = (_launchMode.has_value() && _launchMode.value() == LaunchMode::MaximizedMode) ?
-                          LaunchMode::MaximizedFocusMode :
-                          LaunchMode::FocusMode;
-    };
-
     auto maximized = _app.add_flag_function("-M,--maximized", maximizedCallback, RS_A(L"CmdMaximizedDesc"));
     auto fullscreen = _app.add_flag_function("-F,--fullscreen", fullscreenCallback, RS_A(L"CmdFullscreenDesc"));
-    auto focus = _app.add_flag_function("-f,--focus", focusCallback, RS_A(L"CmdFocusDesc"));
     maximized->excludes(fullscreen);
-    focus->excludes(fullscreen);
 
     // Subcommands
     _buildNewTabParser();

src/cascadia/TerminalApp/AppLogic.cpp

@@ -265,10 +265,6 @@ namespace winrt::TerminalApp::implementation
             {
                 _root->ToggleFullscreen();
             }
-            else if (launchMode == LaunchMode::FocusMode || launchMode == LaunchMode::MaximizedFocusMode)
-            {
-                _root->ToggleFocusMode();
-            }
         });
         _root->Create();
 

src/cascadia/TerminalApp/CommandPalette.cpp

@@ -213,27 +213,41 @@ namespace winrt::TerminalApp::implementation
         }
         else if (key == VirtualKey::Escape)
         {
-            // Dismiss the palette if the text is empty, otherwise clear the
-            // search string.
-            if (_searchBox().Text().empty())
+            // Action, TabSearch, TabSwitch Mode: Dismiss the palette if the
+            // text is empty, otherwise clear the search string.
+            if (_currentMode != CommandPaletteMode::CommandlineMode)
             {
-                _dismissPalette();
+                if (_searchBox().Text().empty())
+                {
+                    _dismissPalette();
+                }
+                else
+                {
+                    _searchBox().Text(L"");
+                }
             }
-            else
+            else if (_currentMode == CommandPaletteMode::CommandlineMode)
             {
-                _searchBox().Text(L"");
-            }
+                const auto currentInput = _getPostPrefixInput();
+                if (currentInput.empty())
+                {
+                    // The user's only input "> " so far. We should just dismiss
+                    // the palette. This is like dismissing the Action mode with
+                    // empty input.
+                    _dismissPalette();
+                }
+                else
+                {
+                    // Clear out the current input. We'll leave a ">" in the
+                    // input (to stay in commandline mode), and a leading space
+                    // (if they currently had one).
+                    const bool hasLeadingSpace = (_searchBox().Text().size()) - (currentInput.size()) > 1;
+                    _searchBox().Text(hasLeadingSpace ? L"> " : L">");
 
-            e.Handled(true);
-        }
-        else if (key == VirtualKey::Back)
-        {
-            // If the last filter text was empty, and we're backspacing from
-            // that state, then the user "backspaced" the virtual '>' we're
-            // using as the action mode indicator. Switch into commandline mode.
-            if (_searchBox().Text().empty() && _lastFilterTextWasEmpty && _currentMode == CommandPaletteMode::ActionMode)
-            {
-                _switchToMode(CommandPaletteMode::CommandlineMode);
+                    // This will conveniently move the cursor to the end of the
+                    // text input for us.
+                    _searchBox().Select(_searchBox().Text().size(), 0);
+                }
             }
 
             e.Handled(true);
@@ -466,13 +480,18 @@ namespace winrt::TerminalApp::implementation
             }
         }
     }
+
     // Method Description:
-    // - Get all the input text in _searchBox that follows any leading spaces.
+    // - Get all the input text in _searchBox that follows the prefix character
+    //   and any whitespace following that prefix character. This can be used in
+    //   commandline mode to get all the useful input that the user input after
+    //   the leading ">" prefix.
+    // - Note that this will behave unexpectedly in Action Mode.
     // Arguments:
     // - <none>
     // Return Value:
-    // - the string of input following any number of leading spaces
-    std::wstring CommandPalette::_getTrimmedInput()
+    // - the string of input following the prefix character.
+    std::wstring CommandPalette::_getPostPrefixInput()
     {
         const std::wstring input{ _searchBox().Text() };
         if (input.empty())
@@ -480,15 +499,17 @@ namespace winrt::TerminalApp::implementation
             return input;
         }
 
+        const auto rawCmdline{ input.substr(1) };
+
         // Trim leading whitespace
-        const auto firstNonSpace = input.find_first_not_of(L" ");
+        const auto firstNonSpace = rawCmdline.find_first_not_of(L" ");
         if (firstNonSpace == std::wstring::npos)
         {
             // All the following characters are whitespace.
             return L"";
         }
 
-        return input.substr(firstNonSpace);
+        return rawCmdline.substr(firstNonSpace);
     }
 
     // Method Description:
@@ -499,11 +520,12 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void CommandPalette::_dispatchCommandline()
     {
-        auto cmdline{ _getTrimmedInput() };
-        if (cmdline.empty())
+        const auto input = _getPostPrefixInput();
+        if (input.empty())
         {
             return;
         }
+        winrt::hstring cmdline{ input };
 
         // Build the ExecuteCommandline action from the values we've parsed on the commandline.
         ExecuteCommandlineArgs args{ cmdline };
@@ -552,49 +574,32 @@ namespace winrt::TerminalApp::implementation
     void CommandPalette::_filterTextChanged(IInspectable const& /*sender*/,
                                             Windows::UI::Xaml::RoutedEventArgs const& /*args*/)
     {
-        if (_currentMode == CommandPaletteMode::CommandlineMode)
+        if (_currentMode == CommandPaletteMode::CommandlineMode || _currentMode == CommandPaletteMode::ActionMode)
         {
             _evaluatePrefix();
         }
 
-        // We're setting _lastFilterTextWasEmpty here, because if the user tries
-        // to backspace the last character in the input, the Backspace KeyDown
-        // event will fire _before_ _filterTextChanged does. Updating the value
-        // here will ensure that we can check this case appropriately.
-        _lastFilterTextWasEmpty = _searchBox().Text().empty();
-
         _updateFilteredActions();
         _filteredActionsView().SelectedIndex(0);
 
-        if (_currentMode == CommandPaletteMode::TabSearchMode || _currentMode == CommandPaletteMode::ActionMode)
-        {
-            _noMatchesText().Visibility(_filteredActions.Size() > 0 ? Visibility::Collapsed : Visibility::Visible);
-        }
-        else
-        {
-            _noMatchesText().Visibility(Visibility::Collapsed);
-        }
+        _noMatchesText().Visibility(_filteredActions.Size() > 0 ? Visibility::Collapsed : Visibility::Visible);
     }
 
     void CommandPalette::_evaluatePrefix()
     {
-        // This will take you from commandline mode, into action mode. The
-        // backspace handler in _keyDownHandler will handle taking us from
-        // action mode to commandline mode.
-        auto newMode = CommandPaletteMode::CommandlineMode;
+        auto newMode = CommandPaletteMode::ActionMode;
 
-        auto inputText = _getTrimmedInput();
+        auto inputText = _searchBox().Text();
         if (inputText.size() > 0)
         {
             if (inputText[0] == L'>')
             {
-                newMode = CommandPaletteMode::ActionMode;
+                newMode = CommandPaletteMode::CommandlineMode;
             }
         }
 
         if (newMode != _currentMode)
         {
-            //_switchToMode will remove the '>' character from the input.
             _switchToMode(newMode);
         }
     }
@@ -639,8 +644,6 @@ namespace winrt::TerminalApp::implementation
             }
         }
 
-        _searchBox().Text(L"");
-        _searchBox().Select(_searchBox().Text().size(), 0);
         // Leaving this block of code outside the above if-statement
         // guarantees that the correct text is shown for the mode
         // whenever _switchToMode is called.
@@ -649,24 +652,20 @@ namespace winrt::TerminalApp::implementation
         case CommandPaletteMode::TabSearchMode:
         case CommandPaletteMode::TabSwitchMode:
         {
-            SearchBoxPlaceholderText(RS_(L"TabSwitcher_SearchBoxText"));
+            SearchBoxText(RS_(L"TabSwitcher_SearchBoxText"));
             NoMatchesText(RS_(L"TabSwitcher_NoMatchesText"));
             ControlName(RS_(L"TabSwitcherControlName"));
-            PrefixCharacter(L"");
             break;
         }
         case CommandPaletteMode::CommandlineMode:
-            SearchBoxPlaceholderText(RS_(L"CmdPalCommandlinePrompt"));
-            NoMatchesText(L"");
+            NoMatchesText(RS_(L"CmdPalCommandlinePrompt"));
             ControlName(RS_(L"CommandPaletteControlName"));
-            PrefixCharacter(L"");
             break;
         case CommandPaletteMode::ActionMode:
         default:
-            SearchBoxPlaceholderText(RS_(L"CommandPalette_SearchBox/PlaceholderText"));
+            SearchBoxText(RS_(L"CommandPalette_SearchBox/PlaceholderText"));
             NoMatchesText(RS_(L"CommandPalette_NoMatchesText/Text"));
             ControlName(RS_(L"CommandPaletteControlName"));
-            PrefixCharacter(L">");
             break;
         }
     }
@@ -718,7 +717,7 @@ namespace winrt::TerminalApp::implementation
     {
         std::vector<Command> actions;
 
-        winrt::hstring searchText{ _getTrimmedInput() };
+        auto searchText = _searchBox().Text();
         const bool addAll = searchText.empty();
 
         auto commandsToFilter = _commandsToFilter();

src/cascadia/TerminalApp/CommandPalette.h

@@ -39,8 +39,7 @@ namespace winrt::TerminalApp::implementation
 
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
         OBSERVABLE_GETSET_PROPERTY(winrt::hstring, NoMatchesText, _PropertyChangedHandlers);
-        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, SearchBoxPlaceholderText, _PropertyChangedHandlers);
-        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, PrefixCharacter, _PropertyChangedHandlers);
+        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, SearchBoxText, _PropertyChangedHandlers);
         OBSERVABLE_GETSET_PROPERTY(winrt::hstring, ControlName, _PropertyChangedHandlers);
         OBSERVABLE_GETSET_PROPERTY(winrt::hstring, ParentCommandName, _PropertyChangedHandlers);
 
@@ -56,8 +55,6 @@ namespace winrt::TerminalApp::implementation
 
         Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::Command> _commandsToFilter();
 
-        bool _lastFilterTextWasEmpty{ true };
-
         void _filterTextChanged(Windows::Foundation::IInspectable const& sender,
                                 Windows::UI::Xaml::RoutedEventArgs const& args);
         void _previewKeyDownHandler(Windows::Foundation::IInspectable const& sender,
@@ -87,8 +84,8 @@ namespace winrt::TerminalApp::implementation
         CommandPaletteMode _currentMode;
         void _switchToMode(CommandPaletteMode mode);
 
-        std::wstring _getTrimmedInput();
         void _evaluatePrefix();
+        std::wstring _getPostPrefixInput();
 
         Microsoft::Terminal::TerminalControl::IKeyBindings _bindings;
 

src/cascadia/TerminalApp/CommandPalette.idl

@@ -11,8 +11,7 @@ namespace TerminalApp
         CommandPalette();
 
         String NoMatchesText { get; };
-        String SearchBoxPlaceholderText { get; };
-        String PrefixCharacter { get; };
+        String SearchBoxText { get; };
         String ControlName { get; };
         String ParentCommandName { get; };
 

src/cascadia/TerminalApp/CommandPalette.xaml

@@ -8,8 +8,8 @@ the MIT License. See LICENSE in the project root for license information. -->
     xmlns:mux="using:Microsoft.UI.Xaml.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:Windows10version1903="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 8)"
-    xmlns:SettingsModel="using:Microsoft.Terminal.Settings.Model"
+    xmlns:Windows10version1903="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 8)"
+    xmlns:SettingsModel="using:Microsoft.Terminal.Settings.Model"
     TabNavigation="Cycle"
     IsTabStop="True"
     AllowFocusOnInteraction="True"
@@ -60,7 +60,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                     <Style x:Key="KeyChordBorderStyle" TargetType="Border">
                         <Setter Property="BorderThickness" Value="1" />
                         <Setter Property="CornerRadius" Value="1" />
-                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundBaseLowBrush}" />
                         <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
                     </Style>
                     <Style x:Key="KeyChordTextBlockStyle" TargetType="TextBlock">
@@ -91,7 +91,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                     <Style x:Key="KeyChordBorderStyle" TargetType="Border">
                         <Setter Property="BorderThickness" Value="1" />
                         <Setter Property="CornerRadius" Value="1" />
-                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundBaseLowBrush}" />
                         <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
                     </Style>
                     <Style x:Key="KeyChordTextBlockStyle" TargetType="TextBlock">
@@ -135,27 +135,27 @@ the MIT License. See LICENSE in the project root for license information. -->
         to receive clicks _anywhere_ in its bounds. -->
 
         <Grid
-            x:Name="_shadowBackdrop"
-            Background="Transparent"
-            Grid.Column="0"
-            Grid.Row="0"
-            Grid.ColumnSpan="3"
-            Grid.RowSpan="2"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
+        x:Name="_shadowBackdrop"
+        Background="Transparent"
+        Grid.Column="0"
+        Grid.Row="0"
+        Grid.ColumnSpan="3"
+        Grid.RowSpan="2"
+        HorizontalAlignment="Stretch"
+        VerticalAlignment="Stretch">
         </Grid>
 
         <Grid
-            x:Name="_backdrop"
-            Style="{ThemeResource CommandPaletteBackground}"
-            CornerRadius="{ThemeResource ControlCornerRadius}"
-            PointerPressed="_backdropPointerPressed"
-            Margin="8"
-            Grid.Column="1"
-            Grid.Row="0"
-            Windows10version1903:Shadow="{StaticResource CommandPaletteShadow}"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Top">
+        x:Name="_backdrop"
+        Style="{ThemeResource CommandPaletteBackground}"
+        CornerRadius="{ThemeResource ControlCornerRadius}"
+        PointerPressed="_backdropPointerPressed"
+        Margin="8"
+        Grid.Column="1"
+        Grid.Row="0"
+        Windows10version1903:Shadow="{StaticResource CommandPaletteShadow}"
+        HorizontalAlignment="Stretch"
+        VerticalAlignment="Top">
 
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
@@ -164,28 +164,15 @@ the MIT License. See LICENSE in the project root for license information. -->
             </Grid.RowDefinitions>
 
             <TextBox
-                Grid.Row="0"
-                x:Name="_searchBox"
-                Margin="8"
-                Padding="18,8,8,8"
-                IsSpellCheckEnabled="False"
-                TextChanged="_filterTextChanged"
-                PlaceholderText="{x:Bind SearchBoxPlaceholderText, Mode=OneWay}"
-                Text="">
+            Grid.Row="0"
+            x:Name="_searchBox"
+            Margin="8"
+            IsSpellCheckEnabled="False"
+            TextChanged="_filterTextChanged"
+            PlaceholderText="{x:Bind SearchBoxText, Mode=OneWay}"
+            Text="">
             </TextBox>
 
-            <TextBlock
-                Grid.Row="0"
-                x:Name="_prefixCharacter"
-                Margin="16,16,0,-8"
-                FontSize="14"
-                Visibility="{x:Bind PrefixCharacter,
-                             Mode=OneWay,
-                             Converter={StaticResource ParentCommandVisibilityConverter}}"
-                Text="{x:Bind PrefixCharacter, Mode=OneWay}"
-                >
-            </TextBlock>
-
             <TextBlock
                 Padding="16, 0, 16, 4"
                 x:Name="_parentCommandText"
@@ -207,17 +194,17 @@ the MIT License. See LICENSE in the project root for license information. -->
             </TextBlock>
 
             <ListView
-                Grid.Row="2"
-                x:Name="_filteredActionsView"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Stretch"
-                SelectionMode="Single"
-                CanReorderItems="False"
-                AllowDrop="False"
-                IsItemClickEnabled="True"
-                ItemClick="_listItemClicked"
-                PreviewKeyDown="_keyDownHandler"
-                ItemsSource="{x:Bind FilteredActions}">
+            Grid.Row="2"
+            x:Name="_filteredActionsView"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Stretch"
+            SelectionMode="Single"
+            CanReorderItems="False"
+            AllowDrop="False"
+            IsItemClickEnabled="True"
+            ItemClick="_listItemClicked"
+            PreviewKeyDown="_keyDownHandler"
+            ItemsSource="{x:Bind FilteredActions}">
 
                 <ItemsControl.ItemTemplate >
                     <DataTemplate x:DataType="SettingsModel:Command">

src/cascadia/TerminalApp/MinMaxCloseControl.cpp

@@ -10,6 +10,9 @@
 #include "MinMaxCloseControl.h"
 
 #include "MinMaxCloseControl.g.cpp"
+
+#include "winrt/Windows.ApplicationModel.Resources.Core.h"
+
 using namespace winrt::Windows::UI::Xaml;
 
 namespace winrt::TerminalApp::implementation
@@ -38,6 +41,21 @@ namespace winrt::TerminalApp::implementation
         _closeClickHandlers(*this, e);
     }
 
+    winrt::fire_and_forget MinMaxCloseControl::_ResourceQualifiersChanged(winrt::Windows::Foundation::IInspectable const& /*sender*/,
+                                                                          winrt::Windows::Foundation::IInspectable const& /*e*/)
+    {
+        co_await winrt::resume_foreground(Dispatcher());
+        CloseGlyph().UriSource(CloseGlyph().UriSource());
+        MinimizeGlyph().UriSource(MinimizeGlyph().UriSource());
+        if (auto t = MaximizeButton().GetTemplateChild(L"MaxRestoreGlyph"))
+        {
+            if (auto t2 = t.try_as<Controls::BitmapIcon>())
+            {
+                t2.UriSource(t2.UriSource());
+            }
+        }
+    }
+
     void MinMaxCloseControl::SetWindowVisualState(WindowVisualState visualState)
     {
         // Look up the heights we should use for the caption buttons from our
@@ -89,6 +107,7 @@ namespace winrt::TerminalApp::implementation
             CloseButton().Height(windowedHeight);
             break;
         }
+        _ResourceQualifiersChanged(nullptr, nullptr);
     }
 
     DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(MinMaxCloseControl, MinimizeClick, _minimizeClickHandlers, TerminalApp::MinMaxCloseControl, RoutedEventArgs);

src/cascadia/TerminalApp/MinMaxCloseControl.h

@@ -11,6 +11,7 @@
 #include "winrt/Windows.UI.Xaml.Interop.h"
 #include "MinMaxCloseControl.g.h"
 #include "../../cascadia/inc/cppwinrt_utils.h"
+#include "winrt/Windows.ApplicationModel.Resources.Core.h"
 
 namespace winrt::TerminalApp::implementation
 {
@@ -27,6 +28,9 @@ namespace winrt::TerminalApp::implementation
         void _CloseClick(winrt::Windows::Foundation::IInspectable const& sender,
                          winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
 
+        winrt::fire_and_forget _ResourceQualifiersChanged(winrt::Windows::Foundation::IInspectable const& sender,
+                                                          winrt::Windows::Foundation::IInspectable const& e);
+
         DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(MinimizeClick, _minimizeClickHandlers, TerminalApp::MinMaxCloseControl, winrt::Windows::UI::Xaml::RoutedEventArgs);
         DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(MaximizeClick, _maximizeClickHandlers, TerminalApp::MinMaxCloseControl, winrt::Windows::UI::Xaml::RoutedEventArgs);
         DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(CloseClick, _closeClickHandlers, TerminalApp::MinMaxCloseControl, winrt::Windows::UI::Xaml::RoutedEventArgs);

src/cascadia/TerminalApp/MinMaxCloseControl.xaml

@@ -18,49 +18,43 @@ the MIT License. See LICENSE in the project root for license information. -->
         <ResourceDictionary>
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Light">
-                    <x:Double x:Key="CaptionButtonStrokeWidth">1.0</x:Double>
-                    <StaticResource x:Key="CaptionButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush"/>
-                    <StaticResource x:Key="CaptionButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush"/>
-                    <StaticResource x:Key="CaptionButtonStroke" ResourceKey="SystemControlForegroundBaseHighBrush"/>
-                    <StaticResource x:Key="CaptionButtonStrokePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush"/>
-                    <StaticResource x:Key="CaptionButtonStrokePressed" ResourceKey="SystemControlForegroundBaseHighBrush"/>
-                    <SolidColorBrush x:Key="CaptionButtonBackground" Color="Transparent" />
+                    <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush"/>
+                    <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush"/>
+                    <StaticResource x:Key="ButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush"/>
+                    <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush"/>
+                    <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush"/>
+                    <SolidColorBrush x:Key="ButtonBackground" Color="Transparent" />
                     <SolidColorBrush x:Key="CloseButtonBackgroundPointerOver" Color="#e81123"/>
-                    <SolidColorBrush x:Key="CloseButtonStrokePointerOver" Color="White"/>
+                    <SolidColorBrush x:Key="CloseButtonForegroundPointerOver" Color="White"/>
                     <SolidColorBrush x:Key="CloseButtonBackgroundPressed" Color="#f1707a"/>
-                    <SolidColorBrush x:Key="CloseButtonStrokePressed" Color="Black"/>
+                    <SolidColorBrush x:Key="CloseButtonForegroundPressed" Color="Black"/>
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="Dark">
-                    <x:Double x:Key="CaptionButtonStrokeWidth">1.0</x:Double>
-                    <StaticResource x:Key="CaptionButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush"/>
-                    <StaticResource x:Key="CaptionButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush"/>
-                    <StaticResource x:Key="CaptionButtonStroke" ResourceKey="SystemControlForegroundBaseHighBrush"/>
-                    <StaticResource x:Key="CaptionButtonStrokePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush"/>
-                    <StaticResource x:Key="CaptionButtonStrokePressed" ResourceKey="SystemControlForegroundBaseHighBrush"/>
-                    <SolidColorBrush x:Key="CaptionButtonBackground" Color="Transparent" />
+                    <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush"/>
+                    <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush"/>
+                    <StaticResource x:Key="ButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush"/>
+                    <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="SystemControlForegroundBaseHighBrush"/>
+                    <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="SystemControlForegroundBaseHighBrush"/>
+                    <SolidColorBrush x:Key="ButtonBackground" Color="Transparent" />
                     <SolidColorBrush x:Key="CloseButtonBackgroundPointerOver" Color="#e81123"/>
-                    <SolidColorBrush x:Key="CloseButtonStrokePointerOver" Color="White"/>
+                    <SolidColorBrush x:Key="CloseButtonForegroundPointerOver" Color="White"/>
                     <SolidColorBrush x:Key="CloseButtonBackgroundPressed" Color="#f1707a"/>
-                    <SolidColorBrush x:Key="CloseButtonStrokePressed" Color="Black"/>
+                    <SolidColorBrush x:Key="CloseButtonForegroundPressed" Color="Black"/>
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="HighContrast">
-                    <x:Double x:Key="CaptionButtonStrokeWidth">3.0</x:Double>
-                    <SolidColorBrush x:Key="CaptionButtonBackground" Color="{ThemeResource SystemColorButtonFaceColor}"/>
-                    <SolidColorBrush x:Key="CaptionButtonBackgroundPointerOver" Color="{ThemeResource SystemColorHighlightColor}"/>
-                    <SolidColorBrush x:Key="CaptionButtonBackgroundPressed" Color="{ThemeResource SystemColorHighlightColor}"/>
-                    <SolidColorBrush x:Key="CaptionButtonStroke" Color="{ThemeResource SystemColorButtonTextColor}"/>
-                    <SolidColorBrush x:Key="CaptionButtonStrokePointerOver" Color="{ThemeResource SystemColorHighlightTextColor}"/>
-                    <SolidColorBrush x:Key="CaptionButtonStrokePressed" Color="{ThemeResource SystemColorHighlightTextColor}"/>
+                    <SolidColorBrush x:Key="ButtonBackground" Color="{ThemeResource SystemColorButtonFaceColor}"/>
+                    <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SystemColorHighlightColor}"/>
+                    <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SystemColorHighlightColor}"/>
+                    <SolidColorBrush x:Key="ButtonForeground" Color="{ThemeResource SystemColorButtonTextColor}"/>
+                    <SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="{ThemeResource SystemColorHighlightTextColor}"/>
+                    <SolidColorBrush x:Key="ButtonForegroundPressed" Color="{ThemeResource SystemColorHighlightTextColor}"/>
                     <SolidColorBrush x:Key="CloseButtonBackgroundPointerOver" Color="{ThemeResource SystemColorHighlightColor}"/>
-                    <SolidColorBrush x:Key="CloseButtonStrokePointerOver" Color="{ThemeResource SystemColorHighlightTextColor}"/>
+                    <SolidColorBrush x:Key="CloseButtonForegroundPointerOver" Color="{ThemeResource SystemColorHighlightTextColor}"/>
                     <SolidColorBrush x:Key="CloseButtonBackgroundPressed" Color="{ThemeResource SystemColorHighlightColor}"/>
-                    <SolidColorBrush x:Key="CloseButtonStrokePressed" Color="{ThemeResource SystemColorHighlightTextColor}"/>
+                    <SolidColorBrush x:Key="CloseButtonForegroundPressed" Color="{ThemeResource SystemColorHighlightTextColor}"/>
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
 
-            <x:String x:Key="CaptionButtonPath"></x:String>
-            <x:String x:Key="CaptionButtonPathWindowMaximized"></x:String>
-
             <!-- "CaptionButtonHeightWindowed" and
                  "CaptionButtonHeightMaximized" define the size we should use
                  for the caption buttons height for the windowed and maximized
@@ -74,82 +68,59 @@ the MIT License. See LICENSE in the project root for license information. -->
             <x:Double x:Key="CaptionButtonHeightMaximized">32.0</x:Double>
 
             <Style x:Key="CaptionButton" TargetType="Button">
+                <Setter Property="Background" Value="{ThemeResource ButtonBackground}"/>
+                <Setter Property="BackgroundSizing" Value="OuterBorderEdge"/>
+                <Setter Property="Foreground" Value="{ThemeResource ButtonForeground}"/>
+                <Setter Property="BorderBrush" Value="{ThemeResource ButtonBorderBrush}"/>
                 <Setter Property="BorderThickness" Value="0"/>
-                <Setter Property="Background" Value="{ThemeResource CaptionButtonBackground}" />
                 <Setter Property="IsTabStop" Value="False" />
+                <Setter Property="Padding" Value="{StaticResource ButtonPadding}"/>
+                <Setter Property="HorizontalAlignment" Value="Left"/>
+                <Setter Property="VerticalAlignment" Value="Center"/>
+                <Setter Property="UseSystemFocusVisuals" Value="False"/>
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="Button">
-
-                            <Border x:Name="ButtonBaseElement"
-                                Background="{TemplateBinding Background}"
-                                BackgroundSizing="{TemplateBinding BackgroundSizing}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding CornerRadius}"
-                                Padding="{TemplateBinding Padding}"
-                                AutomationProperties.AccessibilityView="Raw">
-
+                            <ContentPresenter x:Name="ContentPresenter" AutomationProperties.AccessibilityView="Raw" BackgroundSizing="{TemplateBinding BackgroundSizing}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" CornerRadius="{TemplateBinding CornerRadius}" ContentTransitions="{TemplateBinding ContentTransitions}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
                                 <VisualStateManager.VisualStateGroups>
                                     <VisualStateGroup x:Name="CommonStates">
-                                        <VisualStateGroup.Transitions>
-                                            <VisualTransition From="PointerOver" To="Normal">
-                                                <Storyboard>
-                                                    <ColorAnimation Storyboard.TargetName="ButtonBaseElement" Storyboard.TargetProperty="(UIElement.Background).(SolidColorBrush.Color)" To="{Binding Color, Source={ThemeResource CaptionButtonBackground}}" Duration="0:0:0.2"/>
-                                                    <ColorAnimation Storyboard.TargetName="Path" Storyboard.TargetProperty="(UIElement.Stroke).(SolidColorBrush.Color)" To="{Binding Color, Source={ThemeResource CaptionButtonStroke}}" Duration="0:0:0.1"/>
-                                                </Storyboard>
-                                            </VisualTransition>
-                                        </VisualStateGroup.Transitions>
-
                                         <VisualState x:Name="Normal">
-                                            <VisualState.Setters>
-                                                <Setter Target="ButtonBaseElement.Background" Value="{ThemeResource CaptionButtonBackground}" />
-                                                <Setter Target="Path.Stroke" Value="{ThemeResource CaptionButtonStroke}" />
-                                            </VisualState.Setters>
+                                            <Storyboard>
+                                            </Storyboard>
                                         </VisualState>
-
                                         <VisualState x:Name="PointerOver">
-                                            <VisualState.Setters>
-                                                <Setter Target="ButtonBaseElement.Background" Value="{ThemeResource CaptionButtonBackgroundPointerOver}" />
-                                                <Setter Target="Path.Stroke" Value="{ThemeResource CaptionButtonStrokePointerOver}" />
-                                            </VisualState.Setters>
+                                            <Storyboard>
+                                                <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBackgroundPointerOver}"/>
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonForegroundPointerOver}"/>
+                                                </ObjectAnimationUsingKeyFrames>
+                                            </Storyboard>
                                         </VisualState>
-
                                         <VisualState x:Name="Pressed">
-                                            <VisualState.Setters>
-                                                <Setter Target="ButtonBaseElement.Background" Value="{ThemeResource CaptionButtonBackgroundPressed}" />
-                                                <Setter Target="Path.Stroke" Value="{ThemeResource CaptionButtonStrokePressed}" />
-                                            </VisualState.Setters>
+                                            <Storyboard>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBackgroundPressed}"/>
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonForegroundPressed}"/>
+                                                </ObjectAnimationUsingKeyFrames>
+                                            </Storyboard>
                                         </VisualState>
-
-                                        <VisualState x:Name="Disabled" />
-                                    </VisualStateGroup>
-
-                                    <VisualStateGroup x:Name="MinMaxStates">
-                                        <VisualState x:Name="WindowStateNormal" />
-
-                                        <VisualState x:Name="WindowStateMaximized">
-                                            <VisualState.Setters>
-                                                <Setter Target="Path.Data" Value="{ThemeResource CaptionButtonPathWindowMaximized}" />
-                                            </VisualState.Setters>
+                                        <VisualState x:Name="Disabled">
+                                            <Storyboard>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBackgroundDisabled}"/>
+                                                </ObjectAnimationUsingKeyFrames>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonForegroundDisabled}"/>
+                                                </ObjectAnimationUsingKeyFrames>
+                                            </Storyboard>
                                         </VisualState>
                                     </VisualStateGroup>
-
                                 </VisualStateManager.VisualStateGroups>
-
-                                <Path
-                                    x:Name="Path"
-                                    StrokeThickness="{ThemeResource CaptionButtonStrokeWidth}"
-                                    Stroke="{ThemeResource CaptionButtonStroke}"
-                                    Data="{ThemeResource CaptionButtonPath}"
-                                    Stretch="Fill"
-                                    UseLayoutRounding="True"
-                                    Width="10"
-                                    Height="10"
-                                    StrokeEndLineCap="Square"
-                                    StrokeStartLineCap="Square" />
-                            </Border>
-
+                            </ContentPresenter>
                         </ControlTemplate>
                     </Setter.Value>
                 </Setter>
@@ -164,11 +135,7 @@ the MIT License. See LICENSE in the project root for license information. -->
             Style="{StaticResource CaptionButton}"
             Click="_MinimizeClick"
             AutomationProperties.AccessibilityView="Raw">
-        <Button.Resources>
-            <ResourceDictionary>
-                <x:String x:Key="CaptionButtonPath">M 0 0 H 10</x:String>
-            </ResourceDictionary>
-        </Button.Resources>
+        <BitmapIcon x:Name="MinimizeGlyph" UriSource="ms-appx:///TerminalApp/appframeicons/Minimize.png" Width="12" Height="12" />
     </Button>
     <Button Height="{StaticResource CaptionButtonHeightWindowed}" MinWidth="46.0" Width="46.0"
             x:Name="MaximizeButton"
@@ -176,12 +143,60 @@ the MIT License. See LICENSE in the project root for license information. -->
             Style="{StaticResource CaptionButton}"
             Click="_MaximizeClick"
             AutomationProperties.AccessibilityView="Raw">
-        <Button.Resources>
-            <ResourceDictionary>
-                <x:String x:Key="CaptionButtonPath">M 0 0 H 10 V 10 H 0 V 0</x:String>
-                <x:String x:Key="CaptionButtonPathWindowMaximized">M 0 2 h 8 v 8 h -8 v -8 M 2 2 v -2 h 8 v 8 h -2</x:String>
-            </ResourceDictionary>
-        </Button.Resources>
+        <Button.Template>
+            <!-- Yes, you have to retemplate the ENTIRE BUTTON to add a single visual state. -->
+            <ControlTemplate TargetType="Button">
+                <ContentPresenter x:Name="ContentPresenter" AutomationProperties.AccessibilityView="Raw" BackgroundSizing="{TemplateBinding BackgroundSizing}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" ContentTemplate="{TemplateBinding ContentTemplate}" CornerRadius="{TemplateBinding CornerRadius}" ContentTransitions="{TemplateBinding ContentTransitions}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Padding="{TemplateBinding Padding}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
+                    <VisualStateManager.VisualStateGroups>
+                        <VisualStateGroup x:Name="CommonStates">
+                            <VisualState x:Name="Normal">
+                                <Storyboard>
+                                </Storyboard>
+                            </VisualState>
+                            <VisualState x:Name="PointerOver">
+                                <Storyboard>
+                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
+                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBackgroundPointerOver}"/>
+                                    </ObjectAnimationUsingKeyFrames>
+                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonForegroundPointerOver}"/>
+                                    </ObjectAnimationUsingKeyFrames>
+                                </Storyboard>
+                            </VisualState>
+                            <VisualState x:Name="Pressed">
+                                <Storyboard>
+                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
+                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBackgroundPressed}"/>
+                                    </ObjectAnimationUsingKeyFrames>
+                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonForegroundPressed}"/>
+                                    </ObjectAnimationUsingKeyFrames>
+                                </Storyboard>
+                            </VisualState>
+                            <VisualState x:Name="Disabled">
+                                <Storyboard>
+                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
+                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBackgroundDisabled}"/>
+                                    </ObjectAnimationUsingKeyFrames>
+                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
+                                        <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonForegroundDisabled}"/>
+                                    </ObjectAnimationUsingKeyFrames>
+                                </Storyboard>
+                            </VisualState>
+                        </VisualStateGroup>
+                        <VisualStateGroup x:Name="MinMaxStates">
+                            <VisualState x:Name="WindowStateNormal" />
+                            <VisualState x:Name="WindowStateMaximized">
+                                <VisualState.Setters>
+                                    <Setter Target="MaxRestoreGlyph.UriSource" Value="ms-appx:///TerminalApp/appframeicons/Restore.png" />
+                                </VisualState.Setters>
+                            </VisualState>
+                        </VisualStateGroup>
+                    </VisualStateManager.VisualStateGroups>
+                    <BitmapIcon x:Name="MaxRestoreGlyph" UriSource="ms-appx:///TerminalApp/appframeicons/Maximize.png" />
+                </ContentPresenter>
+            </ControlTemplate>
+        </Button.Template>
     </Button>
     <Button Height="{StaticResource CaptionButtonHeightWindowed}" MinWidth="46.0" Width="46.0"
             x:Name="CloseButton"
@@ -193,27 +208,26 @@ the MIT License. See LICENSE in the project root for license information. -->
             <ResourceDictionary>
                 <ResourceDictionary.ThemeDictionaries>
                     <ResourceDictionary x:Key="Light">
-                        <StaticResource x:Key="CaptionButtonBackgroundPointerOver" ResourceKey="CloseButtonBackgroundPointerOver"/>
-                        <StaticResource x:Key="CaptionButtonBackgroundPressed" ResourceKey="CloseButtonBackgroundPressed"/>
-                        <StaticResource x:Key="CaptionButtonStrokePointerOver" ResourceKey="CloseButtonStrokePointerOver"/>
-                        <StaticResource x:Key="CaptionButtonStrokePressed" ResourceKey="CloseButtonStrokePressed"/>
+                        <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="CloseButtonBackgroundPointerOver"/>
+                        <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="CloseButtonBackgroundPressed"/>
+                        <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="CloseButtonForegroundPointerOver"/>
+                        <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="CloseButtonForegroundPressed"/>
                     </ResourceDictionary>
                     <ResourceDictionary x:Key="Dark">
-                        <StaticResource x:Key="CaptionButtonBackgroundPointerOver" ResourceKey="CloseButtonBackgroundPointerOver"/>
-                        <StaticResource x:Key="CaptionButtonBackgroundPressed" ResourceKey="CloseButtonBackgroundPressed"/>
-                        <StaticResource x:Key="CaptionButtonStrokePointerOver" ResourceKey="CloseButtonStrokePointerOver"/>
-                        <StaticResource x:Key="CaptionButtonStrokePressed" ResourceKey="CloseButtonStrokePressed"/>
+                        <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="CloseButtonBackgroundPointerOver"/>
+                        <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="CloseButtonBackgroundPressed"/>
+                        <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="CloseButtonForegroundPointerOver"/>
+                        <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="CloseButtonForegroundPressed"/>
                     </ResourceDictionary>
                     <ResourceDictionary x:Key="HighContrast">
-                        <StaticResource x:Key="CaptionButtonBackgroundPointerOver" ResourceKey="CloseButtonBackgroundPointerOver"/>
-                        <StaticResource x:Key="CaptionButtonBackgroundPressed" ResourceKey="CloseButtonBackgroundPressed"/>
-                        <StaticResource x:Key="CaptionButtonStrokePointerOver" ResourceKey="CloseButtonStrokePointerOver"/>
-                        <StaticResource x:Key="CaptionButtonStrokePressed" ResourceKey="CloseButtonStrokePressed"/>
+                        <StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="CloseButtonBackgroundPointerOver"/>
+                        <StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="CloseButtonBackgroundPressed"/>
+                        <StaticResource x:Key="ButtonForegroundPointerOver" ResourceKey="CloseButtonForegroundPointerOver"/>
+                        <StaticResource x:Key="ButtonForegroundPressed" ResourceKey="CloseButtonForegroundPressed"/>
                     </ResourceDictionary>
                 </ResourceDictionary.ThemeDictionaries>
-
-                <x:String x:Key="CaptionButtonPath">M 0 0 L 10 10 M 10 0 L 0 10</x:String>
             </ResourceDictionary>
         </Button.Resources>
+        <BitmapIcon x:Name="CloseGlyph" UriSource="ms-appx:///TerminalApp/appframeicons/Close.png" Width="12" Height="12" />
     </Button>
 </StackPanel>

src/cascadia/TerminalApp/Pane.cpp

@@ -5,8 +5,6 @@
 #include "Pane.h"
 #include "AppLogic.h"
 
-#include <Mmsystem.h>
-
 using namespace winrt::Windows::Foundation;
 using namespace winrt::Windows::Graphics::Display;
 using namespace winrt::Windows::UI;
@@ -44,7 +42,6 @@ Pane::Pane(const GUID& profile, const TermControl& control, const bool lastFocus
     _border.Child(_control);
 
     _connectionStateChangedToken = _control.ConnectionStateChanged({ this, &Pane::_ControlConnectionStateChangedHandler });
-    _warningBellToken = _control.WarningBell({ this, &Pane::_ControlWarningBellHandler });
 
     // On the first Pane's creation, lookup resources we'll use to theme the
     // Pane, including the brushed to use for the focused/unfocused border
@@ -312,8 +309,7 @@ bool Pane::NavigateFocus(const Direction& direction)
 // - <none>
 // Return Value:
 // - <none>
-void Pane::_ControlConnectionStateChangedHandler(const TermControl& /*sender*/,
-                                                 const winrt::Windows::Foundation::IInspectable& /*args*/)
+void Pane::_ControlConnectionStateChangedHandler(const TermControl& /*sender*/, const winrt::Windows::Foundation::IInspectable& /*args*/)
 {
     std::unique_lock lock{ _createCloseLock };
     // It's possible that this event handler started being executed, then before
@@ -349,31 +345,6 @@ void Pane::_ControlConnectionStateChangedHandler(const TermControl& /*sender*/,
     }
 }
 
-// Method Description:
-// - Plays a warning note when triggered by the BEL control character,
-//   using the sound configured for the "Critical Stop" system event.`
-//   This matches the behavior of the Windows Console host.
-// Arguments:
-// - <unused>
-void Pane::_ControlWarningBellHandler(const winrt::Windows::Foundation::IInspectable& /*sender*/,
-                                      const winrt::Windows::Foundation::IInspectable& /*eventArgs*/)
-{
-    if (!_IsLeaf())
-    {
-        return;
-    }
-    const auto settings{ winrt::TerminalApp::implementation::AppLogic::CurrentAppSettings() };
-    auto paneProfile = settings.FindProfile(_profile.value());
-    if (paneProfile)
-    {
-        if (paneProfile.BellStyle() == winrt::Microsoft::Terminal::Settings::Model::BellStyle::Audible)
-        {
-            const auto soundAlias = reinterpret_cast<LPCTSTR>(SND_ALIAS_SYSTEMHAND);
-            PlaySound(soundAlias, NULL, SND_ALIAS_ID | SND_ASYNC | SND_SENTRY);
-        }
-    }
-}
-
 // Event Description:
 // - Called when our control gains focus. We'll use this to trigger our GotFocus
 //   callback. The tab that's hosting us should have registered a callback which
@@ -654,7 +625,6 @@ void Pane::_CloseChild(const bool closeFirst)
 
         // Add our new event handler before revoking the old one.
         _connectionStateChangedToken = _control.ConnectionStateChanged({ this, &Pane::_ControlConnectionStateChangedHandler });
-        _warningBellToken = _control.WarningBell({ this, &Pane::_ControlWarningBellHandler });
 
         // Revoke the old event handlers. Remove both the handlers for the panes
         // themselves closing, and remove their handlers for their controls
@@ -664,8 +634,6 @@ void Pane::_CloseChild(const bool closeFirst)
         _secondChild->Closed(_secondClosedToken);
         closedChild->_control.ConnectionStateChanged(closedChild->_connectionStateChangedToken);
         remainingChild->_control.ConnectionStateChanged(remainingChild->_connectionStateChangedToken);
-        closedChild->_control.WarningBell(closedChild->_warningBellToken);
-        remainingChild->_control.WarningBell(remainingChild->_warningBellToken);
 
         // If either of our children was focused, we want to take that focus from
         // them.
@@ -746,7 +714,6 @@ void Pane::_CloseChild(const bool closeFirst)
         oldFirst->Closed(oldFirstToken);
         oldSecond->Closed(oldSecondToken);
         closedChild->_control.ConnectionStateChanged(closedChild->_connectionStateChangedToken);
-        closedChild->_control.WarningBell(closedChild->_warningBellToken);
 
         // Reset our UI:
         _root.Children().Clear();
@@ -1445,8 +1412,6 @@ std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Pane::_Split(SplitState
     // revoke our handler - the child will take care of the control now.
     _control.ConnectionStateChanged(_connectionStateChangedToken);
     _connectionStateChangedToken.value = 0;
-    _control.WarningBell(_warningBellToken);
-    _warningBellToken.value = 0;
 
     // Remove our old GotFocus handler from the control. We don't what the
     // control telling us that it's now focused, we want it telling its new

src/cascadia/TerminalApp/Pane.h

@@ -99,7 +99,6 @@ private:
     winrt::event_token _connectionStateChangedToken{ 0 };
     winrt::event_token _firstClosedToken{ 0 };
     winrt::event_token _secondClosedToken{ 0 };
-    winrt::event_token _warningBellToken{ 0 };
 
     winrt::Windows::UI::Xaml::UIElement::GotFocus_revoker _gotFocusRevoker;
 
@@ -131,8 +130,6 @@ private:
 
     void _FocusFirstChild();
     void _ControlConnectionStateChangedHandler(const winrt::Microsoft::Terminal::TerminalControl::TermControl& sender, const winrt::Windows::Foundation::IInspectable& /*args*/);
-    void _ControlWarningBellHandler(winrt::Windows::Foundation::IInspectable const& sender,
-                                    winrt::Windows::Foundation::IInspectable const& e);
     void _ControlGotFocusHandler(winrt::Windows::Foundation::IInspectable const& sender,
                                  winrt::Windows::UI::Xaml::RoutedEventArgs const& e);
 

src/cascadia/TerminalApp/Resources/en-US/Resources.resw

@@ -177,17 +177,8 @@
   <data name="CloseWindowWarningTitle" xml:space="preserve">
     <value>Do you want to close all tabs?</value>
   </data>
-  <data name="TabCloseSubMenu" xml:space="preserve">
-    <value>Close...</value>
-  </data>
-  <data name="TabCloseAfter" xml:space="preserve">
-    <value>Close Tabs to the Right</value>
-  </data>
-  <data name="TabCloseOther" xml:space="preserve">
-    <value>Close Other Tabs</value>
-  </data>
   <data name="TabClose" xml:space="preserve">
-    <value>Close Tab</value>
+    <value>Close</value>
   </data>
   <data name="TabColorChoose" xml:space="preserve">
     <value>Color...</value>
@@ -294,9 +285,6 @@
   <data name="CmdFullscreenDesc" xml:space="preserve">
     <value>Launch the window in fullscreen mode</value>
   </data>
-  <data name="CmdFocusDesc" xml:space="preserve">
-    <value>Launch the window in focus mode</value>
-  </data>
   <data name="NewTabSplitButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.HelpText" xml:space="preserve">
     <value>Press the button to open a new terminal tab with your default profile. Open the flyout to select which profile you want to open.</value>
   </data>
@@ -469,4 +457,4 @@
   <data name="CouldNotOpenUriDialog.PrimaryButtonText" xml:space="preserve">
     <value>Cancel</value>
   </data>
-</root>
+</root>

src/cascadia/TerminalApp/Tab.cpp

@@ -593,61 +593,10 @@ namespace winrt::TerminalApp::implementation
         newTabFlyout.Items().Append(chooseColorMenuItem);
         newTabFlyout.Items().Append(renameTabMenuItem);
         newTabFlyout.Items().Append(menuSeparator);
-        newTabFlyout.Items().Append(_CreateCloseSubMenu());
         newTabFlyout.Items().Append(closeTabMenuItem);
         _tabViewItem.ContextFlyout(newTabFlyout);
     }
 
-    // Method Description:
-    // - Creates a sub-menu containing menu items to close multiple tabs
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - the created MenuFlyoutSubItem
-    Controls::MenuFlyoutSubItem Tab::_CreateCloseSubMenu()
-    {
-        auto weakThis{ get_weak() };
-
-        // Close tabs after
-        _closeTabsAfterMenuItem.Click([weakThis](auto&&, auto&&) {
-            if (auto tab{ weakThis.get() })
-            {
-                tab->_CloseTabsAfter();
-            }
-        });
-        _closeTabsAfterMenuItem.Text(RS_(L"TabCloseAfter"));
-
-        // Close other tabs
-        _closeOtherTabsMenuItem.Click([weakThis](auto&&, auto&&) {
-            if (auto tab{ weakThis.get() })
-            {
-                tab->_CloseOtherTabs();
-            }
-        });
-        _closeOtherTabsMenuItem.Text(RS_(L"TabCloseOther"));
-
-        Controls::MenuFlyoutSubItem closeSubMenu;
-        closeSubMenu.Text(RS_(L"TabCloseSubMenu"));
-        closeSubMenu.Items().Append(_closeTabsAfterMenuItem);
-        closeSubMenu.Items().Append(_closeOtherTabsMenuItem);
-
-        return closeSubMenu;
-    }
-
-    // Method Description:
-    // - Enable the Close menu items based on tab index and total number of tabs
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - <none>
-    void Tab::_EnableCloseMenuItems()
-    {
-        // close other tabs is enabled only if there are other tabs
-        _closeOtherTabsMenuItem.IsEnabled(TabViewNumTabs() > 1);
-        // close tabs after is enabled only if there are other tabs on the right
-        _closeTabsAfterMenuItem.IsEnabled(TabViewIndex() < TabViewNumTabs() - 1);
-    }
-
     // Method Description:
     // - This will update the contents of our TabViewItem for our current state.
     //   - If we're not in a rename, we'll set the Header of the TabViewItem to
@@ -1104,35 +1053,12 @@ namespace winrt::TerminalApp::implementation
         SwitchToTabCommand(command);
     }
 
-    void Tab::_CloseTabsAfter()
-    {
-        CloseTabsAfterArgs args{ _TabViewIndex };
-        ActionAndArgs closeTabsAfter{ ShortcutAction::CloseTabsAfter, args };
-
-        _dispatch.DoAction(closeTabsAfter);
-    }
-
-    void Tab::_CloseOtherTabs()
-    {
-        CloseOtherTabsArgs args{ _TabViewIndex };
-        ActionAndArgs closeOtherTabs{ ShortcutAction::CloseOtherTabs, args };
-
-        _dispatch.DoAction(closeOtherTabs);
-    }
-
-    void Tab::UpdateTabViewIndex(const uint32_t idx, const uint32_t numTabs)
+    void Tab::UpdateTabViewIndex(const uint32_t idx)
     {
         TabViewIndex(idx);
-        TabViewNumTabs(numTabs);
-        _EnableCloseMenuItems();
         SwitchToTabCommand().Action().Args().as<SwitchToTabArgs>().TabIndex(idx);
     }
 
-    void Tab::SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch)
-    {
-        _dispatch = dispatch;
-    }
-
     DEFINE_EVENT(Tab, ActivePaneChanged, _ActivePaneChangedHandlers, winrt::delegate<>);
     DEFINE_EVENT(Tab, ColorSelected, _colorSelected, winrt::delegate<winrt::Windows::UI::Color>);
     DEFINE_EVENT(Tab, ColorCleared, _colorCleared, winrt::delegate<>);

src/cascadia/TerminalApp/Tab.h

@@ -68,9 +68,7 @@ namespace winrt::TerminalApp::implementation
 
         int GetLeafPaneCount() const noexcept;
 
-        void UpdateTabViewIndex(const uint32_t idx, const uint32_t numTabs);
-
-        void SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch);
+        void UpdateTabViewIndex(const uint32_t idx);
 
         WINRT_CALLBACK(Closed, winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable>);
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
@@ -85,8 +83,6 @@ namespace winrt::TerminalApp::implementation
         // The TabViewIndex is the index this Tab object resides in TerminalPage's _tabs vector.
         // This is needed since Tab is going to be managing its own SwitchToTab command.
         OBSERVABLE_GETSET_PROPERTY(uint32_t, TabViewIndex, _PropertyChangedHandlers, 0);
-        // The TabViewNumTabs is the number of Tab objects in TerminalPage's _tabs vector.
-        OBSERVABLE_GETSET_PROPERTY(uint32_t, TabViewNumTabs, _PropertyChangedHandlers, 0);
 
     private:
         std::shared_ptr<Pane> _rootPane{ nullptr };
@@ -96,8 +92,6 @@ namespace winrt::TerminalApp::implementation
         winrt::TerminalApp::ColorPickupFlyout _tabColorPickup{};
         std::optional<winrt::Windows::UI::Color> _themeTabColor{};
         std::optional<winrt::Windows::UI::Color> _runtimeTabColor{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closeOtherTabsMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closeTabsAfterMenuItem{};
 
         bool _focused{ false };
         winrt::Microsoft::UI::Xaml::Controls::TabViewItem _tabViewItem{ nullptr };
@@ -106,15 +100,10 @@ namespace winrt::TerminalApp::implementation
         bool _inRename{ false };
         winrt::Windows::UI::Xaml::Controls::TextBox::LayoutUpdated_revoker _tabRenameBoxLayoutUpdatedRevoker;
 
-        winrt::TerminalApp::ShortcutActionDispatch _dispatch;
-
         void _MakeTabViewItem();
         void _Focus();
 
         void _CreateContextMenu();
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutSubItem _CreateCloseSubMenu();
-        void _EnableCloseMenuItems();
-
         void _RefreshVisualState();
 
         void _BindEventHandlers(const winrt::Microsoft::Terminal::TerminalControl::TermControl& control) noexcept;
@@ -134,9 +123,6 @@ namespace winrt::TerminalApp::implementation
 
         void _MakeSwitchToTabCommand();
 
-        void _CloseTabsAfter();
-        void _CloseOtherTabs();
-
         friend class ::TerminalAppLocalTests::TabTests;
     };
 }

src/cascadia/TerminalApp/Tab.idl

@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-import "ShortcutActionDispatch.idl";
 
 namespace TerminalApp
 {
@@ -10,7 +9,5 @@ namespace TerminalApp
         Windows.UI.Xaml.Controls.IconSource IconSource { get; };
         Microsoft.Terminal.Settings.Model.Command SwitchToTabCommand { get; };
         UInt32 TabViewIndex { get; };
-
-        void SetDispatch(ShortcutActionDispatch dispatch);
     }
 }

src/cascadia/TerminalApp/TerminalAppLib.vcxproj

@@ -331,5 +331,176 @@
     </ItemGroup>
   </Target>
 
+  <ItemGroup>
+    <None Include="appframeicons/Close.scale-100_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Close.scale-100.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Close.scale-125_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Close.scale-125.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Close.scale-150_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Close.scale-150.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Close.scale-200_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Close.scale-200.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Close.scale-250_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Close.scale-250.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Close.scale-300_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Close.scale-300.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Close.scale-400_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Close.scale-400.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Maximize.scale-100_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Maximize.scale-100.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Maximize.scale-125_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Maximize.scale-125.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Maximize.scale-150_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Maximize.scale-150.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Maximize.scale-200_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Maximize.scale-200.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Maximize.scale-250_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Maximize.scale-250.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Maximize.scale-300_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Maximize.scale-300.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Maximize.scale-400_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Maximize.scale-400.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Minimize.scale-100_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Minimize.scale-100.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Minimize.scale-125_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Minimize.scale-125.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Minimize.scale-150_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Minimize.scale-150.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Minimize.scale-200_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Minimize.scale-200.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Minimize.scale-250_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Minimize.scale-250.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Minimize.scale-300_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Minimize.scale-300.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Minimize.scale-400_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Minimize.scale-400.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Restore.scale-100_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Restore.scale-100.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Restore.scale-125_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Restore.scale-125.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Restore.scale-150_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Restore.scale-150.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Restore.scale-200_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Restore.scale-200.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Restore.scale-250_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Restore.scale-250.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Restore.scale-300_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Restore.scale-300.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Restore.scale-400_contrast-white.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+    <None Include="appframeicons/Restore.scale-400.png">
+      <DeploymentContent>true</DeploymentContent>
+    </None>
+  </ItemGroup>
+
   <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
 </Project>

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -7,6 +7,7 @@
 #include "AppLogic.h"
 #include "../../types/inc/utils.hpp"
 
+#include <Mmsystem.h>
 #include <LibraryResources.h>
 
 #include "TerminalPage.g.cpp"
@@ -672,10 +673,8 @@ namespace winrt::TerminalApp::implementation
         auto newTabImpl = winrt::make_self<Tab>(profileGuid, term);
         _tabs.Append(*newTabImpl);
 
-        newTabImpl->SetDispatch(*_actionDispatch);
-
         // Give the tab its index in the _tabs vector so it can manage its own SwitchToTab command.
-        _UpdateTabIndices();
+        newTabImpl->UpdateTabViewIndex(_tabs.Size() - 1);
 
         // Hookup our event handlers to the new terminal
         _RegisterTerminalEvents(term, *newTabImpl);
@@ -1121,6 +1120,8 @@ namespace winrt::TerminalApp::implementation
         // Add an event handler when the terminal wants to paste data from the Clipboard.
         term.PasteFromClipboard({ this, &TerminalPage::_PasteFromClipboardHandler });
 
+        term.WarningBell({ this, &TerminalPage::_WarningBellHandler });
+
         term.OpenHyperlink({ this, &TerminalPage::_OpenHyperlinkHandler });
 
         // Bind Tab events to the TermControl and the Tab's Pane
@@ -1781,6 +1782,18 @@ namespace winrt::TerminalApp::implementation
         CATCH_LOG();
     }
 
+    // Method Description:
+    // - Plays a warning note when triggered by the BEL control character,
+    //   using the sound configured for the "Critical Stop" system event.
+    //   This matches the behavior of the Windows Console host.
+    // Arguments:
+    // - <none>
+    void TerminalPage::_WarningBellHandler(const IInspectable sender, const IInspectable eventArgs)
+    {
+        const auto soundAlias = reinterpret_cast<LPCTSTR>(SND_ALIAS_SYSTEMHAND);
+        PlaySound(soundAlias, NULL, SND_ALIAS_ID | SND_ASYNC | SND_SENTRY);
+    }
+
     void TerminalPage::_OpenHyperlinkHandler(const IInspectable /*sender*/, const Microsoft::Terminal::TerminalControl::OpenHyperlinkEventArgs eventArgs)
     {
         try
@@ -2529,10 +2542,9 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void TerminalPage::_UpdateTabIndices()
     {
-        const uint32_t size = _tabs.Size();
-        for (uint32_t i = 0; i < size; ++i)
+        for (uint32_t i = 0; i < _tabs.Size(); ++i)
         {
-            _GetStrongTabImpl(i)->UpdateTabViewIndex(i, size);
+            _GetStrongTabImpl(i)->UpdateTabViewIndex(i);
         }
     }
 

src/cascadia/TerminalApp/TerminalPage.h

@@ -174,6 +174,7 @@ namespace winrt::TerminalApp::implementation
         winrt::fire_and_forget _PasteFromClipboardHandler(const IInspectable sender,
                                                           const Microsoft::Terminal::TerminalControl::PasteFromClipboardEventArgs eventArgs);
 
+        void _WarningBellHandler(const IInspectable sender, const IInspectable eventArgs);
         void _OpenHyperlinkHandler(const IInspectable sender, const Microsoft::Terminal::TerminalControl::OpenHyperlinkEventArgs eventArgs);
         void _ShowCouldNotOpenDialog(winrt::hstring reason, winrt::hstring uri);
         bool _CopyText(const bool singleLine, const Windows::Foundation::IReference<Microsoft::Terminal::TerminalControl::CopyFormat>& formats);

src/cascadia/TerminalControl/TermControl.cpp

@@ -953,9 +953,8 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         // flow through to the terminal.
         // GH#6423 - don't dismiss selection if the key that was pressed was a
         // modifier key. We'll wait for a real keystroke to dismiss the
-        // GH #7395 - don't dismiss selection when taking PrintScreen
         // selection.
-        if (_terminal->IsSelectionActive() && !KeyEvent::IsModifierKey(vkey) && vkey != VK_SNAPSHOT)
+        if (_terminal->IsSelectionActive() && !KeyEvent::IsModifierKey(vkey))
         {
             _terminal->ClearSelection();
             _renderer->TriggerSelection();

src/cascadia/TerminalCore/Terminal.cpp

@@ -9,7 +9,6 @@
 #include "../../inc/DefaultSettings.h"
 #include "../../inc/argb.h"
 #include "../../types/inc/utils.hpp"
-#include "../../types/inc/colorTable.hpp"
 
 #include <winrt/Microsoft.Terminal.TerminalControl.h>
 

src/cascadia/TerminalCore/TerminalApi.cpp

@@ -249,7 +249,7 @@ try
         startPos.X = viewport.Left();
         nlength = viewport.RightExclusive() - startPos.X;
         break;
-    default:
+    case DispatchTypes::EraseType::Scrollback:
         return false;
     }
 

src/cascadia/TerminalCore/TerminalDispatch.cpp

@@ -368,14 +368,14 @@ bool TerminalDispatch::EnableAlternateScroll(const bool enabled) noexcept
     return true;
 }
 
-bool TerminalDispatch::SetPrivateMode(const DispatchTypes::PrivateModeParams param) noexcept
+bool TerminalDispatch::SetPrivateModes(const gsl::span<const DispatchTypes::PrivateModeParams> params) noexcept
 {
-    return _PrivateModeParamsHelper(param, true);
+    return _SetResetPrivateModes(params, true);
 }
 
-bool TerminalDispatch::ResetPrivateMode(const DispatchTypes::PrivateModeParams param) noexcept
+bool TerminalDispatch::ResetPrivateModes(const gsl::span<const DispatchTypes::PrivateModeParams> params) noexcept
 {
-    return _PrivateModeParamsHelper(param, false);
+    return _SetResetPrivateModes(params, false);
 }
 
 // Method Description:
@@ -399,10 +399,32 @@ bool TerminalDispatch::EndHyperlink() noexcept
     return _terminalApi.EndHyperlink();
 }
 
+// Routine Description:
+// - Generalized handler for the setting/resetting of DECSET/DECRST parameters.
+//     All params in the rgParams will attempt to be executed, even if one
+//     fails, to allow us to successfully re/set params that are chained with
+//     params we don't yet support.
+// Arguments:
+// - params - array of params to set/reset
+// - enable - True for set, false for unset.
+// Return Value:
+// - True if ALL params were handled successfully. False otherwise.
+bool TerminalDispatch::_SetResetPrivateModes(const gsl::span<const DispatchTypes::PrivateModeParams> params, const bool enable) noexcept
+{
+    // because the user might chain together params we don't support with params we DO support, execute all
+    // params in the sequence, and only return failure if we failed at least one of them
+    size_t failures = 0;
+    for (const auto& p : params)
+    {
+        failures += _PrivateModeParamsHelper(p, enable) ? 0 : 1; // increment the number of failures if we fail.
+    }
+    return failures == 0;
+}
+
 // Routine Description:
 // - Support routine for routing private mode parameters to be set/reset as flags
 // Arguments:
-// - param - mode parameter to set/reset
+// - params - array of params to set/reset
 // - enable - True for set, false for unset.
 // Return Value:
 // - True if handled successfully. False otherwise.
@@ -481,7 +503,8 @@ bool TerminalDispatch::SoftReset() noexcept
     //     success = _pConApi->SetConsoleOutputCP(_initialCodePage.value()) && success;
     // }
 
-    success = SetGraphicsRendition({}) && success; // Normal rendition.
+    const auto opt = DispatchTypes::GraphicsOptions::Off;
+    success = SetGraphicsRendition({ &opt, 1 }) && success; // Normal rendition.
 
     // // Reset the saved cursor state.
     // // Note that XTerm only resets the main buffer state, but that

src/cascadia/TerminalCore/TerminalDispatch.hpp

@@ -13,7 +13,7 @@ public:
     void Print(const wchar_t wchPrintable) noexcept override;
     void PrintString(const std::wstring_view string) noexcept override;
 
-    bool SetGraphicsRendition(const ::Microsoft::Console::VirtualTerminal::VTParameters options) noexcept override;
+    bool SetGraphicsRendition(const gsl::span<const ::Microsoft::Console::VirtualTerminal::DispatchTypes::GraphicsOptions> options) noexcept override;
 
     bool CursorPosition(const size_t line,
                         const size_t column) noexcept override; // CUP
@@ -61,8 +61,8 @@ public:
     bool EnableAnyEventMouseMode(const bool enabled) noexcept override; // ?1003
     bool EnableAlternateScroll(const bool enabled) noexcept override; // ?1007
 
-    bool SetPrivateMode(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::PrivateModeParams /*param*/) noexcept override; // DECSET
-    bool ResetPrivateMode(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::PrivateModeParams /*param*/) noexcept override; // DECRST
+    bool SetPrivateModes(const gsl::span<const ::Microsoft::Console::VirtualTerminal::DispatchTypes::PrivateModeParams> /*params*/) noexcept override; // DECSET
+    bool ResetPrivateModes(const gsl::span<const ::Microsoft::Console::VirtualTerminal::DispatchTypes::PrivateModeParams> /*params*/) noexcept override; // DECRST
 
     bool AddHyperlink(const std::wstring_view uri, const std::wstring_view params) noexcept override;
     bool EndHyperlink() noexcept override;
@@ -70,9 +70,10 @@ public:
 private:
     ::Microsoft::Terminal::Core::ITerminalApi& _terminalApi;
 
-    size_t _SetRgbColorsHelper(const ::Microsoft::Console::VirtualTerminal::VTParameters options,
+    size_t _SetRgbColorsHelper(const gsl::span<const ::Microsoft::Console::VirtualTerminal::DispatchTypes::GraphicsOptions> options,
                                TextAttribute& attr,
                                const bool isForeground) noexcept;
 
+    bool _SetResetPrivateModes(const gsl::span<const ::Microsoft::Console::VirtualTerminal::DispatchTypes::PrivateModeParams> params, const bool enable) noexcept;
     bool _PrivateModeParamsHelper(const ::Microsoft::Console::VirtualTerminal::DispatchTypes::PrivateModeParams param, const bool enable) noexcept;
 };

src/cascadia/TerminalCore/TerminalDispatchGraphics.cpp

@@ -41,39 +41,43 @@ const BYTE BRIGHT_WHITE   = BRIGHT_ATTR | RED_ATTR | GREEN_ATTR | BLUE_ATTR;
 // - isForeground - Whether or not the parsed color is for the foreground.
 // Return Value:
 // - The number of options consumed, not including the initial 38/48.
-size_t TerminalDispatch::_SetRgbColorsHelper(const VTParameters options,
+size_t TerminalDispatch::_SetRgbColorsHelper(const gsl::span<const DispatchTypes::GraphicsOptions> options,
                                              TextAttribute& attr,
                                              const bool isForeground) noexcept
 {
-    size_t optionsConsumed = 1;
-    const DispatchTypes::GraphicsOptions typeOpt = options.at(0);
-    if (typeOpt == DispatchTypes::GraphicsOptions::RGBColorOrFaint)
+    size_t optionsConsumed = 0;
+    if (options.size() >= 1)
     {
-        optionsConsumed = 4;
-        const size_t red = options.at(1).value_or(0);
-        const size_t green = options.at(2).value_or(0);
-        const size_t blue = options.at(3).value_or(0);
-        // ensure that each value fits in a byte
-        if (red <= 255 && green <= 255 && blue <= 255)
+        optionsConsumed = 1;
+        const auto typeOpt = til::at(options, 0);
+        if (typeOpt == DispatchTypes::GraphicsOptions::RGBColorOrFaint && options.size() >= 4)
         {
-            const COLORREF rgbColor = RGB(red, green, blue);
-            attr.SetColor(rgbColor, isForeground);
-        }
-    }
-    else if (typeOpt == DispatchTypes::GraphicsOptions::BlinkOrXterm256Index)
-    {
-        optionsConsumed = 2;
-        const size_t tableIndex = options.at(1).value_or(0);
-        if (tableIndex <= 255)
-        {
-            const auto adjustedIndex = gsl::narrow_cast<BYTE>(tableIndex);
-            if (isForeground)
+            optionsConsumed = 4;
+            const size_t red = til::at(options, 1);
+            const size_t green = til::at(options, 2);
+            const size_t blue = til::at(options, 3);
+            // ensure that each value fits in a byte
+            if (red <= 255 && green <= 255 && blue <= 255)
             {
-                attr.SetIndexedForeground256(adjustedIndex);
+                const COLORREF rgbColor = RGB(red, green, blue);
+                attr.SetColor(rgbColor, isForeground);
             }
-            else
+        }
+        else if (typeOpt == DispatchTypes::GraphicsOptions::BlinkOrXterm256Index && options.size() >= 2)
+        {
+            optionsConsumed = 2;
+            const size_t tableIndex = til::at(options, 1);
+            if (tableIndex <= 255)
             {
-                attr.SetIndexedBackground256(adjustedIndex);
+                const auto adjustedIndex = gsl::narrow_cast<BYTE>(tableIndex);
+                if (isForeground)
+                {
+                    attr.SetIndexedForeground256(adjustedIndex);
+                }
+                else
+                {
+                    attr.SetIndexedBackground256(adjustedIndex);
+                }
             }
         }
     }
@@ -90,14 +94,14 @@ size_t TerminalDispatch::_SetRgbColorsHelper(const VTParameters options,
 //   one at a time by setting or removing flags in the font style properties.
 // Return Value:
 // - True if handled successfully. False otherwise.
-bool TerminalDispatch::SetGraphicsRendition(const VTParameters options) noexcept
+bool TerminalDispatch::SetGraphicsRendition(const gsl::span<const DispatchTypes::GraphicsOptions> options) noexcept
 {
     TextAttribute attr = _terminalApi.GetTextAttributes();
 
     // Run through the graphics options and apply them
     for (size_t i = 0; i < options.size(); i++)
     {
-        const GraphicsOptions opt = options.at(i);
+        const auto opt = til::at(options, i);
         switch (opt)
         {
         case Off:

src/cascadia/TerminalSettingsModel/ActionArgs.cpp

@@ -20,8 +20,6 @@
 #include "SetTabColorArgs.g.cpp"
 #include "RenameTabArgs.g.cpp"
 #include "ExecuteCommandlineArgs.g.cpp"
-#include "CloseOtherTabsArgs.g.cpp"
-#include "CloseTabsAfterArgs.g.cpp"
 
 #include <LibraryResources.h>
 

src/cascadia/TerminalSettingsModel/ActionArgs.h

@@ -505,8 +505,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     struct CloseOtherTabsArgs : public CloseOtherTabsArgsT<CloseOtherTabsArgs>
     {
         CloseOtherTabsArgs() = default;
-        CloseOtherTabsArgs(uint32_t& tabIndex) :
-            _Index{ tabIndex } {};
         GETSET_PROPERTY(Windows::Foundation::IReference<uint32_t>, Index, nullptr);
 
         static constexpr std::string_view IndexKey{ "index" };
@@ -535,8 +533,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     struct CloseTabsAfterArgs : public CloseTabsAfterArgsT<CloseTabsAfterArgs>
     {
         CloseTabsAfterArgs() = default;
-        CloseTabsAfterArgs(uint32_t& tabIndex) :
-            _Index{ tabIndex } {};
         GETSET_PROPERTY(Windows::Foundation::IReference<uint32_t>, Index, nullptr);
 
         static constexpr std::string_view IndexKey{ "index" };
@@ -571,6 +567,4 @@ namespace winrt::Microsoft::Terminal::Settings::Model::factory_implementation
     BASIC_FACTORY(NewTabArgs);
     BASIC_FACTORY(SplitPaneArgs);
     BASIC_FACTORY(ExecuteCommandlineArgs);
-    BASIC_FACTORY(CloseOtherTabsArgs);
-    BASIC_FACTORY(CloseTabsAfterArgs);
 }

src/cascadia/TerminalSettingsModel/ActionArgs.idl

@@ -141,13 +141,11 @@ namespace Microsoft.Terminal.Settings.Model
 
     [default_interface] runtimeclass CloseOtherTabsArgs : IActionArgs
     {
-        CloseOtherTabsArgs(UInt32 tabIndex);
         Windows.Foundation.IReference<UInt32> Index { get; };
     };
 
     [default_interface] runtimeclass CloseTabsAfterArgs : IActionArgs
     {
-        CloseTabsAfterArgs(UInt32 tabIndex);
         Windows.Foundation.IReference<UInt32> Index { get; };
     };
 }

src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl

@@ -22,8 +22,6 @@ namespace Microsoft.Terminal.Settings.Model
         DefaultMode,
         MaximizedMode,
         FullscreenMode,
-        FocusMode,
-        MaximizedFocusMode,
     };
 
     [default_interface] runtimeclass GlobalAppSettings {

src/cascadia/TerminalSettingsModel/Profile.cpp

@@ -57,9 +57,6 @@ static constexpr std::string_view BackgroundImageAlignmentKey{ "backgroundImageA
 static constexpr std::string_view RetroTerminalEffectKey{ "experimental.retroTerminalEffect" };
 static constexpr std::string_view AntialiasingModeKey{ "antialiasingMode" };
 static constexpr std::string_view TabColorKey{ "tabColor" };
-static constexpr std::string_view BellStyleKey{ "bellStyle" };
-
-static const winrt::hstring DesktopWallpaperEnum{ L"DesktopWallpaper" };
 
 Profile::Profile()
 {
@@ -244,43 +241,20 @@ void Profile::LayerJson(const Json::Value& json)
     JsonUtils::GetValueForKey(json, AntialiasingModeKey, _AntialiasingMode);
 
     JsonUtils::GetValueForKey(json, TabColorKey, _TabColor);
-
-    JsonUtils::GetValueForKey(json, BellStyleKey, _BellStyle);
 }
 
 // Method Description:
-// - Either Returns this profile's background image path, if one is set, expanding
 // - Returns this profile's background image path, if one is set, expanding
 //   any environment variables in the path, if there are any.
-// - Or if "DesktopWallpaper" is set, then gets the path to the desktops wallpaper.
 // Return Value:
-// - This profile's expanded background image path / desktops's wallpaper path /the empty string.
+// - This profile's expanded background image path / the empty string.
 winrt::hstring Profile::ExpandedBackgroundImagePath() const
 {
     if (_BackgroundImagePath.empty())
     {
         return _BackgroundImagePath;
     }
-    // checks if the user would like to copy their desktop wallpaper
-    // if so, replaces the path with the desktop wallpaper's path
-    else if (_BackgroundImagePath == to_hstring(DesktopWallpaperEnum))
-    {
-        WCHAR desktopWallpaper[MAX_PATH];
-
-        // "The returned string will not exceed MAX_PATH characters" as of 2020
-        if (SystemParametersInfo(SPI_GETDESKWALLPAPER, MAX_PATH, desktopWallpaper, SPIF_UPDATEINIFILE))
-        {
-            return winrt::hstring{ (desktopWallpaper) };
-        }
-        else
-        {
-            return winrt::hstring{ L"" };
-        }
-    }
-    else
-    {
-        return winrt::hstring{ wil::ExpandEnvironmentStringsW<std::wstring>(_BackgroundImagePath.c_str()) };
-    }
+    return winrt::hstring{ wil::ExpandEnvironmentStringsW<std::wstring>(_BackgroundImagePath.c_str()) };
 }
 
 winrt::hstring Profile::EvaluatedStartingDirectory() const

src/cascadia/TerminalSettingsModel/Profile.h

@@ -115,8 +115,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         GETSET_PROPERTY(Microsoft::Terminal::TerminalControl::CursorStyle, CursorShape, Microsoft::Terminal::TerminalControl::CursorStyle::Bar);
         GETSET_PROPERTY(uint32_t, CursorHeight, DEFAULT_CURSOR_HEIGHT);
 
-        GETSET_PROPERTY(winrt::Microsoft::Terminal::Settings::Model::BellStyle, BellStyle, winrt::Microsoft::Terminal::Settings::Model::BellStyle::Audible);
-
     private:
         std::optional<winrt::guid> _Guid{ std::nullopt };
         std::optional<winrt::guid> _ConnectionType{ std::nullopt };

src/cascadia/TerminalSettingsModel/Profile.idl

@@ -10,12 +10,6 @@ namespace Microsoft.Terminal.Settings.Model
         Always
     };
 
-    enum BellStyle
-    {
-        None,
-        Audible
-    };
-
     [default_interface] runtimeclass Profile {
         Profile();
         Profile(Guid guid);
@@ -72,7 +66,5 @@ namespace Microsoft.Terminal.Settings.Model
 
         Microsoft.Terminal.TerminalControl.CursorStyle CursorShape;
         UInt32 CursorHeight;
-
-        BellStyle BellStyle;
     }
 }

src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h

@@ -47,14 +47,6 @@ JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::TerminalControl::ScrollbarState)
     };
 };
 
-JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Settings::Model::BellStyle)
-{
-    static constexpr std::array<pair_type, 2> mappings = {
-        pair_type{ "none", ValueType::None },
-        pair_type{ "audible", ValueType::Audible }
-    };
-};
-
 JSON_ENUM_MAPPER(std::tuple<::winrt::Windows::UI::Xaml::HorizontalAlignment, ::winrt::Windows::UI::Xaml::VerticalAlignment>)
 {
     // reduce repetition
@@ -173,12 +165,10 @@ JSON_ENUM_MAPPER(::winrt::Windows::UI::Xaml::ElementTheme)
 
 JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Settings::Model::LaunchMode)
 {
-    JSON_MAPPINGS(5) = {
+    JSON_MAPPINGS(3) = {
         pair_type{ "default", ValueType::DefaultMode },
         pair_type{ "maximized", ValueType::MaximizedMode },
         pair_type{ "fullscreen", ValueType::FullscreenMode },
-        pair_type{ "focus", ValueType::FocusMode },
-        pair_type{ "maximizedFocus", ValueType::MaximizedFocusMode },
     };
 };
 

src/cascadia/WindowsTerminal/BaseWindow.h

@@ -100,7 +100,7 @@ public:
     }
 
     // DPI Change handler. on WM_DPICHANGE resize the window
-    [[nodiscard]] LRESULT HandleDpiChange(const HWND hWnd, const WPARAM wParam, const LPARAM lParam)
+    [[nodiscard]] virtual LRESULT HandleDpiChange(const HWND hWnd, const WPARAM wParam, const LPARAM lParam)
     {
         _inDpiChange = true;
         const HWND hWndStatic = GetWindow(hWnd, GW_CHILD);

src/cascadia/WindowsTerminal/IslandWindow.cpp

@@ -5,6 +5,7 @@
 #include "IslandWindow.h"
 #include "../types/inc/Viewport.hpp"
 #include "resource.h"
+#include "winrt/Windows.ApplicationModel.Resources.Core.h"
 
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
@@ -139,7 +140,7 @@ void IslandWindow::_HandleCreateWindow(const WPARAM, const LPARAM lParam) noexce
     }
 
     int nCmdShow = SW_SHOW;
-    if (launchMode == LaunchMode::MaximizedMode || launchMode == LaunchMode::MaximizedFocusMode)
+    if (launchMode == LaunchMode::MaximizedMode)
     {
         nCmdShow = SW_MAXIMIZE;
     }
@@ -263,7 +264,7 @@ void IslandWindow::Initialize()
 void IslandWindow::OnSize(const UINT width, const UINT height)
 {
     // update the interop window size
-    SetWindowPos(_interopWindowHandle, nullptr, 0, 0, width, height, SWP_SHOWWINDOW | SWP_NOACTIVATE);
+    SetWindowPos(_interopWindowHandle, nullptr, 0, 0, width, height, SWP_SHOWWINDOW);
 
     if (_rootGrid)
     {
@@ -273,6 +274,31 @@ void IslandWindow::OnSize(const UINT width, const UINT height)
     }
 }
 
+LRESULT IslandWindow::HandleDpiChange(const HWND hWnd, const WPARAM wParam, const LPARAM lParam) try {
+    static constexpr std::array<std::pair<float, std::wstring_view>, 6> scaleQualifiers{
+        std::pair{ 1.0f, L"100" },
+        std::pair{ 1.25f, L"125" },
+        std::pair{ 1.50f, L"150" },
+        std::pair{ 2.0f, L"200" },
+        std::pair{ 3.0f, L"300" },
+        std::pair{ 4.0f, L"400" },
+    };
+    auto lr = __super::HandleDpiChange(hWnd, wParam, lParam);
+    auto fv = winrt::Windows::ApplicationModel::Resources::Core::ResourceContext::GetForCurrentView();
+    auto qv = fv.QualifierValues();
+    auto sc = GetCurrentDpiScale();
+    auto pp = std::partition_point(scaleQualifiers.begin(), scaleQualifiers.end(), [sc](auto&& f) {
+        return f.first < sc;
+    });
+    auto pv = pp->second;
+    qv.Insert(L"scale", pp->second);
+    return lr;
+}
+catch (...)
+{
+    return 0;
+}
+
 [[nodiscard]] LRESULT IslandWindow::MessageHandler(UINT const message, WPARAM const wparam, LPARAM const lparam) noexcept
 {
     switch (message)
@@ -499,7 +525,7 @@ void IslandWindow::SetAlwaysOnTop(const bool alwaysOnTop)
                      0,
                      0,
                      0,
-                     SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
+                     SWP_NOMOVE | SWP_NOSIZE);
     }
 }
 
@@ -613,7 +639,7 @@ void IslandWindow::_SetIsBorderless(const bool borderlessEnabled)
                  windowPos.top<int>(),
                  windowPos.width<int>(),
                  windowPos.height<int>(),
-                 SWP_SHOWWINDOW | SWP_FRAMECHANGED | SWP_NOACTIVATE);
+                 SWP_SHOWWINDOW | SWP_FRAMECHANGED);
 }
 
 // Method Description:
@@ -699,7 +725,7 @@ void IslandWindow::_ApplyWindowSize()
                                          newSize.top,
                                          newSize.right - newSize.left,
                                          newSize.bottom - newSize.top,
-                                         SWP_FRAMECHANGED | SWP_NOACTIVATE));
+                                         SWP_FRAMECHANGED));
 }
 
 DEFINE_EVENT(IslandWindow, DragRegionClicked, _DragRegionClickedHandlers, winrt::delegate<>);

src/cascadia/WindowsTerminal/IslandWindow.h

@@ -21,6 +21,7 @@ public:
     void OnResize(const UINT width, const UINT height) override;
     void OnMinimize() override;
     void OnRestore() override;
+    LRESULT HandleDpiChange(const HWND hWnd, const WPARAM wParam, const LPARAM lParam) override;
     virtual void OnAppInitialized();
     virtual void SetContent(winrt::Windows::UI::Xaml::UIElement content);
     virtual void OnApplicationThemeChanged(const winrt::Windows::UI::Xaml::ElementTheme& requestedTheme);