Make the HWND one clear the same way as composition. Identify and temporarily resolve issue where device resources aren't created by conhost early enough for intersects to happen against the actual screen size. Mitigate issue where Present1 doesn't like being called if there isn't already ONE frame presented ever on the chain.

CODE_OF_CONDUCT.md

@@ -1,9 +1,8 @@
-# Microsoft Open Source Code of Conduct
+# Code of Conduct
 
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
+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.
 
-Resources:
-
-- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
-- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
-- Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns
+[conduct-code]: https://opensource.microsoft.com/codeofconduct/
+[conduct-FAQ]: https://opensource.microsoft.com/codeofconduct/faq/
+[conduct-email]: mailto:opencode@microsoft.com

NOTICE.md

@@ -80,7 +80,7 @@ SOFTWARE.
 
 ## chromium/base/numerics
 
-**Source**: https://github.com/chromium/chromium/tree/master/base/numerics
+**Source**: 
 
 ### License
 
@@ -112,71 +112,4 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-```
-
-## kimwalisch/libpopcnt
-
-**Source**: https://github.com/kimwalisch/libpopcnt
-
-### License
-
-```
-BSD 2-Clause License
-
-Copyright (c) 2016 - 2019, Kim Walisch
-Copyright (c) 2016 - 2019, Wojciech Muła
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-```
-
-## dynamic_bitset
-
-**Source**: https://github.com/pinam45/dynamic_bitset
-
-### License
-
-```
-MIT License
-
-Copyright (c) 2019 Maxime Pinard
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 ```

OpenConsole.sln

@@ -294,12 +294,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{D3EF
 		build\scripts\Test-WindowsTerminalPackage.ps1 = build\scripts\Test-WindowsTerminalPackage.ps1
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dx.Unit.Tests", "src\renderer\dx\ut_dx\Dx.Unit.Tests.vcxproj", "{95B136F9-B238-490C-A7C5-5843C1FECAC4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winconpty.Tests.Feature", "src\winconpty\ft_pty\winconpty.FeatureTests.vcxproj", "{024052DE-83FB-4653-AEA4-90790D29D5BD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAzBridge", "src\cascadia\TerminalAzBridge\TerminalAzBridge.vcxproj", "{067F0A06-FCB7-472C-96E9-B03B54E8E18D}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AuditMode|Any CPU = AuditMode|Any CPU
@@ -1425,66 +1419,6 @@ Global
 		{A602A555-BAAC-46E1-A91D-3DAB0475C5A1}.Release|x64.Build.0 = Release|x64
 		{A602A555-BAAC-46E1-A91D-3DAB0475C5A1}.Release|x86.ActiveCfg = Release|Win32
 		{A602A555-BAAC-46E1-A91D-3DAB0475C5A1}.Release|x86.Build.0 = Release|Win32
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.AuditMode|x64.ActiveCfg = Release|x64
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.Debug|ARM64.Build.0 = Debug|ARM64
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.Debug|x64.ActiveCfg = Debug|x64
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.Debug|x64.Build.0 = Debug|x64
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.Debug|x86.ActiveCfg = Debug|Win32
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.Debug|x86.Build.0 = Debug|Win32
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.Release|Any CPU.ActiveCfg = Release|Win32
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.Release|ARM64.ActiveCfg = Release|ARM64
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.Release|ARM64.Build.0 = Release|ARM64
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.Release|x64.ActiveCfg = Release|x64
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.Release|x64.Build.0 = Release|x64
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.Release|x86.ActiveCfg = Release|Win32
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4}.Release|x86.Build.0 = Release|Win32
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.AuditMode|x64.ActiveCfg = Release|x64
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Debug|ARM64.Build.0 = Debug|ARM64
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Debug|x64.ActiveCfg = Debug|x64
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Debug|x64.Build.0 = Debug|x64
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Debug|x86.ActiveCfg = Debug|Win32
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Debug|x86.Build.0 = Debug|Win32
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Release|Any CPU.ActiveCfg = Release|Win32
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Release|ARM64.ActiveCfg = Release|ARM64
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Release|ARM64.Build.0 = Release|ARM64
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Release|x64.ActiveCfg = Release|x64
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Release|x64.Build.0 = Release|x64
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Release|x86.ActiveCfg = Release|Win32
-		{024052DE-83FB-4653-AEA4-90790D29D5BD}.Release|x86.Build.0 = Release|Win32
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.AuditMode|x64.ActiveCfg = Release|x64
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Debug|ARM64.Build.0 = Debug|ARM64
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Debug|x64.ActiveCfg = Debug|x64
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Debug|x64.Build.0 = Debug|x64
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Debug|x86.ActiveCfg = Debug|Win32
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Debug|x86.Build.0 = Debug|Win32
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|Any CPU.ActiveCfg = Release|Win32
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|ARM64.ActiveCfg = Release|ARM64
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|ARM64.Build.0 = Release|ARM64
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|x64.ActiveCfg = Release|x64
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|x64.Build.0 = Release|x64
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|x86.ActiveCfg = Release|Win32
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1559,9 +1493,6 @@ Global
 		{53DD5520-E64C-4C06-B472-7CE62CA539C9} = {04170EEF-983A-4195-BFEF-2321E5E38A1E}
 		{6B5A44ED-918D-4747-BFB1-2472A1FCA173} = {04170EEF-983A-4195-BFEF-2321E5E38A1E}
 		{D3EF7B96-CD5E-47C9-B9A9-136259563033} = {04170EEF-983A-4195-BFEF-2321E5E38A1E}
-		{95B136F9-B238-490C-A7C5-5843C1FECAC4} = {05500DEF-2294-41E3-AF9A-24E580B82836}
-		{024052DE-83FB-4653-AEA4-90790D29D5BD} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
-		{067F0A06-FCB7-472C-96E9-B03B54E8E18D} = {59840756-302F-44DF-AA47-441A9D673202}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3140B1B7-C8EE-43D1-A772-D82A7061A271}

README.md

@@ -17,15 +17,7 @@ Related repositories include:
 
 > 👉 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. 
-
-This is our preferred method.
-
-### Other install methods
-
-#### Via GitHub
+### Manually installing builds from this repository
 
 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).
 
@@ -34,7 +26,7 @@ For users who are unable to install Terminal from the Microsoft Store, Terminal
 > * 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 Chocolatey (unofficial)
+### Install via Chocolatey (unofficial)
 
 [Chocolatey](https://chocolatey.org) users can download and install the latest Terminal release by installing the `microsoft-windows-terminal` package:
 
@@ -227,4 +219,3 @@ For more information see the [Code of Conduct FAQ][conduct-FAQ] or contact [open
 [conduct-code]: https://opensource.microsoft.com/codeofconduct/
 [conduct-FAQ]: https://opensource.microsoft.com/codeofconduct/faq/
 [conduct-email]: mailto:opencode@microsoft.com
-[store-install-link]: https://aka.ms/windowsterminal

build/pipelines/templates/check-formatting.yml

@@ -6,7 +6,6 @@ jobs:
 
   steps:
   - checkout: self
-    fetchDepth: 1
     submodules: false
     clean: true
 

consolegit2gitfilters.json

@@ -17,11 +17,7 @@
     "/src/winconpty/",
     "/.nuget/",
     "/.github/",
-    "/samples/",
-    "/res/terminal/",
-    "/doc/specs/",
-    "/doc/cascadia/",
-    "/doc/user-docs/"
+    "/samples/"
   ],
   "SuffixFilters": [
     ".dbb",

custom.props

@@ -5,7 +5,7 @@
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
     <XesBaseYearForStoreVersion>2020</XesBaseYearForStoreVersion>
     <VersionMajor>0</VersionMajor>
-    <VersionMinor>11</VersionMinor>
+    <VersionMinor>10</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
   </PropertyGroup>
 </Project>

dep/dynamic_bitset/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Maxime Pinard
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

dep/dynamic_bitset/MAINTAINER_README.md

@@ -1,17 +0,0 @@
-### Notes for Future Maintainers
-
-This was originally imported by @miniksa in March 2020.
-
-The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
-Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropiate governance standards.
-
-## What should be done to update this in the future?
-
-1. Go to pinam45/dynamic_bitset repository on GitHub.
-2. Take the entire contents of the include directory wholesale and drop it in the root directory here.
-3. Don't change anything about it.
-4. Validate that the license in the root of the repository didn't change and update it if so. It is sitting in the same directory as this readme. 
-   If it changed dramatically, ensure that it is still compatible with our license scheme. Also update the NOTICE file in the root of our repository to declare the third-party usage.
-5. Submit the pull.
-

dep/dynamic_bitset/cgmanifest.json

@@ -1,13 +0,0 @@
-{"Registrations":[ 
-    {
-      "component": { 
-       "type": "git", 
-       "git": { 
-         "repositoryUrl": "https://github.com/pinam45/dynamic_bitset", 
-         "commitHash": "00f2d066ce9deebf28b006636150e5a882beb83f" 
-         }
-       }
-    }
- ],
- "Version": 1
-}

dep/libpopcnt/LICENSE

@@ -1,26 +0,0 @@
-BSD 2-Clause License
-
-Copyright (c) 2016 - 2019, Kim Walisch
-Copyright (c) 2016 - 2019, Wojciech Muła
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

dep/libpopcnt/MAINTAINER_README.md

@@ -1,17 +0,0 @@
-### Notes for Future Maintainers
-
-This was originally imported by @miniksa in March 2020.
-
-The provenance information (where it came from and which commit) is stored in the file `cgmanifest.json` in the same directory as this readme.
-Please update the provenance information in that file when ingesting an updated version of the dependent library.
-That provenance file is automatically read and inventoried by Microsoft systems to ensure compliance with appropiate governance standards.
-
-## What should be done to update this in the future?
-
-1. Go to kimwalisch/libpopcnt repository on GitHub.
-2. Take the `libpopcnt.h` file.
-3. Don't change anything about it.
-4. Validate that the `LICENSE` in the root of the repository didn't change and update it if so. It is sitting in the same directory as this readme. 
-   If it changed dramatically, ensure that it is still compatible with our license scheme. Also update the NOTICE file in the root of our repository to declare the third-party usage.
-5. Submit the pull.
-

dep/libpopcnt/cgmanifest.json

@@ -1,13 +0,0 @@
-{"Registrations":[ 
-    {
-      "component": { 
-       "type": "git", 
-       "git": { 
-         "repositoryUrl": "https://github.com/kimwalisch/libpopcnt", 
-         "commitHash": "043a99fba31121a70bcb2f589faa17f534ae6085" 
-         }
-       }
-    }
- ],
- "Version": 1
-}

dep/libpopcnt/libpopcnt.h

@@ -1,841 +0,0 @@
-/*
- * libpopcnt.h - C/C++ library for counting the number of 1 bits (bit
- * population count) in an array as quickly as possible using
- * specialized CPU instructions i.e. POPCNT, AVX2, AVX512, NEON.
- *
- * Copyright (c) 2016 - 2019, Kim Walisch
- * Copyright (c) 2016 - 2018, Wojciech Muła
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef LIBPOPCNT_H
-#define LIBPOPCNT_H
-
-#include <stdint.h>
-
-#ifndef __has_builtin
-  #define __has_builtin(x) 0
-#endif
-
-#ifndef __has_attribute
-  #define __has_attribute(x) 0
-#endif
-
-#ifdef __GNUC__
-  #define GNUC_PREREQ(x, y) \
-      (__GNUC__ > x || (__GNUC__ == x && __GNUC_MINOR__ >= y))
-#else
-  #define GNUC_PREREQ(x, y) 0
-#endif
-
-#ifdef __clang__
-  #define CLANG_PREREQ(x, y) \
-      (__clang_major__ > x || (__clang_major__ == x && __clang_minor__ >= y))
-#else
-  #define CLANG_PREREQ(x, y) 0
-#endif
-
-#if (_MSC_VER < 1900) && \
-    !defined(__cplusplus)
-  #define inline __inline
-#endif
-
-#if (defined(__i386__) || \
-     defined(__x86_64__) || \
-     defined(_M_IX86) || \
-     defined(_M_X64))
-  #define X86_OR_X64
-#endif
-
-#if defined(X86_OR_X64) && \
-   (defined(__cplusplus) || \
-    defined(_MSC_VER) || \
-   (GNUC_PREREQ(4, 2) || \
-    __has_builtin(__sync_val_compare_and_swap)))
-  #define HAVE_CPUID
-#endif
-
-#if GNUC_PREREQ(4, 2) || \
-    __has_builtin(__builtin_popcount)
-  #define HAVE_BUILTIN_POPCOUNT
-#endif
-
-#if GNUC_PREREQ(4, 2) || \
-    CLANG_PREREQ(3, 0)
-  #define HAVE_ASM_POPCNT
-#endif
-
-#if defined(HAVE_CPUID) && \
-   (defined(HAVE_ASM_POPCNT) || \
-    defined(_MSC_VER))
-  #define HAVE_POPCNT
-#endif
-
-#if defined(HAVE_CPUID) && \
-    GNUC_PREREQ(4, 9)
-  #define HAVE_AVX2
-#endif
-
-#if defined(HAVE_CPUID) && \
-    GNUC_PREREQ(5, 0)
-  #define HAVE_AVX512
-#endif
-
-#if defined(HAVE_CPUID) && \
-    defined(_MSC_VER) && \
-    defined(__AVX2__)
-  #define HAVE_AVX2
-#endif
-
-#if defined(HAVE_CPUID) && \
-    defined(_MSC_VER) && \
-    defined(__AVX512__)
-  #define HAVE_AVX512
-#endif
-
-#if defined(HAVE_CPUID) && \
-    CLANG_PREREQ(3, 8) && \
-    __has_attribute(target) && \
-   (!defined(_MSC_VER) || defined(__AVX2__)) && \
-   (!defined(__apple_build_version__) || __apple_build_version__ >= 8000000)
-  #define HAVE_AVX2
-  #define HAVE_AVX512
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * This uses fewer arithmetic operations than any other known
- * implementation on machines with fast multiplication.
- * It uses 12 arithmetic operations, one of which is a multiply.
- * http://en.wikipedia.org/wiki/Hamming_weight#Efficient_implementation
- */
-static inline uint64_t popcount64(uint64_t x)
-{
-  uint64_t m1 = 0x5555555555555555ll;
-  uint64_t m2 = 0x3333333333333333ll;
-  uint64_t m4 = 0x0F0F0F0F0F0F0F0Fll;
-  uint64_t h01 = 0x0101010101010101ll;
-
-  x -= (x >> 1) & m1;
-  x = (x & m2) + ((x >> 2) & m2);
-  x = (x + (x >> 4)) & m4;
-
-  return (x * h01) >> 56;
-}
-
-#if defined(HAVE_ASM_POPCNT) && \
-    defined(__x86_64__)
-
-static inline uint64_t popcnt64(uint64_t x)
-{
-  __asm__ ("popcnt %1, %0" : "=r" (x) : "0" (x));
-  return x;
-}
-
-#elif defined(HAVE_ASM_POPCNT) && \
-      defined(__i386__)
-
-static inline uint32_t popcnt32(uint32_t x)
-{
-  __asm__ ("popcnt %1, %0" : "=r" (x) : "0" (x));
-  return x;
-}
-
-static inline uint64_t popcnt64(uint64_t x)
-{
-  return popcnt32((uint32_t) x) +
-         popcnt32((uint32_t)(x >> 32));
-}
-
-#elif defined(_MSC_VER) && \
-      defined(_M_X64)
-
-#include <nmmintrin.h>
-
-static inline uint64_t popcnt64(uint64_t x)
-{
-  return _mm_popcnt_u64(x);
-}
-
-#elif defined(_MSC_VER) && \
-      defined(_M_IX86)
-
-#include <nmmintrin.h>
-
-static inline uint64_t popcnt64(uint64_t x)
-{
-  return _mm_popcnt_u32((uint32_t) x) + 
-         _mm_popcnt_u32((uint32_t)(x >> 32));
-}
-
-/* non x86 CPUs */
-#elif defined(HAVE_BUILTIN_POPCOUNT)
-
-static inline uint64_t popcnt64(uint64_t x)
-{
-  return __builtin_popcountll(x);
-}
-
-/* no hardware POPCNT,
- * use pure integer algorithm */
-#else
-
-static inline uint64_t popcnt64(uint64_t x)
-{
-  return popcount64(x);
-}
-
-#endif
-
-static inline uint64_t popcnt64_unrolled(const uint64_t* data, uint64_t size)
-{
-  uint64_t i = 0;
-  uint64_t limit = size - size % 4;
-  uint64_t cnt = 0;
-
-  for (; i < limit; i += 4)
-  {
-    cnt += popcnt64(data[i+0]);
-    cnt += popcnt64(data[i+1]);
-    cnt += popcnt64(data[i+2]);
-    cnt += popcnt64(data[i+3]);
-  }
-
-  for (; i < size; i++)
-    cnt += popcnt64(data[i]);
-
-  return cnt;
-}
-
-#if defined(HAVE_CPUID)
-
-#if defined(_MSC_VER)
-  #include <intrin.h>
-  #include <immintrin.h>
-#endif
-
-/* %ecx bit flags */
-#define bit_POPCNT (1 << 23)
-
-/* %ebx bit flags */
-#define bit_AVX2   (1 << 5)
-#define bit_AVX512 (1 << 30)
-
-/* xgetbv bit flags */
-#define XSTATE_SSE (1 << 1)
-#define XSTATE_YMM (1 << 2)
-#define XSTATE_ZMM (7 << 5)
-
-static inline void run_cpuid(int eax, int ecx, int* abcd)
-{
-#if defined(_MSC_VER)
-  __cpuidex(abcd, eax, ecx);
-#else
-  int ebx = 0;
-  int edx = 0;
-
-  #if defined(__i386__) && \
-      defined(__PIC__)
-    /* in case of PIC under 32-bit EBX cannot be clobbered */
-    __asm__ ("movl %%ebx, %%edi;"
-             "cpuid;"
-             "xchgl %%ebx, %%edi;"
-             : "=D" (ebx),
-               "+a" (eax),
-               "+c" (ecx),
-               "=d" (edx));
-  #else
-    __asm__ ("cpuid;"
-             : "+b" (ebx),
-               "+a" (eax),
-               "+c" (ecx),
-               "=d" (edx));
-  #endif
-
-  abcd[0] = eax;
-  abcd[1] = ebx;
-  abcd[2] = ecx;
-  abcd[3] = edx;
-#endif
-}
-
-#if defined(HAVE_AVX2) || \
-    defined(HAVE_AVX512)
-
-static inline int get_xcr0()
-{
-  int xcr0;
-
-#if defined(_MSC_VER)
-  xcr0 = (int) _xgetbv(0);
-#else
-  __asm__ ("xgetbv" : "=a" (xcr0) : "c" (0) : "%edx" );
-#endif
-
-  return xcr0;
-}
-
-#endif
-
-static inline int get_cpuid()
-{
-  int flags = 0;
-  int abcd[4];
-
-  run_cpuid(1, 0, abcd);
-
-  if ((abcd[2] & bit_POPCNT) == bit_POPCNT)
-    flags |= bit_POPCNT;
-
-#if defined(HAVE_AVX2) || \
-    defined(HAVE_AVX512)
-
-  int osxsave_mask = (1 << 27);
-
-  /* ensure OS supports extended processor state management */
-  if ((abcd[2] & osxsave_mask) != osxsave_mask)
-    return 0;
-
-  int ymm_mask = XSTATE_SSE | XSTATE_YMM;
-  int zmm_mask = XSTATE_SSE | XSTATE_YMM | XSTATE_ZMM;
-
-  int xcr0 = get_xcr0();
-
-  if ((xcr0 & ymm_mask) == ymm_mask)
-  {
-    run_cpuid(7, 0, abcd);
-
-    if ((abcd[1] & bit_AVX2) == bit_AVX2)
-      flags |= bit_AVX2;
-
-    if ((xcr0 & zmm_mask) == zmm_mask)
-    {
-      if ((abcd[1] & bit_AVX512) == bit_AVX512)
-        flags |= bit_AVX512;
-    }
-  }
-
-#endif
-
-  return flags;
-}
-
-#endif /* cpuid */
-
-#if defined(HAVE_AVX2)
-
-#include <immintrin.h>
-
-#if !defined(_MSC_VER)
-  __attribute__ ((target ("avx2")))
-#endif
-static inline void CSA256(__m256i* h, __m256i* l, __m256i a, __m256i b, __m256i c)
-{
-  __m256i u = _mm256_xor_si256(a, b);
-  *h = _mm256_or_si256(_mm256_and_si256(a, b), _mm256_and_si256(u, c));
-  *l = _mm256_xor_si256(u, c);
-}
-
-#if !defined(_MSC_VER)
-  __attribute__ ((target ("avx2")))
-#endif
-static inline __m256i popcnt256(__m256i v)
-{
-  __m256i lookup1 = _mm256_setr_epi8(
-      4, 5, 5, 6, 5, 6, 6, 7,
-      5, 6, 6, 7, 6, 7, 7, 8,
-      4, 5, 5, 6, 5, 6, 6, 7,
-      5, 6, 6, 7, 6, 7, 7, 8
-  );
-
-  __m256i lookup2 = _mm256_setr_epi8(
-      4, 3, 3, 2, 3, 2, 2, 1,
-      3, 2, 2, 1, 2, 1, 1, 0,
-      4, 3, 3, 2, 3, 2, 2, 1,
-      3, 2, 2, 1, 2, 1, 1, 0
-  );
-
-  __m256i low_mask = _mm256_set1_epi8(0x0f);
-  __m256i lo = _mm256_and_si256(v, low_mask);
-  __m256i hi = _mm256_and_si256(_mm256_srli_epi16(v, 4), low_mask);
-  __m256i popcnt1 = _mm256_shuffle_epi8(lookup1, lo);
-  __m256i popcnt2 = _mm256_shuffle_epi8(lookup2, hi);
-
-  return _mm256_sad_epu8(popcnt1, popcnt2);
-}
-
-/*
- * AVX2 Harley-Seal popcount (4th iteration).
- * The algorithm is based on the paper "Faster Population Counts
- * using AVX2 Instructions" by Daniel Lemire, Nathan Kurz and
- * Wojciech Mula (23 Nov 2016).
- * @see https://arxiv.org/abs/1611.07612
- */
-#if !defined(_MSC_VER)
-  __attribute__ ((target ("avx2")))
-#endif
-static inline uint64_t popcnt_avx2(const __m256i* data, uint64_t size)
-{
-  __m256i cnt = _mm256_setzero_si256();
-  __m256i ones = _mm256_setzero_si256();
-  __m256i twos = _mm256_setzero_si256();
-  __m256i fours = _mm256_setzero_si256();
-  __m256i eights = _mm256_setzero_si256();
-  __m256i sixteens = _mm256_setzero_si256();
-  __m256i twosA, twosB, foursA, foursB, eightsA, eightsB;
-
-  uint64_t i = 0;
-  uint64_t limit = size - size % 16;
-  uint64_t* cnt64;
-
-  for(; i < limit; i += 16)
-  {
-    CSA256(&twosA, &ones, ones, data[i+0], data[i+1]);
-    CSA256(&twosB, &ones, ones, data[i+2], data[i+3]);
-    CSA256(&foursA, &twos, twos, twosA, twosB);
-    CSA256(&twosA, &ones, ones, data[i+4], data[i+5]);
-    CSA256(&twosB, &ones, ones, data[i+6], data[i+7]);
-    CSA256(&foursB, &twos, twos, twosA, twosB);
-    CSA256(&eightsA, &fours, fours, foursA, foursB);
-    CSA256(&twosA, &ones, ones, data[i+8], data[i+9]);
-    CSA256(&twosB, &ones, ones, data[i+10], data[i+11]);
-    CSA256(&foursA, &twos, twos, twosA, twosB);
-    CSA256(&twosA, &ones, ones, data[i+12], data[i+13]);
-    CSA256(&twosB, &ones, ones, data[i+14], data[i+15]);
-    CSA256(&foursB, &twos, twos, twosA, twosB);
-    CSA256(&eightsB, &fours, fours, foursA, foursB);
-    CSA256(&sixteens, &eights, eights, eightsA, eightsB);
-
-    cnt = _mm256_add_epi64(cnt, popcnt256(sixteens));
-  }
-
-  cnt = _mm256_slli_epi64(cnt, 4);
-  cnt = _mm256_add_epi64(cnt, _mm256_slli_epi64(popcnt256(eights), 3));
-  cnt = _mm256_add_epi64(cnt, _mm256_slli_epi64(popcnt256(fours), 2));
-  cnt = _mm256_add_epi64(cnt, _mm256_slli_epi64(popcnt256(twos), 1));
-  cnt = _mm256_add_epi64(cnt, popcnt256(ones));
-
-  for(; i < size; i++)
-    cnt = _mm256_add_epi64(cnt, popcnt256(data[i]));
-
-  cnt64 = (uint64_t*) &cnt;
-
-  return cnt64[0] +
-         cnt64[1] +
-         cnt64[2] +
-         cnt64[3];
-}
-
-/* Align memory to 32 bytes boundary */
-static inline void align_avx2(const uint8_t** p, uint64_t* size, uint64_t* cnt)
-{
-  for (; (uintptr_t) *p % 8; (*p)++)
-  {
-    *cnt += popcnt64(**p);
-    *size -= 1;
-  }
-  for (; (uintptr_t) *p % 32; (*p) += 8)
-  {
-    *cnt += popcnt64(
-        *(const uint64_t*) *p);
-    *size -= 8;
-  }
-}
-
-#endif
-
-#if defined(HAVE_AVX512)
-
-#include <immintrin.h>
-
-#if !defined(_MSC_VER)
-  __attribute__ ((target ("avx512bw")))
-#endif
-static inline __m512i popcnt512(__m512i v)
-{
-  __m512i m1 = _mm512_set1_epi8(0x55);
-  __m512i m2 = _mm512_set1_epi8(0x33);
-  __m512i m4 = _mm512_set1_epi8(0x0F);
-  __m512i t1 = _mm512_sub_epi8(v, (_mm512_srli_epi16(v, 1) & m1));
-  __m512i t2 = _mm512_add_epi8(t1 & m2, (_mm512_srli_epi16(t1, 2) & m2));
-  __m512i t3 = _mm512_add_epi8(t2, _mm512_srli_epi16(t2, 4)) & m4;
-
-  return _mm512_sad_epu8(t3, _mm512_setzero_si512());
-}
-
-#if !defined(_MSC_VER)
-  __attribute__ ((target ("avx512bw")))
-#endif
-static inline void CSA512(__m512i* h, __m512i* l, __m512i a, __m512i b, __m512i c)
-{
-  *l = _mm512_ternarylogic_epi32(c, b, a, 0x96);
-  *h = _mm512_ternarylogic_epi32(c, b, a, 0xe8);
-}
-
-/*
- * AVX512 Harley-Seal popcount (4th iteration).
- * The algorithm is based on the paper "Faster Population Counts
- * using AVX2 Instructions" by Daniel Lemire, Nathan Kurz and
- * Wojciech Mula (23 Nov 2016).
- * @see https://arxiv.org/abs/1611.07612
- */
-#if !defined(_MSC_VER)
-  __attribute__ ((target ("avx512bw")))
-#endif
-static inline uint64_t popcnt_avx512(const __m512i* data, const uint64_t size)
-{
-  __m512i cnt = _mm512_setzero_si512();
-  __m512i ones = _mm512_setzero_si512();
-  __m512i twos = _mm512_setzero_si512();
-  __m512i fours = _mm512_setzero_si512();
-  __m512i eights = _mm512_setzero_si512();
-  __m512i sixteens = _mm512_setzero_si512();
-  __m512i twosA, twosB, foursA, foursB, eightsA, eightsB;
-
-  uint64_t i = 0;
-  uint64_t limit = size - size % 16;
-  uint64_t* cnt64;
-
-  for(; i < limit; i += 16)
-  {
-    CSA512(&twosA, &ones, ones, data[i+0], data[i+1]);
-    CSA512(&twosB, &ones, ones, data[i+2], data[i+3]);
-    CSA512(&foursA, &twos, twos, twosA, twosB);
-    CSA512(&twosA, &ones, ones, data[i+4], data[i+5]);
-    CSA512(&twosB, &ones, ones, data[i+6], data[i+7]);
-    CSA512(&foursB, &twos, twos, twosA, twosB);
-    CSA512(&eightsA, &fours, fours, foursA, foursB);
-    CSA512(&twosA, &ones, ones, data[i+8], data[i+9]);
-    CSA512(&twosB, &ones, ones, data[i+10], data[i+11]);
-    CSA512(&foursA, &twos, twos, twosA, twosB);
-    CSA512(&twosA, &ones, ones, data[i+12], data[i+13]);
-    CSA512(&twosB, &ones, ones, data[i+14], data[i+15]);
-    CSA512(&foursB, &twos, twos, twosA, twosB);
-    CSA512(&eightsB, &fours, fours, foursA, foursB);
-    CSA512(&sixteens, &eights, eights, eightsA, eightsB);
-
-    cnt = _mm512_add_epi64(cnt, popcnt512(sixteens));
-  }
-
-  cnt = _mm512_slli_epi64(cnt, 4);
-  cnt = _mm512_add_epi64(cnt, _mm512_slli_epi64(popcnt512(eights), 3));
-  cnt = _mm512_add_epi64(cnt, _mm512_slli_epi64(popcnt512(fours), 2));
-  cnt = _mm512_add_epi64(cnt, _mm512_slli_epi64(popcnt512(twos), 1));
-  cnt = _mm512_add_epi64(cnt, popcnt512(ones));
-
-  for(; i < size; i++)
-    cnt = _mm512_add_epi64(cnt, popcnt512(data[i]));
-
-  cnt64 = (uint64_t*) &cnt;
-
-  return cnt64[0] +
-         cnt64[1] +
-         cnt64[2] +
-         cnt64[3] +
-         cnt64[4] +
-         cnt64[5] +
-         cnt64[6] +
-         cnt64[7];
-}
-
-/* Align memory to 64 bytes boundary */
-static inline void align_avx512(const uint8_t** p, uint64_t* size, uint64_t* cnt)
-{
-  for (; (uintptr_t) *p % 8; (*p)++)
-  {
-    *cnt += popcnt64(**p);
-    *size -= 1;
-  }
-  for (; (uintptr_t) *p % 64; (*p) += 8)
-  {
-    *cnt += popcnt64(
-        *(const uint64_t*) *p);
-    *size -= 8;
-  }
-}
-
-#endif
-
-/* x86 CPUs */
-#if defined(X86_OR_X64)
-
-/* Align memory to 8 bytes boundary */
-static inline void align_8(const uint8_t** p, uint64_t* size, uint64_t* cnt)
-{
-  for (; *size > 0 && (uintptr_t) *p % 8; (*p)++)
-  {
-    *cnt += popcount64(**p);
-    *size -= 1;
-  }
-}
-
-static inline uint64_t popcount64_unrolled(const uint64_t* data, uint64_t size)
-{
-  uint64_t i = 0;
-  uint64_t limit = size - size % 4;
-  uint64_t cnt = 0;
-
-  for (; i < limit; i += 4)
-  {
-    cnt += popcount64(data[i+0]);
-    cnt += popcount64(data[i+1]);
-    cnt += popcount64(data[i+2]);
-    cnt += popcount64(data[i+3]);
-  }
-
-  for (; i < size; i++)
-    cnt += popcount64(data[i]);
-
-  return cnt;
-}
-
-/*
- * Count the number of 1 bits in the data array
- * @data: An array
- * @size: Size of data in bytes
- */
-static inline uint64_t popcnt(const void* data, uint64_t size)
-{
-  const uint8_t* ptr = (const uint8_t*) data;
-  uint64_t cnt = 0;
-  uint64_t i;
-
-#if defined(HAVE_CPUID)
-  #if defined(__cplusplus)
-    /* C++11 thread-safe singleton */
-    static const int cpuid = get_cpuid();
-  #else
-    static int cpuid_ = -1;
-    int cpuid = cpuid_;
-    if (cpuid == -1)
-    {
-      cpuid = get_cpuid();
-
-      #if defined(_MSC_VER)
-        _InterlockedCompareExchange(&cpuid_, cpuid, -1);
-      #else
-        __sync_val_compare_and_swap(&cpuid_, -1, cpuid);
-      #endif
-    }
-  #endif
-#endif
-
-#if defined(HAVE_AVX512)
-
-  /* AVX512 requires arrays >= 1024 bytes */
-  if ((cpuid & bit_AVX512) &&
-      size >= 1024)
-  {
-    align_avx512(&ptr, &size, &cnt);
-    cnt += popcnt_avx512((const __m512i*) ptr, size / 64);
-    ptr += size - size % 64;
-    size = size % 64;
-  }
-
-#endif
-
-#if defined(HAVE_AVX2)
-
-  /* AVX2 requires arrays >= 512 bytes */
-  if ((cpuid & bit_AVX2) &&
-      size >= 512)
-  {
-    align_avx2(&ptr, &size, &cnt);
-    cnt += popcnt_avx2((const __m256i*) ptr, size / 32);
-    ptr += size - size % 32;
-    size = size % 32;
-  }
-
-#endif
-
-#if defined(HAVE_POPCNT)
-
-  if (cpuid & bit_POPCNT)
-  {
-    cnt += popcnt64_unrolled((const uint64_t*) ptr, size / 8);
-    ptr += size - size % 8;
-    size = size % 8;
-    for (i = 0; i < size; i++)
-      cnt += popcnt64(ptr[i]);
-
-    return cnt;
-  }
-
-#endif
-
-  /* pure integer popcount algorithm */
-  if (size >= 8)
-  {
-    align_8(&ptr, &size, &cnt);
-    cnt += popcount64_unrolled((const uint64_t*) ptr, size / 8);
-    ptr += size - size % 8;
-    size = size % 8;
-  }
-
-  /* pure integer popcount algorithm */
-  for (i = 0; i < size; i++)
-    cnt += popcount64(ptr[i]);
-
-  return cnt;
-}
-
-#elif defined(__ARM_NEON) || \
-      defined(__aarch64__)
-
-#include <arm_neon.h>
-
-/* Align memory to 8 bytes boundary */
-static inline void align_8(const uint8_t** p, uint64_t* size, uint64_t* cnt)
-{
-  for (; *size > 0 && (uintptr_t) *p % 8; (*p)++)
-  {
-    *cnt += popcnt64(**p);
-    *size -= 1;
-  }
-}
-
-static inline uint64x2_t vpadalq(uint64x2_t sum, uint8x16_t t)
-{
-  return vpadalq_u32(sum, vpaddlq_u16(vpaddlq_u8(t)));
-}
-
-/*
- * Count the number of 1 bits in the data array
- * @data: An array
- * @size: Size of data in bytes
- */
-static inline uint64_t popcnt(const void* data, uint64_t size)
-{
-  uint64_t cnt = 0;
-  uint64_t chunk_size = 64;
-  const uint8_t* ptr = (const uint8_t*) data;
-
-  if (size >= chunk_size)
-  {
-    uint64_t i = 0;
-    uint64_t iters = size / chunk_size;
-    uint64x2_t sum = vcombine_u64(vcreate_u64(0), vcreate_u64(0));
-    uint8x16_t zero = vcombine_u8(vcreate_u8(0), vcreate_u8(0));
-
-    do
-    {
-      uint8x16_t t0 = zero;
-      uint8x16_t t1 = zero;
-      uint8x16_t t2 = zero;
-      uint8x16_t t3 = zero;
-
-      /*
-       * After every 31 iterations we need to add the
-       * temporary sums (t0, t1, t2, t3) to the total sum.
-       * We must ensure that the temporary sums <= 255
-       * and 31 * 8 bits = 248 which is OK.
-       */
-      uint64_t limit = (i + 31 < iters) ? i + 31 : iters;
-  
-      /* Each iteration processes 64 bytes */
-      for (; i < limit; i++)
-      {
-        uint8x16x4_t input = vld4q_u8(ptr);
-        ptr += chunk_size;
-
-        t0 = vaddq_u8(t0, vcntq_u8(input.val[0]));
-        t1 = vaddq_u8(t1, vcntq_u8(input.val[1]));
-        t2 = vaddq_u8(t2, vcntq_u8(input.val[2]));
-        t3 = vaddq_u8(t3, vcntq_u8(input.val[3]));
-      }
-
-      sum = vpadalq(sum, t0);
-      sum = vpadalq(sum, t1);
-      sum = vpadalq(sum, t2);
-      sum = vpadalq(sum, t3);
-    }
-    while (i < iters);
-
-    uint64_t tmp[2];
-    vst1q_u64(tmp, sum);
-    cnt += tmp[0];
-    cnt += tmp[1];
-  }
-
-  size %= chunk_size;
-  align_8(&ptr, &size, &cnt);
-  const uint64_t* ptr64 = (const uint64_t*) ptr;
-  uint64_t iters = size / 8;
-
-  for (uint64_t i = 0; i < iters; i++)
-    cnt += popcnt64(ptr64[i]);
-
-  ptr += size - size % 8;
-  size = size % 8;
-
-  for (uint64_t i = 0; i < size; i++)
-    cnt += popcnt64(ptr[i]);
-
-  return cnt;
-}
-
-/* all other CPUs */
-#else
-
-/* Align memory to 8 bytes boundary */
-static inline void align_8(const uint8_t** p, uint64_t* size, uint64_t* cnt)
-{
-  for (; *size > 0 && (uintptr_t) *p % 8; (*p)++)
-  {
-    *cnt += popcnt64(**p);
-    *size -= 1;
-  }
-}
-
-/*
- * Count the number of 1 bits in the data array
- * @data: An array
- * @size: Size of data in bytes
- */
-static inline uint64_t popcnt(const void* data, uint64_t size)
-{
-  const uint8_t* ptr = (const uint8_t*) data;
-  uint64_t cnt = 0;
-  uint64_t i;
-
-  align_8(&ptr, &size, &cnt);
-  cnt += popcnt64_unrolled((const uint64_t*) ptr, size / 8);
-  ptr += size - size % 8;
-  size = size % 8;
-  for (i = 0; i < size; i++)
-    cnt += popcnt64(ptr[i]);
-
-  return cnt;
-}
-
-#endif
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* LIBPOPCNT_H */

doc/building.md

@@ -1,38 +1,13 @@
 
-# How to build OpenConsole
+# How to build Openconsole
 
-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 can be built with Visual Studio or from the command line. There are build scripts for both cmd and PowerShell in /tools.
 
 When using Visual Studio, be sure to set up the path for code formatting. This can be done in Visual Studio by going to Tools > Options > Text Editor > C++ > Formatting and checking "Use custom clang-format.exe file" and choosing the clang-format.exe in the repository at /dep/llvm/clang-format.exe by clicking "browse" right under the check box.
 
-### Building in PowerShell
+## Building with cmd
 
-```powershell
-Import-Module .\tools\OpenConsole.psm1
-Set-MsBuildDevEnvironment
-Invoke-OpenConsoleBuild
-```
-
-There are a few additional exported functions (look at their documentation for further details):
-
-- `Invoke-OpenConsoleBuild` - builds the solution. Can be passed msbuild arguments.
-- `Invoke-OpenConsoleTests` - runs the various tests. Will run the unit tests by default.
-- `Start-OpenConsole` - starts Openconsole.exe from the output directory. x64 is run by default.
-- `Debug-OpenConsole` - starts Openconsole.exe and attaches it to the default debugger. x64 is run by default.
-- `Invoke-CodeFormat` - uses clang-format to format all c++ files to match our coding style.
-
-### Building in Cmd
-
-```shell
-.\tools\razzle.cmd
-bcz
-```
+The cmd scripts are set up to emulate a portion of the OS razzle build environment. razzle.cmd is the first script that should be run. bcz.cmd will build clean and bz.cmd should build incrementally.
 
 There are also scripts for running the tests:
 - `runut.cmd` - run the unit tests
@@ -40,13 +15,15 @@ There are also scripts for running the tests:
 - `runuia.cmd` - run the UIA tests
 - `runformat` - uses clang-format to format all c++ files to match our coding style.
 
-## Running & Debugging
+## Build with Powershell
 
-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".
+Openconsole.psm1 should be loaded with `Import-Module`. From there `Set-MsbuildDevEnvironment` will set up environment variables required to build. There are a few exported functions (look at their documentation for further details):
 
-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)
+- `Invoke-OpenConsolebuild` - builds the solution. Can be passed msbuild arguments.
+- `Invoke-OpenConsoleTests` - runs the various tests. Will run the unit tests by default.
+- `Start-OpenConsole` - starts Openconsole.exe from the output directory. x64 is run by default.
+- `Debug-OpenConsole` - starts Openconsole.exe and attaches it to the default debugger. x64 is run by default.
+- `Invoke-CodeFormat` - uses clang-format to format all c++ files to match our coding style.
 
 ## Configuration Types
 
@@ -57,27 +34,3 @@ Openconsole has three configuration types:
 - AuditMode
 
 AuditMode is an experimental mode that enables some additional static analysis from CppCoreCheck.
-
-## Updating Nuget package references
-Certain Nuget package references in this project, like `Microsoft.UI.Xaml`, must be updated outside of the Visual Studio NuGet package manager. This can be done using the snippet below.
-> Note that to run this snippet, you need to use WSL as the command uses `sed`.
-To update the version of a given package, use the following snippet
-
-`git grep -z -l $PackageName | xargs -0 sed -i -e 's/$OldVersionNumber/$NewVersionNumber/g'`
-
-where:
-- `$PackageName` is the name of the package, e.g. Microsoft.UI.Xaml
-- `$OldVersionNumber` is the version number currently used, e.g. 2.3.191217003-prerelease
-- `$NewVersionNumber` is the version number you want to migrate to, e.g. 2.4.200117003-prerelease
-
-Example usage:
-
-`git grep -z -l Microsoft.UI.Xaml | xargs -0 sed -i -e 's/2.3.191217003-prerelease/2.4.200117003-prerelease/g'`
-
-## Using .nupkg files instead of downloaded Nuget packages
-If you want to use .nupkg files instead of the downloaded Nuget package, you can do this with the following steps:
-
-1. Open the Nuget.config file and uncomment line 8 ("Static Package Dependencies")
-2. Create the folder /dep/packages
-3. Put your .nupkg files in /dep/packages
-4. If you are using different versions than those already being used, you need to update the references as well. How to do that is explained under "Updating Nuget package references".

doc/cascadia/SettingsSchema.md

@@ -29,7 +29,6 @@ Properties listed below are specific to each unique profile.
 | `guid` | _Required_ | String | | Unique identifier of the profile. Written in registry format: `"{00000000-0000-0000-0000-000000000000}"`. |
 | `name` | _Required_ | String | | Name of the profile. Displays in the dropdown menu. <br>Additionally, this value will be used as the "title" to pass to the shell on startup. Some shells (like `bash`) may choose to ignore this initial value, while others (`cmd`, `powershell`) may use this value over the lifetime of the application. This "title" behavior can be overridden by using `tabTitle`. |
 | `acrylicOpacity` | Optional | Number | `0.5` | When `useAcrylic` is set to `true`, it sets the transparency of the window for the profile. Accepts floating point values from 0-1. |
-| `antialiasingMode` | Optional | String | `"grayscale"` | Controls how text is antialiased in the renderer. Possible values are "grayscale", "cleartype" and "aliased". Note that changing this setting will require starting a new terminal instance. |
 | `background` | Optional | String | | Sets the background color of the profile. Overrides `background` set in color scheme if `colorscheme` is set. Uses hex color format: `"#rrggbb"`. |
 | `backgroundImage` | Optional | String | | Sets the file location of the Image to draw over the window background. |
 | `backgroundImageAlignment` | Optional | String | `center` | Sets how the background image aligns to the boundaries of the window. Possible values: `"center"`, `"left"`, `"top"`, `"right"`, `"bottom"`, `"topLeft"`, `"topRight"`, `"bottomLeft"`, `"bottomRight"` |
@@ -39,7 +38,7 @@ Properties listed below are specific to each unique profile.
 | `colorScheme` | Optional | String | `Campbell` | Name of the terminal color scheme to use. Color schemes are defined under `schemes`. |
 | `colorTable` | Optional | Array[String] | | Array of colors used in the profile if `colorscheme` is not set. Array follows the format defined in `schemes`. |
 | `commandline` | Optional | String | | Executable used in the profile. |
-| `cursorColor` | Optional | String | | Sets the cursor color of the profile. Overrides `cursorColor` set in color scheme if `colorscheme` is set. Uses hex color format: `"#rrggbb"`. |
+| `cursorColor` | Optional | String | `#FFFFFF` | Sets the cursor color for the profile. Uses hex color format: `"#rrggbb"`. |
 | `cursorHeight` | Optional | Integer | | Sets the percentage height of the cursor starting from the bottom. Only works when `cursorShape` is set to `"vintage"`. Accepts values from 25-100. |
 | `cursorShape` | Optional | String | `bar` | Sets the cursor shape for the profile. Possible values: `"vintage"` ( &#x2583; ), `"bar"` ( &#x2503; ), `"underscore"` ( &#x2581; ), `"filledBox"` ( &#x2588; ), `"emptyBox"` ( &#x25AF; ) |
 | `fontFace` | Optional | String | `Consolas` | Name of the font face used in the profile. We will try to fallback to Consolas if this can't be found or is invalid. |
@@ -68,7 +67,6 @@ Properties listed below are specific to each color scheme. [ColorTool](https://g
 | `foreground` | _Required_ | String | Sets the foreground color of the color scheme. |
 | `background` | _Required_ | String | Sets the background color of the color scheme. |
 | `selectionBackground` | Optional | String | Sets the selection background color of the color scheme. |
-| `cursorColor` | Optional | String | Sets the cursor color of the color scheme. |
 | `black` | _Required_ | String | Sets the color used as ANSI black. |
 | `blue` | _Required_ | String | Sets the color used as ANSI blue. |
 | `brightBlack` | _Required_ | String | Sets the color used as ANSI bright black. |
@@ -111,31 +109,31 @@ For commands with arguments:
 
 | Command | Command Description | Action (*=required) | Action Arguments | Argument Descriptions |
 | ------- | ------------------- | ------ | ---------------- | ----------------- |
-| `closePane` | Close the active pane. | | | |
-| `closeTab` | Close the current tab. | | | |
-| `closeWindow` | Close the current window and all tabs within it. | | | |
-| `copy` | Copy the selected terminal content to your Windows Clipboard. | `trimWhitespace` | boolean | When `true`, newlines persist from the selected text. When `false`, copied content will paste on one line. |
-| `decreaseFontSize` | Make the text smaller by one delta. | `delta` | integer | Amount of size decrease per command invocation. |
-| `duplicateTab` | Make a copy and open the current tab. | | | |
-| `find` | Open the search dialog box. | | | |
-| `increaseFontSize` | Make the text larger by one delta. | `delta` | integer | Amount of size increase per command invocation. |
-| `moveFocus` | Focus on a different pane depending on direction. | `direction`* | `left`, `right`, `up`, `down` | Direction in which the focus will move. |
-| `newTab` | Create a new tab. Without any arguments, this will open the default profile in a new tab. | 1. `commandLine`<br>2. `startingDirectory`<br>3. `tabTitle`<br>4. `index`<br>5. `profile` | 1. string<br>2. string<br>3. string<br>4. integer<br>5. string | 1. Executable run within the tab.<br>2. Directory in which the tab will open.<br>3. Title of the new tab.<br>4. Profile that will open based on its position in the dropdown (starting at 0).<br>5. Profile that will open based on its GUID or name. |
-| `nextTab` | Open the tab to the right of the current one. | | | |
-| `openNewTabDropdown` | Open the dropdown menu. | | | |
-| `openSettings` | Open the settings file. | | | |
-| `paste` | Insert the content that was copied onto the clipboard. | | | |
-| `prevTab` | Open the tab to the left of the current one. | | | |
-| `resetFontSize` | Reset the text size to the default value. | | | |
-| `resizePane` | Change the size of the active pane. | `direction`* | `left`, `right`, `up`, `down` | Direction in which the pane will be resized. |
-| `scrollDown` | Move the screen down. | | | |
-| `scrollUp` | Move the screen up. | | | |
-| `scrollUpPage` | Move the screen up a whole page. | | | |
-| `scrollDownPage` | Move the screen down a whole page. | | | |
-| `splitPane` | Halve the size of the active pane and open another. Without any arguments, this will open the default profile in the new pane. | 1. `split`*<br>2. `commandLine`<br>3. `startingDirectory`<br>4. `tabTitle`<br>5. `index`<br>6. `profile` | 1. `vertical`, `horizontal`, `auto`<br>2. string<br>3. string<br>4. string<br>5. integer<br>6. string | 1. How the pane will split. `auto` will split in the direction that provides the most surface area.<br>2. Executable run within the pane.<br>3. Directory in which the pane will open.<br>4. Title of the tab when the new pane is focused.<br>5. Profile that will open based on its position in the dropdown (starting at 0).<br>6. Profile that will open based on its GUID or name. |
-| `switchToTab` | Open a specific tab depending on index. | `index`* | integer | Tab that will open based on its position in the tab bar (starting at 0). |
-| `toggleFullscreen` | Switch between fullscreen and default window sizes. | | | |
-| `unbound` | Unbind the associated keys from any command. | | | |
+| closePane | Close the active pane. | | | |
+| closeTab | Close the current tab. | | | |
+| closeWindow | Close the current window and all tabs within it. | | | |
+| copy | Copy the selected terminal content to your Windows Clipboard. | `trimWhitespace` | boolean | When `true`, newlines persist from the selected text. When `false`, copied content will paste on one line. |
+| decreaseFontSize | Make the text smaller by one delta. | `delta` | integer | Amount of size decrease per command invocation. |
+| duplicateTab | Make a copy and open the current tab. | | | |
+| find | Open the search dialog box. | | | |
+| increaseFontSize | Make the text larger by one delta. | `delta` | integer | Amount of size increase per command invocation. |
+| moveFocus | Focus on a different pane depending on direction. | `direction`* | `left`, `right`, `up`, `down` | Direction in which the focus will move. |
+| newTab | Create a new tab. Without any arguments, this will open the default profile in a new tab. | 1. `commandLine`<br>2. `startingDirectory`<br>3. `tabTitle`<br>4. `index`<br>5. `profile` | 1. string<br>2. string<br>3. string<br>4. integer<br>5. string | 1. Executable run within the tab.<br>2. Directory in which the tab will open.<br>3. Title of the new tab.<br>4. Profile that will open based on its position in the dropdown (starting at 0).<br>5. Profile that will open based on its GUID or name. |
+| nextTab | Open the tab to the right of the current one. | | | |
+| openNewTabDropdown | Open the dropdown menu. | | | |
+| openSettings | Open the settings file. | | | |
+| paste | Insert the content that was copied onto the clipboard. | | | |
+| prevTab | Open the tab to the left of the current one. | | | |
+| resetFontSize | Reset the text size to the default value. | | | |
+| resizePane | Change the size of the active pane. | `direction`* | `left`, `right`, `up`, `down` | Direction in which the pane will be resized. |
+| scrollDown | Move the screen down. | | | |
+| scrollUp | Move the screen up. | | | |
+| scrollUpPage | Move the screen up a whole page. | | | |
+| scrollDownPage | Move the screen down a whole page. | | | |
+| splitPane | Halve the size of the active pane and open another. Without any arguments, this will open the default profile in the new pane. | 1. `split`*<br>2. `commandLine`<br>3. `startingDirectory`<br>4. `tabTitle`<br>5. `index`<br>6. `profile` | 1. `vertical`, `horizontal`, `auto`<br>2. string<br>3. string<br>4. string<br>5. integer<br>6. string | 1. How the pane will split. `auto` will split in the direction that provides the most surface area.<br>2. Executable run within the pane.<br>3. Directory in which the pane will open.<br>4. Title of the tab when the new pane is focused.<br>5. Profile that will open based on its position in the dropdown (starting at 0).<br>6. Profile that will open based on its GUID or name. |
+| switchToTab | Open a specific tab depending on index. | `index`* | integer | Tab that will open based on its position in the tab bar (starting at 0). |
+| toggleFullscreen | Switch between fullscreen and default window sizes. | | | |
+| unbound | Unbind the associated keys from any command. | | | |
 
 ### Accepted Modifiers and Keys
 

doc/cascadia/profiles.schema.json

@@ -3,11 +3,6 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Microsoft's Windows Terminal Settings Profile Schema'",
   "definitions": {
-    "KeyChordSegment": {
-      "pattern": "^(?<modifier>(ctrl|alt|shift)(?:\\+(ctrl|alt|shift)(?<!\\2))?(?:\\+(ctrl|alt|shift)(?<!\\2|\\3))?\\+)?(?<key>[^\\s+]|backspace|tab|enter|esc|escape|space|pgup|pageup|pgdn|pagedown|end|home|left|up|right|down|insert|delete|(?<!shift.+)(?:numpad_?[0-9]|numpad_(?:period|decimal))|numpad_(?:multiply|plus|add|minus|subtract|divide)|f[1-9]|f1[0-9]|f2[0-4]|plus)$",
-      "type": "string",
-      "description": "The string should fit the format \"[ctrl+][alt+][shift+]<keyName>\", where each modifier is optional, separated by + symbols, and keyName is either one of the names listed in the table below, or any single key character. The string should be written in full lowercase.\nbackspace\tBACKSPACE key\ntab\tTAB key\nenter\tENTER key\nesc, escape\tESC key\nspace\tSPACEBAR\npgup, pageup\tPAGE UP key\npgdn, pagedown\tPAGE DOWN key\nend\tEND key\nhome\tHOME key\nleft\tLEFT ARROW key\nup\tUP ARROW key\nright\tRIGHT ARROW key\ndown\tDOWN ARROW key\ninsert\tINS key\ndelete\tDEL key\nnumpad_0-numpad_9, numpad0-numpad9\tNumeric keypad keys 0 to 9. Can't be combined with the shift modifier.\nnumpad_multiply\tNumeric keypad MULTIPLY key (*)\nnumpad_plus, numpad_add\tNumeric keypad ADD key (+)\nnumpad_minus, numpad_subtract\tNumeric keypad SUBTRACT key (-)\nnumpad_period, numpad_decimal\tNumeric keypad DECIMAL key (.). Can't be combined with the shift modifier.\nnumpad_divide\tNumeric keypad DIVIDE key (/)\nf1-f24\tF1 to F24 function keys\nplus\tADD key (+)"
-    },
     "Color": {
       "default": "#",
       "pattern": "^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$",
@@ -249,18 +244,12 @@
         },
         "keys": {
           "description": "Defines the key combinations used to call the command.",
-          "oneOf": [
-            {
-              "$ref": "#/definitions/KeyChordSegment"
-            },
-            {
-              "items": {
-                "$ref": "#/definitions/KeyChordSegment"
-              },
-              "minItems": 1,
-              "type": "array"
-            }
-          ]
+          "items": {
+            "pattern": "^(?<modifier>(ctrl|alt|shift)\\+?((ctrl|alt|shift)(?<!\\2)\\+?)?((ctrl|alt|shift)(?<!\\2|\\4))?\\+?)?(?<key>[^+\\s]+?)?(?<=[^+\\s])$",
+            "type": "string"
+          },
+          "minItems": 1,
+          "type": "array"
         }
       },
       "required": [
@@ -389,16 +378,6 @@
           "minimum": 0,
           "type": "number"
         },
-        "antialiasingMode": {
-          "default": "grayscale",
-          "description": "Controls how text is antialiased in the renderer. Possible values are \"grayscale\", \"cleartype\" and \"aliased\". Note that changing this setting will require starting a new terminal instance.",
-          "enum": [
-            "grayscale",
-            "cleartype",
-            "aliased"
-          ],
-          "type": "string"
-        },
         "background": {
           "$ref": "#/definitions/Color",
           "default": "#0c0c0c",
@@ -555,7 +534,8 @@
         },
         "cursorColor": {
           "$ref": "#/definitions/Color",
-          "description": "Sets the cursor color of the profile. Overrides cursor color set in color scheme if colorscheme is set. Uses hex color format: \"#rrggbb\"."
+          "default": "#FFFFFF",
+          "description": "Sets the cursor color for the profile. Uses hex color format: \"#rrggbb\"."
         },
         "cursorHeight": {
           "description": "Sets the percentage height of the cursor starting from the bottom. Only works when cursorShape is set to \"vintage\". Accepts values from 25-100.",
@@ -746,11 +726,6 @@
             "$ref": "#/definitions/Color",
             "description": "Sets the color used as ANSI bright yellow."
           },
-          "cursorColor": {
-            "$ref": "#/definitions/Color",
-            "default": "#FFFFFF",
-            "description": "Sets the cursor color of the color scheme."
-          },
           "cyan": {
             "$ref": "#/definitions/Color",
             "description": "Sets the color used as ANSI cyan."

doc/terminal-v1-roadmap.md

@@ -34,7 +34,7 @@ Ultimately, we're aiming for Terminal v1.0 to be feature-complete by Dec 2019, a
 | 2020-01-28 | Beta 1 | Pri 0/1/2 Bug fixes & polish |
 | 2020-02-25 | Beta 2 | Pri 0/1 Bug fixes & polish |
 | 2020-03-24 | RC | Pri 0 bug fixes |
-| 2020-05    | v1.0 | Terminal v1.0 Release |
+| 2020-04-01 ? | v1.0 | Terminal v1.0 Release |
 
 ## GitHub Milestones
 

doc/user-docs/ThirdPartyToolProfiles.md

@@ -15,7 +15,7 @@ Assuming that you've installed Anaconda into `%USERPROFILE%\Anaconda3`:
 
 ```json
 {
-    "commandline" : "cmd.exe /k \"%USERPROFILE%\\Anaconda3\\Scripts\\activate.bat %USERPROFILE%\\Anaconda3\"",
+    "commandline" : "cmd.exe /K %USERPROFILE%\\Anaconda3\\Scripts\\activate.bat %USERPROFILE%\\Anaconda3",
     "icon" : "%USERPROFILE%/Anaconda3/Menu/anaconda-navigator.ico",
     "name" : "Anaconda3",
     "startingDirectory" : "%USERPROFILE%"
@@ -28,9 +28,8 @@ Assuming that you've installed cmder into `%CMDER_ROOT%`:
 
 ```json
 {
-    "commandline" : "cmd.exe /k \"%CMDER_ROOT%\\vendor\\init.bat\"",
+    "commandline" : "cmd.exe /k %CMDER_ROOT%\\vendor\\init.bat",
     "name" : "cmder",
-    "icon" : "%CMDER_ROOT%/icons/cmder.ico",
     "startingDirectory" : "%USERPROFILE%"
 }
 ```
@@ -78,17 +77,4 @@ Assuming that you've installed Git Bash into `C:/Program Files/Git`:
 }
 ````
 
-## MSYS2
-
-Assuming that you've installed MSYS2 into `C:/msys64`:
-
-```json
-{
-    "name" : "MSYS2",
-    "commandline" : "C:/msys64/msys2_shell.cmd -defterm -no-start -mingw64",
-    "icon": "C:/msys64/msys2.ico",
-    "startingDirectory" : "C:/msys64/home/user"
-}
-````
-
 <!-- Adding a tool here? Make sure to add it in alphabetical order! -->

doc/user-docs/UsingCommandlineArguments.md

@@ -22,7 +22,6 @@ pass, and gives some examples of how to use the `wt` commandline.
 ### Options
 
 #### `--help,-h,-?,/?,`
-
 Display the help message.
 
 ## Subcommands
@@ -36,18 +35,21 @@ opens a new window. Subsequent `new-tab` commands will all open new tabs in the
 same window.
 
 **Parameters**:
-
 * `[terminal_parameters]`: See [[terminal_parameters]](#terminal_parameters).
 
+
 #### `split-pane`
 
-`split-pane [-H]|[-V] [terminal_parameters]`
+`split-pane [--target,-t target-pane] [-H]|[-V] [terminal_parameters]`
 
 Creates a new pane in the currently focused tab by splitting the given pane
 vertically or horizontally.
 
 **Parameters**:
-
+* `--target,-t target-pane`: Creates a new split in the given `target-pane`.
+  Each pane has a unique index (per-tab) which can be used to identify them.
+  These indicies are assigned in the order the panes were created. If omitted,
+  defaults to the index of the currently focused pane.
 * `-H`, `-V`: Used to indicate which direction to split the pane. `-V` is
   "vertically" (think `[|]`), and `-H` is "horizontally" (think `[-]`). If
   omitted, defaults to "auto", which splits the current pane in whatever the
@@ -70,6 +72,7 @@ Moves focus to a given tab.
 * `-p,--previous`: Move focus to the previous tab. Will display an error if
   combined with either of `--next` or `--target`.
 
+
 #### `[terminal_parameters]`
 
 Some of the preceding commands are used to create a new terminal instance.
@@ -89,11 +92,12 @@ following:
   selected profile. If the user wants to use a `;` in this commandline, it
   should be escaped as `\;`.
 
+
 ## Examples
 
 ### Open Windows Terminal in the current directory
 
-```powershell
+```
 wt -d .
 ```
 
@@ -110,12 +114,11 @@ the `split-pane` command to create new panes.
 
 Consider the following commandline:
 
-```powershell
+```
 wt ; split-pane -p "Windows PowerShell" ; split-pane -H wsl.exe
 ```
 
 This creates a new Windows Terminal window with one tab, and 3 panes:
-
 * `wt`: Creates the new tab with the default profile
 * `split-pane -p "Windows PowerShell"`: This will create a new pane, split from
   the parent with the default profile. This pane will open with the "Windows

doc/user-docs/UsingJsonSettings.md

@@ -54,8 +54,8 @@ object under a root property `"globals"`.
 This is an array of key chords and shortcuts to invoke various commands.
 Each command can have more than one key binding.
 
-> 👉 **Note**: Key bindings is a subfield of the global settings and
-> key bindings apply to all profiles in the same manner.
+NOTE: Key bindings is a subfield of the global settings and
+key bindings apply to all profiles in the same manner.
 
 For example, here's a sample of the default keybindings:
 
@@ -69,26 +69,9 @@ For example, here's a sample of the default keybindings:
         // etc.
     ]
 }
+
 ```
 
-You can also use a single key chord string as the value of `"keys"`.
-It will be treated as a chord of length one.
-This will allow you to simplify the above snippet as follows:
-
-```json
-{
-    "keybindings":
-    [
-        { "command": "closePane", "keys": "ctrl+shift+w" },
-        { "command": "copy", "keys": "ctrl+shift+c" },
-        { "command": "newTab", "keys": "ctrl+shift+t" },
-        // etc.
-    ]
-}
-```
-
-
-
 ### Unbinding keys
 
 If you ever come across a key binding that you're unhappy with, it's possible to
@@ -153,7 +136,7 @@ the property `"hidden": true` to the profile's json. This can also be used to
 remove the default `cmd` and PowerShell profiles, if the user does not wish to
 see them.
 
-## Color Schemes
+##  Color Schemes
 
 Each scheme defines the color values to be used for various terminal escape sequences.
 Each schema is identified by the name field. Examples include
@@ -176,7 +159,6 @@ The schema name can then be referenced in one or more profiles.
 ## Settings layering
 
 The runtime settings are actually constructed from _three_ sources:
-
 * The default settings, which are hardcoded into the application, and available
   in `defaults.json`. This includes the default keybindings, color schemes, and
   profiles for both Windows PowerShell and Command Prompt (`cmd.exe`).
@@ -287,7 +269,7 @@ properties for all your profiles, like so:
             {
                 "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
                 "name": "Windows PowerShell",
-                "commandline": "powershell.exe"
+                "commandline": "powershell.exe",
             },
             {
                 "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
@@ -299,13 +281,12 @@ properties for all your profiles, like so:
                 "name" : "cmder",
                 "startingDirectory" : "%USERPROFILE%"
             }
-        ]
-    },
+        ],
+    }
 ```
 
 Note that the `profiles` property has changed in this example from a _list_ of
 profiles, to an _object_ with two properties:
-
 * a `list` that contains the list of all the profiles
 * the new `defaults` object, which contains all the settings that should apply to
   every profile.
@@ -328,7 +309,7 @@ could achieve that with the following:
             {
                 "guid": "{61c54bbd-c2c6-5271-96e7-009a87ff44bf}",
                 "name": "Windows PowerShell",
-                "commandline": "powershell.exe"
+                "commandline": "powershell.exe",
             },
             {
                 "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
@@ -341,18 +322,19 @@ could achieve that with the following:
                 "name" : "cmder",
                 "startingDirectory" : "%USERPROFILE%"
             }
-        ]
-    },
+        ],
+    }
 ```
 
 In the above settings, the `"fontFace"` in the `cmd.exe` profile overrides the
 `"fontFace"` from the `defaults`.
 
-## Configuration Examples
+
+## Configuration Examples:
 
 ### Add a custom background to the WSL Debian terminal profile
 
-1. Download the [Debian JPG logo](https://www.debian.org/logos/openlogo-100.jpg)
+1. Download the Debian JPG logo https://www.debian.org/logos/openlogo-100.jpg
 2. Put the image in the
  `$env:LocalAppData\Packages\Microsoft.WindowsTerminal_<randomString>\LocalState\`
  directory (same directory as your `profiles.json` file).
@@ -360,20 +342,17 @@ In the above settings, the `"fontFace"` in the `cmd.exe` profile overrides the
     __NOTE__:  You can put the image anywhere you like, the above suggestion happens to be convenient.
 3. Open your WT json properties file.
 4. Under the Debian Linux profile, add the following fields:
-
 ```json
     "backgroundImage": "ms-appdata:///Local/openlogo-100.jpg",
     "backgroundImageOpacity": 1,
     "backgroundImageStretchMode" : "none",
     "backgroundImageAlignment" : "topRight",
 ```
-
 5. Make sure that `useAcrylic` is `false`.
 6. Save the file.
 7. Jump over to WT and verify your changes.
 
 Notes:
-
 1. You will need to experiment with different color settings
 and schemes to make your terminal text visible on top of your image
 2. If you store the image in the UWP directory (the same directory as your profiles.json file),
@@ -435,6 +414,7 @@ no text selection. Additionally, if you set `paste` to `"ctrl+v"`, commandline
 applications won't be able to read a ctrl+v from the input. For these reasons,
 we suggest `"ctrl+shift+c"` and `"ctrl+shift+v"`
 
+
 ### Setting the `startingDirectory` of WSL Profiles to `~`
 
 By default, the `startingDirectory` of a profile is `%USERPROFILE%`

doc/user-docs/index.md

@@ -75,16 +75,15 @@ To open the settings file from Windows Terminal:
 
 For an introduction to the various settings, see [Using Json Settings](UsingJsonSettings.md). The list of valid settings can be found in the [profiles.json documentation](../cascadia/SettingsSchema.md) section.
 
-## Tips and Tricks
+## Tips and Tricks:
 
 1. In PowerShell you can discover if the Windows Terminal is being used by checking for the existence of the environment variable `WT_SESSION`.
 
     Under pwsh you can also use
 `(Get-Process -Id $pid).Parent.ProcessName -eq 'WindowsTerminal'`
 
-    (ref [https://twitter.com/r_keith_hill/status/1142871145852440576](https://twitter.com/r_keith_hill/status/1142871145852440576))
+    (ref https://twitter.com/r_keith_hill/status/1142871145852440576)
 
 2. Terminal zoom can be changed by holding <kbd>Ctrl</kbd> and scrolling with mouse.
-3. Background opacity can be changed by holding <kbd>Ctrl</kbd>+<kbd>Shift</kbd> and scrolling with mouse. Note that acrylic transparency is limited by the OS only to focused windows.
-4. Open Windows Terminal in current directory by typing `wt -d .` in the address bar.
-5. Please add more Tips and Tricks.
+3. If `useAcrylic` is enabled in profiles.json, background opacity can be changed by holding <kbd>Ctrl</kbd>+<kbd>Shift</kbd> and scrolling with mouse. Note that acrylic transparency is limited by the OS only to focused windows.
+4. Please add more Tips and Tricks

src/buffer/out/CharRow.cpp

@@ -269,33 +269,6 @@ std::wstring CharRow::GetText() const
     return wstr;
 }
 
-// Method Description:
-// - get delimiter class for a position in the char row
-// - used for double click selection and uia word navigation
-// Arguments:
-// - column: column to get text data for
-// - wordDelimiters: the delimiters defined as a part of the DelimiterClass::DelimiterChar
-// Return Value:
-// - the delimiter class for the given char
-const DelimiterClass CharRow::DelimiterClassAt(const size_t column, const std::wstring_view wordDelimiters) const
-{
-    THROW_HR_IF(E_INVALIDARG, column >= _data.size());
-
-    const auto glyph = *GlyphAt(column).begin();
-    if (glyph <= UNICODE_SPACE)
-    {
-        return DelimiterClass::ControlChar;
-    }
-    else if (wordDelimiters.find(glyph) != std::wstring_view::npos)
-    {
-        return DelimiterClass::DelimiterChar;
-    }
-    else
-    {
-        return DelimiterClass::RegularChar;
-    }
-}
-
 UnicodeStorage& CharRow::GetUnicodeStorage() noexcept
 {
     return _pParent->GetUnicodeStorage();

src/buffer/out/CharRow.hpp

@@ -27,13 +27,6 @@ Revision History:
 
 class ROW;
 
-enum class DelimiterClass
-{
-    ControlChar,
-    DelimiterChar,
-    RegularChar
-};
-
 // the characters of one row of screen buffer
 // we keep the following values so that we don't write
 // more pixels to the screen than we have to:
@@ -71,8 +64,6 @@ public:
     void ClearGlyph(const size_t column);
     std::wstring GetText() const;
 
-    const DelimiterClass DelimiterClassAt(const size_t column, const std::wstring_view wordDelimiters) const;
-
     // working with glyphs
     const reference GlyphAt(const size_t column) const;
     reference GlyphAt(const size_t column);

src/buffer/out/RowCellIterator.hpp

@@ -31,7 +31,7 @@ public:
     RowCellIterator(const ROW& row, const size_t start, const size_t length);
     ~RowCellIterator() = default;
 
-    RowCellIterator& operator=(const RowCellIterator& it) = delete;
+    RowCellIterator& operator=(const RowCellIterator& it) = default;
 
     operator bool() const noexcept;
 

src/buffer/out/TextAttribute.cpp

@@ -155,6 +155,11 @@ void TextAttribute::SetColor(const COLORREF rgbColor, const bool fIsForeground)
     }
 }
 
+bool TextAttribute::_IsReverseVideo() const noexcept
+{
+    return WI_IsFlagSet(_wAttrLegacy, COMMON_LVB_REVERSE_VIDEO);
+}
+
 bool TextAttribute::IsLeadingByte() const noexcept
 {
     return WI_IsFlagSet(_wAttrLegacy, COMMON_LVB_LEADING_BYTE);

src/buffer/out/TextAttribute.hpp

@@ -163,41 +163,12 @@ public:
         return _foreground.IsRgb() || _background.IsRgb();
     }
 
-    // This returns whether this attribute, if printed directly next to another attribute, for the space
-    // character, would look identical to the other one.
-    constexpr bool HasIdenticalVisualRepresentationForBlankSpace(const TextAttribute& other, const bool inverted = false) const noexcept
-    {
-        // sneaky-sneaky: I'm using xor here
-        // inverted is whether there's a global invert; Reverse is a local one.
-        // global ^ local == true : the background attribute is actually the visible foreground, so we care about the foregrounds being identical
-        // global ^ local == false: the foreground attribute is the visible foreground, so we care about the backgrounds being identical
-        const auto checkForeground = (inverted != _IsReverseVideo());
-        return !IsAnyGridLineEnabled() && // grid lines have a visual representation
-               // crossed out, doubly and singly underlined have a visual representation
-               WI_AreAllFlagsClear(_extendedAttrs, ExtendedAttributes::CrossedOut | ExtendedAttributes::DoublyUnderlined | ExtendedAttributes::Underlined) &&
-               // all other attributes do not have a visual representation
-               (_wAttrLegacy & META_ATTRS) == (other._wAttrLegacy & META_ATTRS) &&
-               ((checkForeground && _foreground == other._foreground) ||
-                (!checkForeground && _background == other._background)) &&
-               _extendedAttrs == other._extendedAttrs;
-    }
-
-    constexpr bool IsAnyGridLineEnabled() const noexcept
-    {
-        return WI_IsAnyFlagSet(_wAttrLegacy, COMMON_LVB_GRID_HORIZONTAL | COMMON_LVB_GRID_LVERTICAL | COMMON_LVB_GRID_RVERTICAL | COMMON_LVB_UNDERSCORE);
-    }
-
 private:
     COLORREF _GetRgbForeground(std::basic_string_view<COLORREF> colorTable,
                                COLORREF defaultColor) const noexcept;
     COLORREF _GetRgbBackground(std::basic_string_view<COLORREF> colorTable,
                                COLORREF defaultColor) const noexcept;
-
-    constexpr bool _IsReverseVideo() const noexcept
-    {
-        return WI_IsFlagSet(_wAttrLegacy, COMMON_LVB_REVERSE_VIDEO);
-    }
-
+    bool _IsReverseVideo() const noexcept;
     void _SetBoldness(const bool isBold) noexcept;
 
     WORD _wAttrLegacy;

src/buffer/out/cursor.h

@@ -37,7 +37,7 @@ public:
     Cursor& operator=(const Cursor&) & = delete;
 
     Cursor(Cursor&&) = default;
-    Cursor& operator=(Cursor&&) & = delete;
+    Cursor& operator=(Cursor&&) & = default;
 
     bool HasMoved() const noexcept;
     bool IsVisible() const noexcept;

src/buffer/out/textBuffer.cpp

@@ -573,21 +573,27 @@ bool TextBuffer::IncrementCircularBuffer(const bool inVtMode)
 }
 
 //Routine Description:
-// - Retrieves the position of the last non-space character in the given
-//   viewport
-// - By default, we search the entire buffer to find the last non-space
-//   character.
-// - If we know the last character is within the given viewport (so we don't
-//   need to check the entire buffer), we can provide a value in viewOptional
-//   that we'll use to search for the last character in.
+// - Retrieves the position of the last non-space character on the final line of the text buffer.
+// - By default, we search the entire buffer to find the last non-space character
+//Arguments:
+// - <none>
+//Return Value:
+// - Coordinate position in screen coordinates (offset coordinates, not array index coordinates).
+COORD TextBuffer::GetLastNonSpaceCharacter() const
+{
+    return GetLastNonSpaceCharacter(GetSize());
+}
+
+//Routine Description:
+// - Retrieves the position of the last non-space character in the given viewport
+// - This is basically an optimized version of GetLastNonSpaceCharacter(), and can be called when
+// - we know the last character is within the given viewport (so we don't need to check the entire buffer)
 //Arguments:
 // - The viewport
 //Return value:
 // - Coordinate position (relative to the text buffer)
-COORD TextBuffer::GetLastNonSpaceCharacter(std::optional<const Microsoft::Console::Types::Viewport> viewOptional) const
+COORD TextBuffer::GetLastNonSpaceCharacter(const Microsoft::Console::Types::Viewport viewport) const
 {
-    const auto viewport = viewOptional.has_value() ? viewOptional.value() : GetSize();
-
     COORD coordEndOfText = { 0 };
     // Search the given viewport by starting at the bottom.
     coordEndOfText.Y = viewport.BottomInclusive();
@@ -945,19 +951,6 @@ Microsoft::Console::Render::IRenderTarget& TextBuffer::GetRenderTarget() noexcep
     return _renderTarget;
 }
 
-// Method Description:
-// - get delimiter class for buffer cell position
-// - used for double click selection and uia word navigation
-// Arguments:
-// - pos: the buffer cell under observation
-// - wordDelimiters: the delimiters defined as a part of the DelimiterClass::DelimiterChar
-// Return Value:
-// - the delimiter class for the given char
-const DelimiterClass TextBuffer::_GetDelimiterClassAt(const COORD pos, const std::wstring_view wordDelimiters) const
-{
-    return GetRowByOffset(pos.Y).GetCharRow().DelimiterClassAt(pos.X, wordDelimiters);
-}
-
 // Method Description:
 // - Get the COORD for the beginning of the word you are on
 // Arguments:
@@ -1008,11 +1001,16 @@ const COORD TextBuffer::_GetWordStartForAccessibility(const COORD target, const
     COORD result = target;
     const auto bufferSize = GetSize();
     bool stayAtOrigin = false;
+    auto bufferIterator = GetTextDataAt(result);
 
     // ignore left boundary. Continue until readable text found
-    while (_GetDelimiterClassAt(result, wordDelimiters) != DelimiterClass::RegularChar)
+    while (_GetDelimiterClass(*bufferIterator, wordDelimiters) != DelimiterClass::RegularChar)
     {
-        if (!bufferSize.DecrementInBounds(result))
+        if (bufferSize.DecrementInBounds(result))
+        {
+            --bufferIterator;
+        }
+        else
         {
             // first char in buffer is a DelimiterChar or ControlChar
             // we can't move any further back
@@ -1022,9 +1020,13 @@ const COORD TextBuffer::_GetWordStartForAccessibility(const COORD target, const
     }
 
     // make sure we expand to the left boundary or the beginning of the word
-    while (_GetDelimiterClassAt(result, wordDelimiters) == DelimiterClass::RegularChar)
+    while (_GetDelimiterClass(*bufferIterator, wordDelimiters) == DelimiterClass::RegularChar)
     {
-        if (!bufferSize.DecrementInBounds(result))
+        if (bufferSize.DecrementInBounds(result))
+        {
+            --bufferIterator;
+        }
+        else
         {
             // first char in buffer is a RegularChar
             // we can't move any further back
@@ -1033,7 +1035,7 @@ const COORD TextBuffer::_GetWordStartForAccessibility(const COORD target, const
     }
 
     // move off of delimiter and onto word start
-    if (!stayAtOrigin && _GetDelimiterClassAt(result, wordDelimiters) != DelimiterClass::RegularChar)
+    if (!stayAtOrigin && _GetDelimiterClass(*bufferIterator, wordDelimiters) != DelimiterClass::RegularChar)
     {
         bufferSize.IncrementInBounds(result);
     }
@@ -1052,16 +1054,17 @@ const COORD TextBuffer::_GetWordStartForSelection(const COORD target, const std:
 {
     COORD result = target;
     const auto bufferSize = GetSize();
-
-    const auto initialDelimiter = _GetDelimiterClassAt(result, wordDelimiters);
+    auto bufferIterator = GetTextDataAt(result);
+    const auto initialDelimiter = _GetDelimiterClass(*bufferIterator, wordDelimiters);
 
     // expand left until we hit the left boundary or a different delimiter class
-    while (result.X > bufferSize.Left() && (_GetDelimiterClassAt(result, wordDelimiters) == initialDelimiter))
+    while (result.X > bufferSize.Left() && (_GetDelimiterClass(*bufferIterator, wordDelimiters) == initialDelimiter))
     {
         bufferSize.DecrementInBounds(result);
+        --bufferIterator;
     }
 
-    if (_GetDelimiterClassAt(result, wordDelimiters) != initialDelimiter)
+    if (_GetDelimiterClass(*bufferIterator, wordDelimiters) != initialDelimiter)
     {
         // move off of delimiter
         bufferSize.IncrementInBounds(result);
@@ -1113,20 +1116,31 @@ const COORD TextBuffer::_GetWordEndForAccessibility(const COORD target, const st
 {
     const auto bufferSize = GetSize();
     COORD result = target;
+    auto bufferIterator = GetTextDataAt(result);
 
     // ignore right boundary. Continue through readable text found
-    while (_GetDelimiterClassAt(result, wordDelimiters) == DelimiterClass::RegularChar)
+    while (_GetDelimiterClass(*bufferIterator, wordDelimiters) == DelimiterClass::RegularChar)
     {
-        if (!bufferSize.IncrementInBounds(result, true))
+        if (bufferSize.IncrementInBounds(result, true))
         {
+            ++bufferIterator;
+        }
+        else
+        {
+            // last char in buffer is a RegularChar
+            // we can't move any further forward
             break;
         }
     }
 
     // make sure we expand to the beginning of the NEXT word
-    while (_GetDelimiterClassAt(result, wordDelimiters) != DelimiterClass::RegularChar)
+    while (_GetDelimiterClass(*bufferIterator, wordDelimiters) != DelimiterClass::RegularChar)
     {
-        if (!bufferSize.IncrementInBounds(result, true))
+        if (bufferSize.IncrementInBounds(result, true))
+        {
+            ++bufferIterator;
+        }
+        else
         {
             // we are at the EndInclusive COORD
             // this signifies that we must include the last char in the buffer
@@ -1148,23 +1162,25 @@ const COORD TextBuffer::_GetWordEndForAccessibility(const COORD target, const st
 const COORD TextBuffer::_GetWordEndForSelection(const COORD target, const std::wstring_view wordDelimiters) const
 {
     const auto bufferSize = GetSize();
+    COORD result = target;
+    auto bufferIterator = GetTextDataAt(result);
 
     // can't expand right
     if (target.X == bufferSize.RightInclusive())
     {
-        return target;
+        return result;
     }
 
-    COORD result = target;
-    const auto initialDelimiter = _GetDelimiterClassAt(result, wordDelimiters);
+    const auto initialDelimiter = _GetDelimiterClass(*bufferIterator, wordDelimiters);
 
     // expand right until we hit the right boundary or a different delimiter class
-    while (result.X < bufferSize.RightInclusive() && (_GetDelimiterClassAt(result, wordDelimiters) == initialDelimiter))
+    while (result.X < bufferSize.RightInclusive() && (_GetDelimiterClass(*bufferIterator, wordDelimiters) == initialDelimiter))
     {
         bufferSize.IncrementInBounds(result);
+        ++bufferIterator;
     }
 
-    if (_GetDelimiterClassAt(result, wordDelimiters) != initialDelimiter)
+    if (_GetDelimiterClass(*bufferIterator, wordDelimiters) != initialDelimiter)
     {
         // move off of delimiter
         bufferSize.DecrementInBounds(result);
@@ -1187,8 +1203,11 @@ bool TextBuffer::MoveToNextWord(COORD& pos, const std::wstring_view wordDelimite
     auto copy = pos;
     const auto bufferSize = GetSize();
 
+    auto text = GetTextDataAt(copy)->data();
+    auto delimiterClass = _GetDelimiterClass(text, wordDelimiters);
+
     // started on a word, continue until the end of the word
-    while (_GetDelimiterClassAt(copy, wordDelimiters) == DelimiterClass::RegularChar)
+    while (delimiterClass == DelimiterClass::RegularChar)
     {
         if (!bufferSize.IncrementInBounds(copy))
         {
@@ -1196,6 +1215,8 @@ bool TextBuffer::MoveToNextWord(COORD& pos, const std::wstring_view wordDelimite
             // thus there is no next word
             return false;
         }
+        text = GetTextDataAt(copy)->data();
+        delimiterClass = _GetDelimiterClass(text, wordDelimiters);
     }
 
     // we are already on/past the last RegularChar
@@ -1205,7 +1226,7 @@ bool TextBuffer::MoveToNextWord(COORD& pos, const std::wstring_view wordDelimite
     }
 
     // on whitespace, continue until the beginning of the next word
-    while (_GetDelimiterClassAt(copy, wordDelimiters) != DelimiterClass::RegularChar)
+    while (delimiterClass != DelimiterClass::RegularChar)
     {
         if (!bufferSize.IncrementInBounds(copy))
         {
@@ -1213,6 +1234,8 @@ bool TextBuffer::MoveToNextWord(COORD& pos, const std::wstring_view wordDelimite
             // there is no next word
             return false;
         }
+        text = GetTextDataAt(copy)->data();
+        delimiterClass = _GetDelimiterClass(text, wordDelimiters);
     }
 
     // successful move, copy result out
@@ -1233,8 +1256,11 @@ bool TextBuffer::MoveToPreviousWord(COORD& pos, std::wstring_view wordDelimiters
     auto copy = pos;
     auto bufferSize = GetSize();
 
+    auto text = GetTextDataAt(copy)->data();
+    auto delimiterClass = _GetDelimiterClass(text, wordDelimiters);
+
     // started on whitespace/delimiter, continue until the end of the previous word
-    while (_GetDelimiterClassAt(copy, wordDelimiters) != DelimiterClass::RegularChar)
+    while (delimiterClass != DelimiterClass::RegularChar)
     {
         if (!bufferSize.DecrementInBounds(copy))
         {
@@ -1242,10 +1268,12 @@ bool TextBuffer::MoveToPreviousWord(COORD& pos, std::wstring_view wordDelimiters
             // there is no previous word
             return false;
         }
+        text = GetTextDataAt(copy)->data();
+        delimiterClass = _GetDelimiterClass(text, wordDelimiters);
     }
 
     // on a word, continue until the beginning of the word
-    while (_GetDelimiterClassAt(copy, wordDelimiters) == DelimiterClass::RegularChar)
+    while (delimiterClass == DelimiterClass::RegularChar)
     {
         if (!bufferSize.DecrementInBounds(copy))
         {
@@ -1253,6 +1281,8 @@ bool TextBuffer::MoveToPreviousWord(COORD& pos, std::wstring_view wordDelimiters
             // there is no previous word
             return false;
         }
+        text = GetTextDataAt(copy)->data();
+        delimiterClass = _GetDelimiterClass(text, wordDelimiters);
     }
 
     // successful move, copy result out
@@ -1261,215 +1291,52 @@ bool TextBuffer::MoveToPreviousWord(COORD& pos, std::wstring_view wordDelimiters
 }
 
 // Method Description:
-// - Update pos to be the beginning of the current glyph/character. This is used for accessibility
+// - get delimiter class for buffer cell data
+// - used for double click selection and uia word navigation
 // Arguments:
-// - pos - a COORD on the word you are currently on
-// Return Value:
-// - pos - The COORD for the first cell of the current glyph (inclusive)
-const til::point TextBuffer::GetGlyphStart(const til::point pos) const
-{
-    COORD resultPos = pos;
-
-    const auto bufferSize = GetSize();
-    if (resultPos != bufferSize.EndExclusive() && GetCellDataAt(resultPos)->DbcsAttr().IsTrailing())
-    {
-        bufferSize.DecrementInBounds(resultPos, true);
-    }
-
-    return resultPos;
-}
-
-// Method Description:
-// - Update pos to be the end of the current glyph/character. This is used for accessibility
-// Arguments:
-// - pos - a COORD on the word you are currently on
-// Return Value:
-// - pos - The COORD for the last cell of the current glyph (exclusive)
-const til::point TextBuffer::GetGlyphEnd(const til::point pos) const
-{
-    COORD resultPos = pos;
-
-    const auto bufferSize = GetSize();
-    if (resultPos != bufferSize.EndExclusive() && GetCellDataAt(resultPos)->DbcsAttr().IsLeading())
-    {
-        bufferSize.IncrementInBounds(resultPos, true);
-    }
-
-    // increment one more time to become exclusive
-    bufferSize.IncrementInBounds(resultPos, true);
-    return resultPos;
-}
-
-// Method Description:
-// - Update pos to be the beginning of the next glyph/character. This is used for accessibility
-// Arguments:
-// - pos - a COORD on the word you are currently on
-// - allowBottomExclusive - allow the nonexistent end-of-buffer cell to be encountered
-// Return Value:
-// - true, if successfully updated pos. False, if we are unable to move (usually due to a buffer boundary)
-// - pos - The COORD for the first cell of the current glyph (inclusive)
-bool TextBuffer::MoveToNextGlyph(til::point& pos, bool allowBottomExclusive) const
-{
-    COORD resultPos = pos;
-
-    // try to move. If we can't, we're done.
-    const auto bufferSize = GetSize();
-    const bool success = bufferSize.IncrementInBounds(resultPos, allowBottomExclusive);
-    if (resultPos != bufferSize.EndExclusive() && GetCellDataAt(resultPos)->DbcsAttr().IsTrailing())
-    {
-        bufferSize.IncrementInBounds(resultPos, allowBottomExclusive);
-    }
-
-    pos = resultPos;
-    return success;
-}
-
-// Method Description:
-// - Update pos to be the beginning of the previous glyph/character. This is used for accessibility
-// Arguments:
-// - pos - a COORD on the word you are currently on
-// - allowBottomExclusive - allow the nonexistent end-of-buffer cell to be encountered
-// Return Value:
-// - true, if successfully updated pos. False, if we are unable to move (usually due to a buffer boundary)
-// - pos - The COORD for the first cell of the previous glyph (inclusive)
-bool TextBuffer::MoveToPreviousGlyph(til::point& pos, bool allowBottomExclusive) const
-{
-    COORD resultPos = pos;
-
-    // try to move. If we can't, we're done.
-    const auto bufferSize = GetSize();
-    const bool success = bufferSize.DecrementInBounds(resultPos, allowBottomExclusive);
-    if (resultPos != bufferSize.EndExclusive() && GetCellDataAt(resultPos)->DbcsAttr().IsLeading())
-    {
-        bufferSize.DecrementInBounds(resultPos, allowBottomExclusive);
-    }
-
-    pos = resultPos;
-    return success;
-}
-
-// Method Description:
-// - Determines the line-by-line rectangles based on two COORDs
-// - expands the rectangles to support wide glyphs
-// - used for selection rects and UIA bounding rects
-// Arguments:
-// - start: a corner of the text region of interest (inclusive)
-// - end: the other corner of the text region of interest (inclusive)
-// - blockSelection: when enabled, only get the rectangular text region,
-//                   as opposed to the text extending to the left/right
-//                   buffer margins
+// - cellChar: the char saved to the buffer cell under observation
+// - wordDelimiters: the delimiters defined as a part of the DelimiterClass::DelimiterChar
 // Return Value:
 // - the delimiter class for the given char
-const std::vector<SMALL_RECT> TextBuffer::GetTextRects(COORD start, COORD end, bool blockSelection) const
+TextBuffer::DelimiterClass TextBuffer::_GetDelimiterClass(const std::wstring_view cellChar, const std::wstring_view wordDelimiters) const noexcept
 {
-    std::vector<SMALL_RECT> textRects;
-
-    const auto bufferSize = GetSize();
-
-    // (0,0) is the top-left of the screen
-    // the physically "higher" coordinate is closer to the top-left
-    // the physically "lower" coordinate is closer to the bottom-right
-    const auto [higherCoord, lowerCoord] = bufferSize.CompareInBounds(start, end) <= 0 ?
-                                               std::make_tuple(start, end) :
-                                               std::make_tuple(end, start);
-
-    const auto textRectSize = base::ClampedNumeric<short>(1) + lowerCoord.Y - higherCoord.Y;
-    textRects.reserve(textRectSize);
-    for (auto row = higherCoord.Y; row <= lowerCoord.Y; row++)
+    if (cellChar.at(0) <= UNICODE_SPACE)
     {
-        SMALL_RECT textRow;
-
-        textRow.Top = row;
-        textRow.Bottom = row;
-
-        if (blockSelection || higherCoord.Y == lowerCoord.Y)
-        {
-            // set the left and right margin to the left-/right-most respectively
-            textRow.Left = std::min(higherCoord.X, lowerCoord.X);
-            textRow.Right = std::max(higherCoord.X, lowerCoord.X);
-        }
-        else
-        {
-            textRow.Left = (row == higherCoord.Y) ? higherCoord.X : bufferSize.Left();
-            textRow.Right = (row == lowerCoord.Y) ? lowerCoord.X : bufferSize.RightInclusive();
-        }
-
-        _ExpandTextRow(textRow);
-        textRects.emplace_back(textRow);
+        return DelimiterClass::ControlChar;
     }
-
-    return textRects;
-}
-
-// Method Description:
-// - Expand the selection row according to include wide glyphs fully
-// - this is particularly useful for box selections (ALT + selection)
-// Arguments:
-// - selectionRow: the selection row to be expanded
-// Return Value:
-// - modifies selectionRow's Left and Right values to expand properly
-void TextBuffer::_ExpandTextRow(SMALL_RECT& textRow) const
-{
-    const auto bufferSize = GetSize();
-
-    // expand left side of rect
-    COORD targetPoint{ textRow.Left, textRow.Top };
-    if (GetCellDataAt(targetPoint)->DbcsAttr().IsTrailing())
+    else if (wordDelimiters.find(cellChar) != std::wstring_view::npos)
     {
-        if (targetPoint.X == bufferSize.Left())
-        {
-            bufferSize.IncrementInBounds(targetPoint);
-        }
-        else
-        {
-            bufferSize.DecrementInBounds(targetPoint);
-        }
-        textRow.Left = targetPoint.X;
+        return DelimiterClass::DelimiterChar;
     }
-
-    // expand right side of rect
-    targetPoint = { textRow.Right, textRow.Bottom };
-    if (GetCellDataAt(targetPoint)->DbcsAttr().IsLeading())
+    else
     {
-        if (targetPoint.X == bufferSize.RightInclusive())
-        {
-            bufferSize.DecrementInBounds(targetPoint);
-        }
-        else
-        {
-            bufferSize.IncrementInBounds(targetPoint);
-        }
-        textRow.Right = targetPoint.X;
+        return DelimiterClass::RegularChar;
     }
 }
 
 // Routine Description:
 // - Retrieves the text data from the selected region and presents it in a clipboard-ready format (given little post-processing).
 // Arguments:
-// - includeCRLF - inject CRLF pairs to the end of each line
-// - trimTrailingWhitespace - remove the trailing whitespace at the end of each line
-// - textRects - the rectangular regions from which the data will be extracted from the buffer (i.e.: selection rects)
-// - GetForegroundColor - function used to map TextAttribute to RGB COLORREF for foreground color. If null, only extract the text.
-// - GetBackgroundColor - function used to map TextAttribute to RGB COLORREF for background color. If null, only extract the text.
+// - lineSelection - true if entire line is being selected. False otherwise (box selection)
+// - trimTrailingWhitespace - setting flag removes trailing whitespace at the end of each row in selection
+// - selectionRects - the selection regions from which the data will be extracted from the buffer
+// - GetForegroundColor - function used to map TextAttribute to RGB COLORREF for foreground color
+// - GetBackgroundColor - function used to map TextAttribute to RGB COLORREF for foreground color
 // Return Value:
 // - The text, background color, and foreground color data of the selected region of the text buffer.
-const TextBuffer::TextAndColor TextBuffer::GetText(const bool includeCRLF,
-                                                   const bool trimTrailingWhitespace,
-                                                   const std::vector<SMALL_RECT>& selectionRects,
-                                                   std::function<COLORREF(TextAttribute&)> GetForegroundColor,
-                                                   std::function<COLORREF(TextAttribute&)> GetBackgroundColor) const
+const TextBuffer::TextAndColor TextBuffer::GetTextForClipboard(const bool lineSelection,
+                                                               const bool trimTrailingWhitespace,
+                                                               const std::vector<SMALL_RECT>& selectionRects,
+                                                               std::function<COLORREF(TextAttribute&)> GetForegroundColor,
+                                                               std::function<COLORREF(TextAttribute&)> GetBackgroundColor) const
 {
     TextAndColor data;
-    const bool copyTextColor = GetForegroundColor && GetBackgroundColor;
 
     // preallocate our vectors to reduce reallocs
     size_t const rows = selectionRects.size();
     data.text.reserve(rows);
-    if (copyTextColor)
-    {
-        data.FgAttr.reserve(rows);
-        data.BkAttr.reserve(rows);
-    }
+    data.FgAttr.reserve(rows);
+    data.BkAttr.reserve(rows);
 
     // for each row in the selection
     for (UINT i = 0; i < rows; i++)
@@ -1488,31 +1355,24 @@ const TextBuffer::TextAndColor TextBuffer::GetText(const bool includeCRLF,
 
         // preallocate to avoid reallocs
         selectionText.reserve(gsl::narrow<size_t>(highlight.Width()) + 2); // + 2 for \r\n if we munged it
-        if (copyTextColor)
-        {
-            selectionFgAttr.reserve(gsl::narrow<size_t>(highlight.Width()) + 2);
-            selectionBkAttr.reserve(gsl::narrow<size_t>(highlight.Width()) + 2);
-        }
+        selectionFgAttr.reserve(gsl::narrow<size_t>(highlight.Width()) + 2);
+        selectionBkAttr.reserve(gsl::narrow<size_t>(highlight.Width()) + 2);
 
         // copy char data into the string buffer, skipping trailing bytes
         while (it)
         {
             const auto& cell = *it;
+            auto cellData = cell.TextAttr();
+            COLORREF const CellFgAttr = GetForegroundColor(cellData);
+            COLORREF const CellBkAttr = GetBackgroundColor(cellData);
 
             if (!cell.DbcsAttr().IsTrailing())
             {
                 selectionText.append(cell.Chars());
-
-                if (copyTextColor)
+                for (const wchar_t wch : cell.Chars())
                 {
-                    auto cellData = cell.TextAttr();
-                    COLORREF const CellFgAttr = GetForegroundColor(cellData);
-                    COLORREF const CellBkAttr = GetBackgroundColor(cellData);
-                    for (const wchar_t wch : cell.Chars())
-                    {
-                        selectionFgAttr.push_back(CellFgAttr);
-                        selectionBkAttr.push_back(CellBkAttr);
-                    }
+                    selectionFgAttr.push_back(CellFgAttr);
+                    selectionBkAttr.push_back(CellBkAttr);
                 }
             }
 #pragma warning(suppress : 26444)
@@ -1520,41 +1380,35 @@ const TextBuffer::TextAndColor TextBuffer::GetText(const bool includeCRLF,
             it++;
         }
 
-        const bool forcedWrap = GetRowByOffset(iRow).GetCharRow().WasWrapForced();
-
+        // trim trailing spaces if SHIFT key not held
         if (trimTrailingWhitespace)
         {
-            // if the row was NOT wrapped...
-            if (!forcedWrap)
+            const ROW& Row = GetRowByOffset(iRow);
+
+            // FOR LINE SELECTION ONLY: if the row was wrapped, don't remove the spaces at the end.
+            if (!lineSelection || !Row.GetCharRow().WasWrapForced())
             {
-                // remove the spaces at the end (aka trim the trailing whitespace)
                 while (!selectionText.empty() && selectionText.back() == UNICODE_SPACE)
                 {
                     selectionText.pop_back();
-                    if (copyTextColor)
-                    {
-                        selectionFgAttr.pop_back();
-                        selectionBkAttr.pop_back();
-                    }
+                    selectionFgAttr.pop_back();
+                    selectionBkAttr.pop_back();
                 }
             }
-        }
 
-        // apply CR/LF to the end of the final string, unless we're the last line.
-        // a.k.a if we're earlier than the bottom, then apply CR/LF.
-        if (includeCRLF && i < selectionRects.size() - 1)
-        {
-            // if the row was NOT wrapped...
-            if (!forcedWrap)
+            // apply CR/LF to the end of the final string, unless we're the last line.
+            // a.k.a if we're earlier than the bottom, then apply CR/LF.
+            if (i < selectionRects.size() - 1)
             {
-                // then we can assume a CR/LF is proper
-                selectionText.push_back(UNICODE_CARRIAGERETURN);
-                selectionText.push_back(UNICODE_LINEFEED);
-
-                if (copyTextColor)
+                // FOR LINE SELECTION ONLY: if the row was wrapped, do not apply CR/LF.
+                // a.k.a. if the row was NOT wrapped, then we can assume a CR/LF is proper
+                // always apply \r\n for box selection
+                if (!lineSelection || !GetRowByOffset(iRow).GetCharRow().WasWrapForced())
                 {
-                    // cant see CR/LF so just use black FG & BK
-                    COLORREF const Blackness = RGB(0x00, 0x00, 0x00);
+                    COLORREF const Blackness = RGB(0x00, 0x00, 0x00); // cant see CR/LF so just use black FG & BK
+
+                    selectionText.push_back(UNICODE_CARRIAGERETURN);
+                    selectionText.push_back(UNICODE_LINEFEED);
                     selectionFgAttr.push_back(Blackness);
                     selectionFgAttr.push_back(Blackness);
                     selectionBkAttr.push_back(Blackness);
@@ -1564,11 +1418,8 @@ const TextBuffer::TextAndColor TextBuffer::GetText(const bool includeCRLF,
         }
 
         data.text.emplace_back(std::move(selectionText));
-        if (copyTextColor)
-        {
-            data.FgAttr.emplace_back(std::move(selectionFgAttr));
-            data.BkAttr.emplace_back(std::move(selectionBkAttr));
-        }
+        data.FgAttr.emplace_back(std::move(selectionFgAttr));
+        data.BkAttr.emplace_back(std::move(selectionBkAttr));
     }
 
     return data;
@@ -1954,18 +1805,9 @@ std::string TextBuffer::GenRTF(const TextAndColor& rows, const int fontHeightPoi
 // Arguments:
 // - oldBuffer - the text buffer to copy the contents FROM
 // - newBuffer - the text buffer to copy the contents TO
-// - lastCharacterViewport - Optional. If the caller knows that the last
-//   nonspace character is in a particular Viewport, the caller can provide this
-//   parameter as an optimization, as opposed to searching the entire buffer.
-// - positionInfo - Optional. The caller can provide a pair of rows in this
-//   parameter and we'll calculate the position of the _end_ of those rows in
-//   the new buffer. The rows's new value is placed back into this parameter.
 // Return Value:
 // - S_OK if we successfully copied the contents to the new buffer, otherwise an appropriate HRESULT.
-HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
-                           TextBuffer& newBuffer,
-                           const std::optional<Viewport> lastCharacterViewport,
-                           std::optional<std::reference_wrapper<PositionInformation>> positionInfo)
+HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer, TextBuffer& newBuffer)
 {
     Cursor& oldCursor = oldBuffer.GetCursor();
     Cursor& newCursor = newBuffer.GetCursor();
@@ -1977,15 +1819,14 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
     // place the new cursor back on the equivalent character in
     // the new buffer.
     const COORD cOldCursorPos = oldCursor.GetPosition();
-    const COORD cOldLastChar = oldBuffer.GetLastNonSpaceCharacter(lastCharacterViewport);
+    const COORD cOldLastChar = oldBuffer.GetLastNonSpaceCharacter();
 
-    const short cOldRowsTotal = cOldLastChar.Y + 1;
-    const short cOldColsTotal = oldBuffer.GetSize().Width();
+    short const cOldRowsTotal = cOldLastChar.Y + 1;
+    short const cOldColsTotal = oldBuffer.GetSize().Width();
 
     COORD cNewCursorPos = { 0 };
     bool fFoundCursorPos = false;
-    bool foundOldMutable = false;
-    bool foundOldVisible = false;
+
     HRESULT hr = S_OK;
     // Loop through all the rows of the old buffer and reprint them into the new buffer
     for (short iOldRow = 0; iOldRow < cOldRowsTotal; iOldRow++)
@@ -2045,31 +1886,6 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
             }
             CATCH_RETURN();
         }
-
-        // If we found the old row that the caller was interested in, set the
-        // out value of that parameter to the cursor's current Y position (the
-        // new location of the _end_ of that row in the buffer).
-        if (positionInfo.has_value())
-        {
-            if (!foundOldMutable)
-            {
-                if (iOldRow >= positionInfo.value().get().mutableViewportTop)
-                {
-                    positionInfo.value().get().mutableViewportTop = newCursor.GetPosition().Y;
-                    foundOldMutable = true;
-                }
-            }
-
-            if (!foundOldVisible)
-            {
-                if (iOldRow >= positionInfo.value().get().visibleViewportTop)
-                {
-                    positionInfo.value().get().visibleViewportTop = newCursor.GetPosition().Y;
-                    foundOldVisible = true;
-                }
-            }
-        }
-
         if (SUCCEEDED(hr))
         {
             // If we didn't have a full row to copy, insert a new

src/buffer/out/textBuffer.hpp

@@ -103,7 +103,8 @@ public:
     // Scroll needs access to this to quickly rotate around the buffer.
     bool IncrementCircularBuffer(const bool inVtMode = false);
 
-    COORD GetLastNonSpaceCharacter(std::optional<const Microsoft::Console::Types::Viewport> viewOptional = std::nullopt) const;
+    COORD GetLastNonSpaceCharacter() const;
+    COORD GetLastNonSpaceCharacter(const Microsoft::Console::Types::Viewport viewport) const;
 
     Cursor& GetCursor() noexcept;
     const Cursor& GetCursor() const noexcept;
@@ -134,13 +135,6 @@ public:
     bool MoveToNextWord(COORD& pos, const std::wstring_view wordDelimiters, COORD lastCharPos) const;
     bool MoveToPreviousWord(COORD& pos, const std::wstring_view wordDelimiters) const;
 
-    const til::point GetGlyphStart(const til::point pos) const;
-    const til::point GetGlyphEnd(const til::point pos) const;
-    bool MoveToNextGlyph(til::point& pos, bool allowBottomExclusive = false) const;
-    bool MoveToPreviousGlyph(til::point& pos, bool allowBottomExclusive = false) const;
-
-    const std::vector<SMALL_RECT> GetTextRects(COORD start, COORD end, bool blockSelection = false) const;
-
     class TextAndColor
     {
     public:
@@ -149,11 +143,11 @@ public:
         std::vector<std::vector<COLORREF>> BkAttr;
     };
 
-    const TextAndColor GetText(const bool lineSelection,
-                               const bool trimTrailingWhitespace,
-                               const std::vector<SMALL_RECT>& textRects,
-                               std::function<COLORREF(TextAttribute&)> GetForegroundColor = nullptr,
-                               std::function<COLORREF(TextAttribute&)> GetBackgroundColor = nullptr) const;
+    const TextAndColor GetTextForClipboard(const bool lineSelection,
+                                           const bool trimTrailingWhitespace,
+                                           const std::vector<SMALL_RECT>& selectionRects,
+                                           std::function<COLORREF(TextAttribute&)> GetForegroundColor,
+                                           std::function<COLORREF(TextAttribute&)> GetBackgroundColor) const;
 
     static std::string GenHTML(const TextAndColor& rows,
                                const int fontHeightPoints,
@@ -166,16 +160,7 @@ public:
                               const std::wstring_view fontFaceName,
                               const COLORREF backgroundColor);
 
-    struct PositionInformation
-    {
-        short mutableViewportTop{ 0 };
-        short visibleViewportTop{ 0 };
-    };
-
-    static HRESULT Reflow(TextBuffer& oldBuffer,
-                          TextBuffer& newBuffer,
-                          const std::optional<Microsoft::Console::Types::Viewport> lastCharacterViewport,
-                          std::optional<std::reference_wrapper<PositionInformation>> positionInfo);
+    static HRESULT Reflow(TextBuffer& oldBuffer, TextBuffer& newBuffer);
 
 private:
     std::deque<ROW> _storage;
@@ -208,9 +193,13 @@ private:
     ROW& _GetFirstRow();
     ROW& _GetPrevRowNoWrap(const ROW& row);
 
-    void _ExpandTextRow(SMALL_RECT& selectionRow) const;
-
-    const DelimiterClass _GetDelimiterClassAt(const COORD pos, const std::wstring_view wordDelimiters) const;
+    enum class DelimiterClass
+    {
+        ControlChar,
+        DelimiterChar,
+        RegularChar
+    };
+    DelimiterClass _GetDelimiterClass(const std::wstring_view cellChar, const std::wstring_view wordDelimiters) const noexcept;
     const COORD _GetWordStartForAccessibility(const COORD target, const std::wstring_view wordDelimiters) const;
     const COORD _GetWordStartForSelection(const COORD target, const std::wstring_view wordDelimiters) const;
     const COORD _GetWordEndForAccessibility(const COORD target, const std::wstring_view wordDelimiters) const;

src/cascadia/CascadiaPackage/CascadiaPackage.wapproj

@@ -43,8 +43,7 @@
     <!-- Resources -->
     <!-- This resw only defines things that are used in this package's AppxManifest,
          so it's not in the common resource items. -->
-    <PRIResource Include="Resources\Resources.language-en.resw" />
-    <PRIResource Include="Resources\Resources.resw" />
+    <PRIResource Include="Resources\en-US\Resources.resw" />
   </ItemGroup>
   <PropertyGroup Condition="'$(WindowsTerminalReleaseBuild)'!='true'">
     <!-- This is picked up by CascadiaResources.build.items. -->
@@ -55,7 +54,6 @@
   <ItemGroup>
     <ProjectReference Include="..\WindowsTerminal\WindowsTerminal.vcxproj" />
     <ProjectReference Include="..\..\host\exe\Host.EXE.vcxproj" />
-    <ProjectReference Include="..\TerminalAzBridge\TerminalAzBridge.vcxproj" />
   </ItemGroup>
   <Target Name="OpenConsoleStompSourceProjectForWapProject" BeforeTargets="_ConvertItems">
     <ItemGroup>
@@ -93,7 +91,9 @@
        roll up our subproject resources. We have to suppress that rule but keep part of its logic, because that rule is
        where the AppxPackagePayload items are created. -->
   <PropertyGroup>
-    <WapProjBeforeGenerateAppxManifestDependsOn>
+    <!-- Only for MSBuild versions <= 16.4.0 -->
+    <!-- TODO: Change this to hard less than once the 16.4.0 previews fix the bug. -->
+    <WapProjBeforeGenerateAppxManifestDependsOn Condition="$(MSBuildVersion) &lt;= '16.4.0'">
         $([MSBuild]::Unescape('$(WapProjBeforeGenerateAppxManifestDependsOn.Replace('_RemoveAllNonWapUWPItems', '_OpenConsoleRemoveAllNonWapUWPItems'))'))
     </WapProjBeforeGenerateAppxManifestDependsOn>
   </PropertyGroup>

src/cascadia/CascadiaPackage/Package.appxmanifest

@@ -17,7 +17,7 @@
     Version="1.0.0.0" />
 
   <Properties>
-    <DisplayName>Windows Terminal</DisplayName>
+    <DisplayName>ms-resource:AppName</DisplayName>
     <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
     <Logo>Images\StoreLogo.png</Logo>
   </Properties>

src/cascadia/CascadiaPackage/Resources/Resources.resw

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="AppName" xml:space="preserve">
-    <value>Windows Terminal (Preview)</value>
-  </data>
-  <data name="AppNameDev" xml:space="preserve">
-    <value>Windows Terminal (Dev Build)</value>
-  </data>
-  <data name="AppShortName" xml:space="preserve">
-    <value>Terminal</value>
-  </data>
-  <data name="AppShortNameDev" xml:space="preserve">
-    <value>Terminal (Dev)</value>
-  </data>
-</root>

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

@@ -120,7 +120,19 @@
   <data name="AppDescription" xml:space="preserve">
     <value>The New Windows Terminal</value>
   </data>
+  <data name="AppName" xml:space="preserve">
+    <value>Windows Terminal (Preview)</value>
+  </data>
   <data name="AppDescriptionDev" xml:space="preserve">
     <value>The Windows Terminal, but Unofficial</value>
   </data>
-</root>
+  <data name="AppNameDev" xml:space="preserve">
+    <value>Windows Terminal (Dev Build)</value>
+  </data>
+  <data name="AppShortName" xml:space="preserve">
+    <value>Terminal</value>
+  </data>
+  <data name="AppShortNameDev" xml:space="preserve">
+    <value>Terminal (Dev)</value>
+  </data>
+</root>

src/cascadia/LocalTests_TerminalApp/ColorSchemeTests.cpp

@@ -100,7 +100,6 @@ namespace TerminalAppLocalTests
             "foreground": "#000000",
             "background": "#010101",
             "selectionBackground": "#010100",
-            "cursorColor": "#010001",
             "red": "#010000",
             "green": "#000100",
             "blue": "#000001"
@@ -110,7 +109,6 @@ namespace TerminalAppLocalTests
             "foreground": "#020202",
             "background": "#030303",
             "selectionBackground": "#020200",
-            "cursorColor": "#040004",
             "red": "#020000",
 
             "blue": "#000002"
@@ -120,7 +118,6 @@ namespace TerminalAppLocalTests
             "foreground": "#040404",
             "background": "#050505",
             "selectionBackground": "#030300",
-            "cursorColor": "#060006",
             "red": "#030000",
             "green": "#000300"
         })" };
@@ -133,8 +130,8 @@ namespace TerminalAppLocalTests
         VERIFY_ARE_EQUAL(L"scheme0", scheme0._schemeName);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0._defaultForeground);
         VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0._defaultBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0._defaultBackground);
         VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 0), scheme0._selectionBackground);
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 0, 1), scheme0._cursorColor);
         VERIFY_ARE_EQUAL(ARGB(0, 1, 0, 0), scheme0._table[XTERM_RED_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 1, 0), scheme0._table[XTERM_GREEN_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 1), scheme0._table[XTERM_BLUE_ATTR]);
@@ -146,7 +143,6 @@ namespace TerminalAppLocalTests
         VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme0._defaultForeground);
         VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme0._defaultBackground);
         VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 0), scheme0._selectionBackground);
-        VERIFY_ARE_EQUAL(ARGB(0, 4, 0, 4), scheme0._cursorColor);
         VERIFY_ARE_EQUAL(ARGB(0, 2, 0, 0), scheme0._table[XTERM_RED_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 1, 0), scheme0._table[XTERM_GREEN_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 2), scheme0._table[XTERM_BLUE_ATTR]);
@@ -158,7 +154,6 @@ namespace TerminalAppLocalTests
         VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0._defaultForeground);
         VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0._defaultBackground);
         VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 0), scheme0._selectionBackground);
-        VERIFY_ARE_EQUAL(ARGB(0, 6, 0, 6), scheme0._cursorColor);
         VERIFY_ARE_EQUAL(ARGB(0, 3, 0, 0), scheme0._table[XTERM_RED_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 3, 0), scheme0._table[XTERM_GREEN_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 2), scheme0._table[XTERM_BLUE_ATTR]);

src/cascadia/LocalTests_TerminalApp/KeyBindingsTests.cpp

@@ -42,8 +42,6 @@ namespace TerminalAppLocalTests
         TEST_METHOD(TestArbitraryArgs);
         TEST_METHOD(TestSplitPaneArgs);
 
-        TEST_METHOD(TestStringOverload);
-
         TEST_CLASS_SETUP(ClassSetup)
         {
             InitializeJsonReader();
@@ -460,27 +458,4 @@ namespace TerminalAppLocalTests
         }
     }
 
-    void KeyBindingsTests::TestStringOverload()
-    {
-        const std::string bindings0String{ R"([
-            { "command": "copy", "keys": "ctrl+c" }
-        ])" };
-
-        const auto bindings0Json = VerifyParseSucceeded(bindings0String);
-
-        auto appKeyBindings = winrt::make_self<implementation::AppKeyBindings>();
-        VERIFY_IS_NOT_NULL(appKeyBindings);
-        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
-        appKeyBindings->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(1u, appKeyBindings->_keyShortcuts.size());
-
-        {
-            KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
-            const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
-            VERIFY_IS_NOT_NULL(realArgs);
-            // Verify the args have the expected value
-            VERIFY_IS_TRUE(realArgs.TrimWhitespace());
-        }
-    }
 }

src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp

@@ -70,10 +70,6 @@ namespace TerminalAppLocalTests
 
         TEST_METHOD(TestTerminalArgsForBinding);
 
-        TEST_METHOD(TestLayerProfileOnColorScheme);
-
-        TEST_METHOD(ValidateKeybindingsWarnings);
-
         TEST_CLASS_SETUP(ClassSetup)
         {
             InitializeJsonReader();
@@ -1470,7 +1466,7 @@ namespace TerminalAppLocalTests
         CascadiaSettings settings{};
         settings._ParseJsonString(settingsJson, false);
         settings.LayerJson(settings._userSettings);
-        VERIFY_IS_FALSE(settings._profiles.empty());
+        VERIFY_IS_FALSE(settings._profiles.empty(), 0);
         VERIFY_ARE_EQUAL(expectedPath, settings._profiles[0].GetExpandedIconPath());
     }
     void SettingsTests::TestProfileBackgroundImageWithEnvVar()
@@ -1491,7 +1487,7 @@ namespace TerminalAppLocalTests
         CascadiaSettings settings{};
         settings._ParseJsonString(settingsJson, false);
         settings.LayerJson(settings._userSettings);
-        VERIFY_IS_FALSE(settings._profiles.empty());
+        VERIFY_IS_FALSE(settings._profiles.empty(), 0);
 
         GlobalAppSettings globalSettings{};
         auto terminalSettings = settings._profiles[0].CreateTerminalSettings(globalSettings.GetColorSchemes());
@@ -2093,116 +2089,4 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(2, termSettings.HistorySize());
         }
     }
-
-    void SettingsTests::TestLayerProfileOnColorScheme()
-    {
-        Log::Comment(NoThrowString().Format(
-            L"Ensure that setting (or not) a property in the profile that should override a property of the color scheme works correctly."));
-
-        const std::string settings0String{ R"(
-        {
-            "profiles": [
-                {
-                    "name" : "profile0",
-                    "colorScheme": "schemeWithCursorColor"
-                },
-                {
-                    "name" : "profile1",
-                    "colorScheme": "schemeWithoutCursorColor"
-                },
-                {
-                    "name" : "profile2",
-                    "colorScheme": "schemeWithCursorColor",
-                    "cursorColor": "#234567"
-                },
-                {
-                    "name" : "profile3",
-                    "colorScheme": "schemeWithoutCursorColor",
-                    "cursorColor": "#345678"
-                },
-                {
-                    "name" : "profile4",
-                    "cursorColor": "#456789"
-                },
-                {
-                    "name" : "profile5"
-                }
-            ],
-            "schemes": [
-                {
-                    "name": "schemeWithCursorColor",
-                    "cursorColor": "#123456"
-                },
-                {
-                    "name": "schemeWithoutCursorColor"
-                }
-            ]
-        })" };
-
-        VerifyParseSucceeded(settings0String);
-
-        CascadiaSettings settings;
-        settings._ParseJsonString(settings0String, false);
-        settings.LayerJson(settings._userSettings);
-
-        VERIFY_ARE_EQUAL(6u, settings._profiles.size());
-        VERIFY_ARE_EQUAL(2u, settings._globals._colorSchemes.size());
-
-        auto terminalSettings0 = settings._profiles[0].CreateTerminalSettings(settings._globals._colorSchemes);
-        auto terminalSettings1 = settings._profiles[1].CreateTerminalSettings(settings._globals._colorSchemes);
-        auto terminalSettings2 = settings._profiles[2].CreateTerminalSettings(settings._globals._colorSchemes);
-        auto terminalSettings3 = settings._profiles[3].CreateTerminalSettings(settings._globals._colorSchemes);
-        auto terminalSettings4 = settings._profiles[4].CreateTerminalSettings(settings._globals._colorSchemes);
-        auto terminalSettings5 = settings._profiles[5].CreateTerminalSettings(settings._globals._colorSchemes);
-
-        VERIFY_ARE_EQUAL(ARGB(0, 0x12, 0x34, 0x56), terminalSettings0.CursorColor()); // from color scheme
-        VERIFY_ARE_EQUAL(DEFAULT_CURSOR_COLOR, terminalSettings1.CursorColor()); // default
-        VERIFY_ARE_EQUAL(ARGB(0, 0x23, 0x45, 0x67), terminalSettings2.CursorColor()); // from profile (trumps color scheme)
-        VERIFY_ARE_EQUAL(ARGB(0, 0x34, 0x56, 0x78), terminalSettings3.CursorColor()); // from profile (not set in color scheme)
-        VERIFY_ARE_EQUAL(ARGB(0, 0x45, 0x67, 0x89), terminalSettings4.CursorColor()); // from profile (no color scheme)
-        VERIFY_ARE_EQUAL(DEFAULT_CURSOR_COLOR, terminalSettings5.CursorColor()); // default
-    }
-
-    void SettingsTests::ValidateKeybindingsWarnings()
-    {
-        const std::string badSettings{ R"(
-        {
-            "globals": {
-                "defaultProfile": "{6239a42c-2222-49a3-80bd-e8fdd045185c}"
-            },
-            "profiles": [
-                {
-                    "name" : "profile0",
-                    "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}"
-                },
-                {
-                    "name" : "profile1",
-                    "guid": "{6239a42c-3333-49a3-80bd-e8fdd045185c}"
-                }
-            ],
-            "keybindings": [
-                { "command": { "action": "splitPane", "split":"auto" }, "keys": [ "ctrl+alt+t", "ctrl+a" ] },
-                { "command": { "action": "moveFocus" }, "keys": [ "ctrl+a" ] },
-                { "command": { "action": "resizePane" }, "keys": [ "ctrl+b" ] }
-            ]
-        })" };
-
-        const auto settingsObject = VerifyParseSucceeded(badSettings);
-        auto settings = CascadiaSettings::FromJson(settingsObject);
-
-        VERIFY_ARE_EQUAL(0u, settings->_globals._keybindings->_keyShortcuts.size());
-
-        VERIFY_ARE_EQUAL(3u, settings->_globals._keybindingsWarnings.size());
-        VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::TooManyKeysForChord, settings->_globals._keybindingsWarnings.at(0));
-        VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_globals._keybindingsWarnings.at(1));
-        VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_globals._keybindingsWarnings.at(2));
-
-        settings->_ValidateKeybindings();
-
-        VERIFY_ARE_EQUAL(4u, settings->_warnings.size());
-        VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::AtLeastOneKeybindingWarning, settings->_warnings.at(0));
-        VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::TooManyKeysForChord, settings->_warnings.at(1));
-        VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_warnings.at(2));
-        VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_warnings.at(3));
-    }
 }

src/cascadia/PublicTerminalCore/HwndTerminal.cpp

@@ -3,8 +3,6 @@
 
 #include "pch.h"
 #include "HwndTerminal.hpp"
-#include <windowsx.h>
-#include "../../types/TermControlUiaProvider.hpp"
 #include <DefaultSettings.h>
 #include "../../renderer/base/Renderer.hpp"
 #include "../../renderer/dx/DxRenderer.hpp"
@@ -16,54 +14,13 @@ using namespace ::Microsoft::Terminal::Core;
 
 static LPCWSTR term_window_class = L"HwndTerminalClass";
 
-LRESULT CALLBACK HwndTerminal::HwndTerminalWndProc(
+static LRESULT CALLBACK HwndTerminalWndProc(
     HWND hwnd,
     UINT uMsg,
     WPARAM wParam,
     LPARAM lParam) noexcept
 {
-#pragma warning(suppress : 26490) // Win32 APIs can only store void*, have to use reinterpret_cast
-    HwndTerminal* terminal = reinterpret_cast<HwndTerminal*>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
-
-    if (terminal)
-    {
-        switch (uMsg)
-        {
-        case WM_GETOBJECT:
-            if (lParam == UiaRootObjectId)
-            {
-                return UiaReturnRawElementProvider(hwnd, wParam, lParam, terminal->_GetUiaProvider());
-            }
-            break;
-        case WM_LBUTTONDOWN:
-            LOG_IF_FAILED(terminal->_StartSelection(lParam));
-            return 0;
-        case WM_MOUSEMOVE:
-            if (WI_IsFlagSet(wParam, MK_LBUTTON))
-            {
-                LOG_IF_FAILED(terminal->_MoveSelection(lParam));
-                return 0;
-            }
-            break;
-        case WM_RBUTTONDOWN:
-            if (terminal->_terminal->IsSelectionActive())
-            {
-                try
-                {
-                    const auto bufferData = terminal->_terminal->RetrieveSelectedTextFromBuffer(false);
-                    LOG_IF_FAILED(terminal->_CopyTextToSystemClipboard(bufferData, true));
-                    terminal->_terminal->ClearSelection();
-                }
-                CATCH_LOG();
-            }
-            else
-            {
-                terminal->_PasteTextFromClipboard();
-            }
-            return 0;
-        }
-    }
-    return DefWindowProc(hwnd, uMsg, wParam, lParam);
+    return DefWindowProcW(hwnd, uMsg, wParam, lParam);
 }
 
 static bool RegisterTermClass(HINSTANCE hInstance) noexcept
@@ -75,7 +32,7 @@ static bool RegisterTermClass(HINSTANCE hInstance) noexcept
     }
 
     wc.style = 0;
-    wc.lpfnWndProc = HwndTerminal::HwndTerminalWndProc;
+    wc.lpfnWndProc = HwndTerminalWndProc;
     wc.cbClsExtra = 0;
     wc.cbWndExtra = 0;
     wc.hInstance = hInstance;
@@ -90,11 +47,7 @@ static bool RegisterTermClass(HINSTANCE hInstance) noexcept
 
 HwndTerminal::HwndTerminal(HWND parentHwnd) :
     _desiredFont{ DEFAULT_FONT_FACE, 0, 10, { 0, 14 }, CP_UTF8 },
-    _actualFont{ DEFAULT_FONT_FACE, 0, 10, { 0, 14 }, CP_UTF8, false },
-    _uiaProvider{ nullptr },
-    _uiaProviderInitialized{ false },
-    _currentDpi{ USER_DEFAULT_SCREEN_DPI },
-    _pfnWriteCallback{ nullptr }
+    _actualFont{ DEFAULT_FONT_FACE, 0, 10, { 0, 14 }, CP_UTF8, false }
 {
     HINSTANCE hInstance = wil::GetModuleInstanceHandle();
 
@@ -116,9 +69,6 @@ HwndTerminal::HwndTerminal(HWND parentHwnd) :
             nullptr,
             hInstance,
             nullptr));
-
-#pragma warning(suppress : 26490) // Win32 APIs can only store void*, have to use reinterpret_cast
-        SetWindowLongPtr(_hwnd.get(), GWLP_USERDATA, reinterpret_cast<LONG_PTR>(this));
     }
 }
 
@@ -157,7 +107,7 @@ HRESULT HwndTerminal::Initialize()
     _terminal->Create(COORD{ 80, 25 }, 1000, *_renderer);
     _terminal->SetDefaultBackground(RGB(5, 27, 80));
     _terminal->SetDefaultForeground(RGB(255, 255, 255));
-    _terminal->SetWriteInputCallback([=](std::wstring & input) noexcept { _WriteTextToConnection(input); });
+
     localPointerToThread->EnablePainting();
 
     return S_OK;
@@ -168,39 +118,31 @@ void HwndTerminal::RegisterScrollCallback(std::function<void(int, int, int)> cal
     _terminal->SetScrollPositionChangedCallback(callback);
 }
 
-void HwndTerminal::_WriteTextToConnection(const std::wstring& input) noexcept
-{
-    if (!_pfnWriteCallback)
-    {
-        return;
-    }
-
-    try
-    {
-        auto callingText{ wil::make_cotaskmem_string(input.data(), input.size()) };
-        _pfnWriteCallback(callingText.release());
-    }
-    CATCH_LOG();
-}
-
 void HwndTerminal::RegisterWriteCallback(const void _stdcall callback(wchar_t*))
 {
-    _pfnWriteCallback = callback;
-}
+    _terminal->SetWriteInputCallback([=](std::wstring & input) noexcept {
+        const wchar_t* text = input.c_str();
+        const size_t textChars = wcslen(text) + 1;
+        const size_t textBytes = textChars * sizeof(wchar_t);
+        wchar_t* callingText = nullptr;
 
-::Microsoft::Console::Types::IUiaData* HwndTerminal::GetUiaData() const noexcept
-{
-    return _terminal.get();
-}
+        callingText = static_cast<wchar_t*>(::CoTaskMemAlloc(textBytes));
 
-HWND HwndTerminal::GetHwnd() const noexcept
-{
-    return _hwnd.get();
+        if (callingText == nullptr)
+        {
+            callback(nullptr);
+        }
+        else
+        {
+            wcscpy_s(callingText, textChars, text);
+
+            callback(callingText);
+        }
+    });
 }
 
 void HwndTerminal::_UpdateFont(int newDpi)
 {
-    _currentDpi = newDpi;
     auto lock = _terminal->LockForWriting();
 
     // TODO: MSFT:20895307 If the font doesn't exist, this doesn't
@@ -208,33 +150,6 @@ void HwndTerminal::_UpdateFont(int newDpi)
     _renderer->TriggerFontChange(newDpi, _desiredFont, _actualFont);
 }
 
-IRawElementProviderSimple* HwndTerminal::_GetUiaProvider() noexcept
-{
-    if (nullptr == _uiaProvider && !_uiaProviderInitialized)
-    {
-        std::unique_lock<std::shared_mutex> lock;
-        try
-        {
-#pragma warning(suppress : 26441) // The lock is named, this appears to be a false positive
-            lock = _terminal->LockForWriting();
-            if (_uiaProviderInitialized)
-            {
-                return _uiaProvider.Get();
-            }
-
-            LOG_IF_FAILED(::Microsoft::WRL::MakeAndInitialize<::Microsoft::Terminal::TermControlUiaProvider>(&_uiaProvider, this->GetUiaData(), this));
-        }
-        catch (...)
-        {
-            LOG_HR(wil::ResultFromCaughtException());
-            _uiaProvider = nullptr;
-        }
-        _uiaProviderInitialized = true;
-    }
-
-    return _uiaProvider.Get();
-}
-
 HRESULT HwndTerminal::Refresh(const SIZE windowSize, _Out_ COORD* dimensions)
 {
     RETURN_HR_IF_NULL(E_INVALIDARG, dimensions);
@@ -271,29 +186,10 @@ void HwndTerminal::SendOutput(std::wstring_view data)
 
 HRESULT _stdcall CreateTerminal(HWND parentHwnd, _Out_ void** hwnd, _Out_ void** terminal)
 {
-    // In order for UIA to hook up properly there needs to be a "static" window hosting the
-    // inner win32 control. If the static window is not present then WM_GETOBJECT messages
-    // will not reach the child control, and the uia element will not be present in the tree.
-    auto _hostWindow = CreateWindowEx(
-        0,
-        L"static",
-        nullptr,
-        WS_CHILD |
-            WS_CLIPCHILDREN |
-            WS_CLIPSIBLINGS |
-            WS_VISIBLE,
-        0,
-        0,
-        0,
-        0,
-        parentHwnd,
-        nullptr,
-        nullptr,
-        nullptr);
-    auto _terminal = std::make_unique<HwndTerminal>(_hostWindow);
+    auto _terminal = std::make_unique<HwndTerminal>(parentHwnd);
     RETURN_IF_FAILED(_terminal->Initialize());
 
-    *hwnd = _hostWindow;
+    *hwnd = _terminal->_hwnd.get();
     *terminal = _terminal.release();
 
     return S_OK;
@@ -321,15 +217,6 @@ HRESULT _stdcall TerminalTriggerResize(void* terminal, double width, double heig
 {
     const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
 
-    LOG_IF_WIN32_BOOL_FALSE(SetWindowPos(
-        publicTerminal->GetHwnd(),
-        nullptr,
-        0,
-        0,
-        static_cast<int>(width),
-        static_cast<int>(height),
-        0));
-
     const SIZE windowSize{ static_cast<short>(width), static_cast<short>(height) };
     return publicTerminal->Refresh(windowSize, dimensions);
 }
@@ -346,54 +233,45 @@ void _stdcall TerminalUserScroll(void* terminal, int viewTop)
     publicTerminal->_terminal->UserScrollViewport(viewTop);
 }
 
-HRESULT HwndTerminal::_StartSelection(LPARAM lParam) noexcept
-try
+HRESULT _stdcall TerminalStartSelection(void* terminal, COORD cursorPosition, bool altPressed)
 {
-    const bool altPressed = GetKeyState(VK_MENU) < 0;
-    COORD cursorPosition{
-        GET_X_LPARAM(lParam),
-        GET_Y_LPARAM(lParam),
-    };
+    COORD terminalPosition = { cursorPosition };
 
-    const auto fontSize = this->_actualFont.GetSize();
+    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
+    const auto fontSize = publicTerminal->_actualFont.GetSize();
 
     RETURN_HR_IF(E_NOT_VALID_STATE, fontSize.X == 0);
     RETURN_HR_IF(E_NOT_VALID_STATE, fontSize.Y == 0);
 
-    cursorPosition.X /= fontSize.X;
-    cursorPosition.Y /= fontSize.Y;
+    terminalPosition.X /= fontSize.X;
+    terminalPosition.Y /= fontSize.Y;
 
-    this->_terminal->SetSelectionAnchor(cursorPosition);
-    this->_terminal->SetBlockSelection(altPressed);
+    publicTerminal->_terminal->SetSelectionAnchor(terminalPosition);
+    publicTerminal->_terminal->SetBoxSelection(altPressed);
 
-    this->_renderer->TriggerSelection();
+    publicTerminal->_renderer->TriggerSelection();
 
     return S_OK;
 }
-CATCH_RETURN();
 
-HRESULT HwndTerminal::_MoveSelection(LPARAM lParam) noexcept
-try
+HRESULT _stdcall TerminalMoveSelection(void* terminal, COORD cursorPosition)
 {
-    COORD cursorPosition{
-        GET_X_LPARAM(lParam),
-        GET_Y_LPARAM(lParam),
-    };
+    COORD terminalPosition = { cursorPosition };
 
-    const auto fontSize = this->_actualFont.GetSize();
+    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
+    const auto fontSize = publicTerminal->_actualFont.GetSize();
 
     RETURN_HR_IF(E_NOT_VALID_STATE, fontSize.X == 0);
     RETURN_HR_IF(E_NOT_VALID_STATE, fontSize.Y == 0);
 
-    cursorPosition.X /= fontSize.X;
-    cursorPosition.Y /= fontSize.Y;
+    terminalPosition.X /= fontSize.X;
+    terminalPosition.Y /= fontSize.Y;
 
-    this->_terminal->SetSelectionEnd(cursorPosition);
-    this->_renderer->TriggerSelection();
+    publicTerminal->_terminal->SetEndSelectionPosition(terminalPosition);
+    publicTerminal->_renderer->TriggerSelection();
 
     return S_OK;
 }
-CATCH_RETURN();
 
 void _stdcall TerminalClearSelection(void* terminal)
 {
@@ -527,181 +405,11 @@ void _stdcall TerminalBlinkCursor(void* terminal)
         return;
     }
 
-    publicTerminal->_terminal->SetCursorOn(!publicTerminal->_terminal->IsCursorOn());
+    publicTerminal->_terminal->SetCursorVisible(!publicTerminal->_terminal->IsCursorVisible());
 }
 
 void _stdcall TerminalSetCursorVisible(void* terminal, const bool visible)
 {
     const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
-    publicTerminal->_terminal->SetCursorOn(visible);
-}
-
-// Routine Description:
-// - Copies the text given onto the global system clipboard.
-// Arguments:
-// - rows - Rows of text data to copy
-// - fAlsoCopyFormatting - true if the color and formatting should also be copied, false otherwise
-HRESULT HwndTerminal::_CopyTextToSystemClipboard(const TextBuffer::TextAndColor& rows, bool const fAlsoCopyFormatting)
-{
-    std::wstring finalString;
-
-    // Concatenate strings into one giant string to put onto the clipboard.
-    for (const auto& str : rows.text)
-    {
-        finalString += str;
-    }
-
-    // allocate the final clipboard data
-    const size_t cchNeeded = finalString.size() + 1;
-    const size_t cbNeeded = sizeof(wchar_t) * cchNeeded;
-    wil::unique_hglobal globalHandle(GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, cbNeeded));
-    RETURN_LAST_ERROR_IF_NULL(globalHandle.get());
-
-    PWSTR pwszClipboard = static_cast<PWSTR>(GlobalLock(globalHandle.get()));
-    RETURN_LAST_ERROR_IF_NULL(pwszClipboard);
-
-    // The pattern gets a bit strange here because there's no good wil built-in for global lock of this type.
-    // Try to copy then immediately unlock. Don't throw until after (so the hglobal won't be freed until we unlock).
-    const HRESULT hr = StringCchCopyW(pwszClipboard, cchNeeded, finalString.data());
-    GlobalUnlock(globalHandle.get());
-    RETURN_IF_FAILED(hr);
-
-    // Set global data to clipboard
-    RETURN_LAST_ERROR_IF(!OpenClipboard(_hwnd.get()));
-
-    { // Clipboard Scope
-        auto clipboardCloser = wil::scope_exit([]() noexcept {
-            LOG_LAST_ERROR_IF(!CloseClipboard());
-        });
-
-        RETURN_LAST_ERROR_IF(!EmptyClipboard());
-        RETURN_LAST_ERROR_IF_NULL(SetClipboardData(CF_UNICODETEXT, globalHandle.get()));
-
-        if (fAlsoCopyFormatting)
-        {
-            const auto& fontData = _actualFont;
-            int const iFontHeightPoints = fontData.GetUnscaledSize().Y * 72 / this->_currentDpi;
-            const COLORREF bgColor = _terminal->GetBackgroundColor(_terminal->GetDefaultBrushColors());
-
-            std::string HTMLToPlaceOnClip = TextBuffer::GenHTML(rows, iFontHeightPoints, fontData.GetFaceName(), bgColor, "Hwnd Console Host");
-            _CopyToSystemClipboard(HTMLToPlaceOnClip, L"HTML Format");
-
-            std::string RTFToPlaceOnClip = TextBuffer::GenRTF(rows, iFontHeightPoints, fontData.GetFaceName(), bgColor);
-            _CopyToSystemClipboard(RTFToPlaceOnClip, L"Rich Text Format");
-        }
-    }
-
-    // only free if we failed.
-    // the memory has to remain allocated if we successfully placed it on the clipboard.
-    // Releasing the smart pointer will leave it allocated as we exit scope.
-    globalHandle.release();
-
-    return S_OK;
-}
-
-// Routine Description:
-// - Copies the given string onto the global system clipboard in the specified format
-// Arguments:
-// - stringToCopy - The string to copy
-// - lpszFormat - the name of the format
-HRESULT HwndTerminal::_CopyToSystemClipboard(std::string stringToCopy, LPCWSTR lpszFormat)
-{
-    const size_t cbData = stringToCopy.size() + 1; // +1 for '\0'
-    if (cbData)
-    {
-        wil::unique_hglobal globalHandleData(GlobalAlloc(GMEM_MOVEABLE | GMEM_DDESHARE, cbData));
-        RETURN_LAST_ERROR_IF_NULL(globalHandleData.get());
-
-        PSTR pszClipboardHTML = static_cast<PSTR>(GlobalLock(globalHandleData.get()));
-        RETURN_LAST_ERROR_IF_NULL(pszClipboardHTML);
-
-        // The pattern gets a bit strange here because there's no good wil built-in for global lock of this type.
-        // Try to copy then immediately unlock. Don't throw until after (so the hglobal won't be freed until we unlock).
-        const HRESULT hr2 = StringCchCopyA(pszClipboardHTML, cbData, stringToCopy.data());
-        GlobalUnlock(globalHandleData.get());
-        RETURN_IF_FAILED(hr2);
-
-        UINT const CF_FORMAT = RegisterClipboardFormatW(lpszFormat);
-        RETURN_LAST_ERROR_IF(0 == CF_FORMAT);
-
-        RETURN_LAST_ERROR_IF_NULL(SetClipboardData(CF_FORMAT, globalHandleData.get()));
-
-        // only free if we failed.
-        // the memory has to remain allocated if we successfully placed it on the clipboard.
-        // Releasing the smart pointer will leave it allocated as we exit scope.
-        globalHandleData.release();
-    }
-
-    return S_OK;
-}
-
-void HwndTerminal::_PasteTextFromClipboard() noexcept
-{
-    // Get paste data from clipboard
-    if (!OpenClipboard(_hwnd.get()))
-    {
-        return;
-    }
-
-    HANDLE ClipboardDataHandle = GetClipboardData(CF_UNICODETEXT);
-    if (ClipboardDataHandle == nullptr)
-    {
-        CloseClipboard();
-        return;
-    }
-
-    PCWCH pwstr = static_cast<PCWCH>(GlobalLock(ClipboardDataHandle));
-
-    _StringPaste(pwstr);
-
-    GlobalUnlock(ClipboardDataHandle);
-
-    CloseClipboard();
-}
-
-void HwndTerminal::_StringPaste(const wchar_t* const pData) noexcept
-{
-    if (pData == nullptr)
-    {
-        return;
-    }
-
-    try
-    {
-        std::wstring text(pData);
-        _WriteTextToConnection(text);
-    }
-    CATCH_LOG();
-}
-
-COORD HwndTerminal::GetFontSize() const
-{
-    return _actualFont.GetSize();
-}
-
-RECT HwndTerminal::GetBounds() const noexcept
-{
-    RECT windowRect;
-    GetWindowRect(_hwnd.get(), &windowRect);
-    return windowRect;
-}
-
-RECT HwndTerminal::GetPadding() const noexcept
-{
-    return { 0 };
-}
-
-double HwndTerminal::GetScaleFactor() const noexcept
-{
-    return static_cast<double>(_currentDpi) / static_cast<double>(USER_DEFAULT_SCREEN_DPI);
-}
-
-void HwndTerminal::ChangeViewport(const SMALL_RECT NewWindow)
-{
-    _terminal->UserScrollViewport(NewWindow.Top);
-}
-
-HRESULT HwndTerminal::GetHostUiaProvider(IRawElementProviderSimple** provider) noexcept
-{
-    return UiaHostProviderFromHwnd(_hwnd.get(), provider);
+    publicTerminal->_terminal->SetCursorVisible(visible);
 }

src/cascadia/PublicTerminalCore/HwndTerminal.hpp

@@ -6,9 +6,6 @@
 #include "../../renderer/base/Renderer.hpp"
 #include "../../renderer/dx/DxRenderer.hpp"
 #include "../../cascadia/TerminalCore/Terminal.hpp"
-#include <UIAutomationCore.h>
-#include "../../types/IControlAccessibilityInfo.h"
-#include "../../types/TermControlUiaProvider.hpp"
 
 using namespace Microsoft::Console::VirtualTerminal;
 
@@ -28,6 +25,8 @@ __declspec(dllexport) HRESULT _stdcall TerminalTriggerResize(void* terminal, dou
 __declspec(dllexport) HRESULT _stdcall TerminalResize(void* terminal, COORD dimensions);
 __declspec(dllexport) void _stdcall TerminalDpiChanged(void* terminal, int newDpi);
 __declspec(dllexport) void _stdcall TerminalUserScroll(void* terminal, int viewTop);
+__declspec(dllexport) HRESULT _stdcall TerminalStartSelection(void* terminal, COORD cursorPosition, bool altPressed);
+__declspec(dllexport) HRESULT _stdcall TerminalMoveSelection(void* terminal, COORD cursorPosition);
 __declspec(dllexport) void _stdcall TerminalClearSelection(void* terminal);
 __declspec(dllexport) const wchar_t* _stdcall TerminalGetSelection(void* terminal);
 __declspec(dllexport) bool _stdcall TerminalIsSelectionActive(void* terminal);
@@ -40,35 +39,20 @@ __declspec(dllexport) void _stdcall TerminalBlinkCursor(void* terminal);
 __declspec(dllexport) void _stdcall TerminalSetCursorVisible(void* terminal, const bool visible);
 };
 
-struct HwndTerminal : ::Microsoft::Console::Types::IControlAccessibilityInfo
+struct HwndTerminal
 {
 public:
     HwndTerminal(HWND hwnd);
-
-    HwndTerminal(const HwndTerminal&) = default;
-    HwndTerminal(HwndTerminal&&) = default;
-    HwndTerminal& operator=(const HwndTerminal&) = default;
-    HwndTerminal& operator=(HwndTerminal&&) = default;
-    ~HwndTerminal() = default;
-
     HRESULT Initialize();
     void SendOutput(std::wstring_view data);
     HRESULT Refresh(const SIZE windowSize, _Out_ COORD* dimensions);
     void RegisterScrollCallback(std::function<void(int, int, int)> callback);
     void RegisterWriteCallback(const void _stdcall callback(wchar_t*));
-    ::Microsoft::Console::Types::IUiaData* GetUiaData() const noexcept;
-    HWND GetHwnd() const noexcept;
-
-    static LRESULT CALLBACK HwndTerminalWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) noexcept;
 
 private:
     wil::unique_hwnd _hwnd;
     FontInfoDesired _desiredFont;
     FontInfo _actualFont;
-    int _currentDpi;
-    bool _uiaProviderInitialized;
-    std::function<void(wchar_t*)> _pfnWriteCallback;
-    ::Microsoft::WRL::ComPtr<::Microsoft::Terminal::TermControlUiaProvider> _uiaProvider;
 
     std::unique_ptr<::Microsoft::Terminal::Core::Terminal> _terminal;
 
@@ -79,6 +63,8 @@ private:
     friend HRESULT _stdcall TerminalResize(void* terminal, COORD dimensions);
     friend void _stdcall TerminalDpiChanged(void* terminal, int newDpi);
     friend void _stdcall TerminalUserScroll(void* terminal, int viewTop);
+    friend HRESULT _stdcall TerminalStartSelection(void* terminal, COORD cursorPosition, bool altPressed);
+    friend HRESULT _stdcall TerminalMoveSelection(void* terminal, COORD cursorPosition);
     friend void _stdcall TerminalClearSelection(void* terminal);
     friend const wchar_t* _stdcall TerminalGetSelection(void* terminal);
     friend bool _stdcall TerminalIsSelectionActive(void* terminal);
@@ -87,23 +73,5 @@ private:
     friend void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR fontFamily, short fontSize, int newDpi);
     friend void _stdcall TerminalBlinkCursor(void* terminal);
     friend void _stdcall TerminalSetCursorVisible(void* terminal, const bool visible);
-
     void _UpdateFont(int newDpi);
-    void _WriteTextToConnection(const std::wstring& text) noexcept;
-    HRESULT _CopyTextToSystemClipboard(const TextBuffer::TextAndColor& rows, bool const fAlsoCopyFormatting);
-    HRESULT _CopyToSystemClipboard(std::string stringToCopy, LPCWSTR lpszFormat);
-    void _PasteTextFromClipboard() noexcept;
-    void _StringPaste(const wchar_t* const pData) noexcept;
-
-    HRESULT _StartSelection(LPARAM lParam) noexcept;
-    HRESULT _MoveSelection(LPARAM lParam) noexcept;
-    IRawElementProviderSimple* _GetUiaProvider() noexcept;
-
-    // Inherited via IControlAccessibilityInfo
-    COORD GetFontSize() const override;
-    RECT GetBounds() const noexcept override;
-    double GetScaleFactor() const noexcept override;
-    void ChangeViewport(const SMALL_RECT NewWindow) override;
-    HRESULT GetHostUiaProvider(IRawElementProviderSimple** provider) noexcept override;
-    RECT GetPadding() const noexcept override;
 };

src/cascadia/PublicTerminalCore/PublicTerminalCore.vcxproj

@@ -54,7 +54,7 @@
        instead of APISet forwarders for easier Windows 7 compatibility. -->
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalDependencies>Uiautomationcore.lib;onecoreuap.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>onecoreuap.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
 </Project>

src/cascadia/PublicTerminalCore/pch.h

@@ -1,8 +1,4 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN // If this is not defined, windows.h includes commdlg.h which defines FindText globally and conflicts with UIAutomation ITextRangeProvider.
-#endif
-
 #include <LibraryIncludes.h>

src/cascadia/TerminalApp/ActionArgs.h

@@ -17,7 +17,6 @@
 
 #include "../../cascadia/inc/cppwinrt_utils.h"
 #include "Utils.h"
-#include "TerminalWarnings.h"
 
 // Notes on defining ActionArgs and ActionEventArgs:
 // * All properties specific to an action should be defined as an ActionArgs
@@ -27,8 +26,6 @@
 
 namespace winrt::TerminalApp::implementation
 {
-    using FromJsonResult = std::tuple<winrt::TerminalApp::IActionArgs, std::vector<::TerminalApp::SettingsLoadWarnings>>;
-
     struct ActionEventArgs : public ActionEventArgsT<ActionEventArgs>
     {
         ActionEventArgs() = default;
@@ -107,7 +104,7 @@ namespace winrt::TerminalApp::implementation
             }
             return false;
         };
-        static FromJsonResult FromJson(const Json::Value& json)
+        static winrt::TerminalApp::IActionArgs FromJson(const Json::Value& json)
         {
             // LOAD BEARING: Not using make_self here _will_ break you in the future!
             auto args = winrt::make_self<CopyTextArgs>();
@@ -115,7 +112,7 @@ namespace winrt::TerminalApp::implementation
             {
                 args->_TrimWhitespace = trimWhitespace.asBool();
             }
-            return { *args, {} };
+            return *args;
         }
     };
 
@@ -134,12 +131,12 @@ namespace winrt::TerminalApp::implementation
             }
             return false;
         };
-        static FromJsonResult FromJson(const Json::Value& json)
+        static winrt::TerminalApp::IActionArgs FromJson(const Json::Value& json)
         {
             // LOAD BEARING: Not using make_self here _will_ break you in the future!
             auto args = winrt::make_self<NewTabArgs>();
             args->_TerminalArgs = NewTerminalArgs::FromJson(json);
-            return { *args, {} };
+            return *args;
         }
     };
 
@@ -160,7 +157,7 @@ namespace winrt::TerminalApp::implementation
             }
             return false;
         };
-        static FromJsonResult FromJson(const Json::Value& json)
+        static winrt::TerminalApp::IActionArgs FromJson(const Json::Value& json)
         {
             // LOAD BEARING: Not using make_self here _will_ break you in the future!
             auto args = winrt::make_self<SwitchToTabArgs>();
@@ -168,7 +165,7 @@ namespace winrt::TerminalApp::implementation
             {
                 args->_TabIndex = tabIndex.asUInt();
             }
-            return { *args, {} };
+            return *args;
         }
     };
 
@@ -224,7 +221,7 @@ namespace winrt::TerminalApp::implementation
             }
             return false;
         };
-        static FromJsonResult FromJson(const Json::Value& json)
+        static winrt::TerminalApp::IActionArgs FromJson(const Json::Value& json)
         {
             // LOAD BEARING: Not using make_self here _will_ break you in the future!
             auto args = winrt::make_self<ResizePaneArgs>();
@@ -232,14 +229,7 @@ namespace winrt::TerminalApp::implementation
             {
                 args->_Direction = ParseDirection(directionString.asString());
             }
-            if (args->_Direction == TerminalApp::Direction::None)
-            {
-                return { nullptr, { ::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
-            }
-            else
-            {
-                return { *args, {} };
-            }
+            return *args;
         }
     };
 
@@ -260,7 +250,7 @@ namespace winrt::TerminalApp::implementation
             }
             return false;
         };
-        static FromJsonResult FromJson(const Json::Value& json)
+        static winrt::TerminalApp::IActionArgs FromJson(const Json::Value& json)
         {
             // LOAD BEARING: Not using make_self here _will_ break you in the future!
             auto args = winrt::make_self<MoveFocusArgs>();
@@ -268,14 +258,7 @@ namespace winrt::TerminalApp::implementation
             {
                 args->_Direction = ParseDirection(directionString.asString());
             }
-            if (args->_Direction == TerminalApp::Direction::None)
-            {
-                return { nullptr, { ::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
-            }
-            else
-            {
-                return { *args, {} };
-            }
+            return *args;
         }
     };
 
@@ -296,7 +279,7 @@ namespace winrt::TerminalApp::implementation
             }
             return false;
         };
-        static FromJsonResult FromJson(const Json::Value& json)
+        static winrt::TerminalApp::IActionArgs FromJson(const Json::Value& json)
         {
             // LOAD BEARING: Not using make_self here _will_ break you in the future!
             auto args = winrt::make_self<AdjustFontSizeArgs>();
@@ -304,7 +287,7 @@ namespace winrt::TerminalApp::implementation
             {
                 args->_Delta = jsonDelta.asInt();
             }
-            return { *args, {} };
+            return *args;
         }
     };
 
@@ -331,26 +314,13 @@ namespace winrt::TerminalApp::implementation
         return TerminalApp::SplitState::None;
     };
 
-    // Possible SplitType values
-    static constexpr std::string_view DuplicateKey{ "duplicate" };
-    static TerminalApp::SplitType ParseSplitModeState(const std::string& stateString)
-    {
-        if (stateString == DuplicateKey)
-        {
-            return TerminalApp::SplitType::Duplicate;
-        }
-        return TerminalApp::SplitType::Manual;
-    }
-
     struct SplitPaneArgs : public SplitPaneArgsT<SplitPaneArgs>
     {
         SplitPaneArgs() = default;
         GETSET_PROPERTY(winrt::TerminalApp::SplitState, SplitStyle, winrt::TerminalApp::SplitState::None);
         GETSET_PROPERTY(winrt::TerminalApp::NewTerminalArgs, TerminalArgs, nullptr);
-        GETSET_PROPERTY(winrt::TerminalApp::SplitType, SplitMode, winrt::TerminalApp::SplitType::Manual);
 
         static constexpr std::string_view SplitKey{ "split" };
-        static constexpr std::string_view SplitModeKey{ "splitMode" };
 
     public:
         bool Equals(const IActionArgs& other)
@@ -359,12 +329,11 @@ namespace winrt::TerminalApp::implementation
             if (otherAsUs)
             {
                 return otherAsUs->_SplitStyle == _SplitStyle &&
-                       otherAsUs->_TerminalArgs == _TerminalArgs &&
-                       otherAsUs->_SplitMode == _SplitMode;
+                       otherAsUs->_TerminalArgs == _TerminalArgs;
             }
             return false;
         };
-        static FromJsonResult FromJson(const Json::Value& json)
+        static winrt::TerminalApp::IActionArgs FromJson(const Json::Value& json)
         {
             // LOAD BEARING: Not using make_self here _will_ break you in the future!
             auto args = winrt::make_self<SplitPaneArgs>();
@@ -373,11 +342,7 @@ namespace winrt::TerminalApp::implementation
             {
                 args->_SplitStyle = ParseSplitState(jsonStyle.asString());
             }
-            if (auto jsonStyle{ json[JsonKey(SplitModeKey)] })
-            {
-                args->_SplitMode = ParseSplitModeState(jsonStyle.asString());
-            }
-            return { *args, {} };
+            return *args;
         }
     };
 }

src/cascadia/TerminalApp/ActionArgs.idl

@@ -31,12 +31,6 @@ namespace TerminalApp
         Horizontal = 2
     };
 
-    enum SplitType
-    {
-        Manual = 0,
-        Duplicate = 1
-    };
-
     [default_interface] runtimeclass NewTerminalArgs {
         NewTerminalArgs();
         String Commandline;
@@ -88,6 +82,5 @@ namespace TerminalApp
     {
         SplitState SplitStyle { get; };
         NewTerminalArgs TerminalArgs { get; };
-        SplitType SplitMode { get; };
     };
 }

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -98,7 +98,7 @@ namespace winrt::TerminalApp::implementation
         }
         else if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::SplitPaneArgs>())
         {
-            _SplitPane(realArgs.SplitStyle(), realArgs.SplitMode(), realArgs.TerminalArgs());
+            _SplitPane(realArgs.SplitStyle(), realArgs.TerminalArgs());
             args.Handled(true);
         }
     }

src/cascadia/TerminalApp/AppKeyBindings.h

@@ -53,7 +53,7 @@ namespace winrt::TerminalApp::implementation
         static Windows::System::VirtualKeyModifiers ConvertVKModifiers(winrt::Microsoft::Terminal::Settings::KeyModifiers modifiers);
 
         // Defined in AppKeyBindingsSerialization.cpp
-        std::vector<::TerminalApp::SettingsLoadWarnings> LayerJson(const Json::Value& json);
+        void LayerJson(const Json::Value& json);
         Json::Value ToJson();
 
         void SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch);

src/cascadia/TerminalApp/AppKeyBindingsSerialization.cpp

@@ -146,9 +146,6 @@ static const std::map<std::string_view, ShortcutAction, std::less<>> commandName
     { FindKey, ShortcutAction::Find },
 };
 
-using ParseResult = std::tuple<IActionArgs, std::vector<TerminalApp::SettingsLoadWarnings>>;
-using ParseActionFunction = std::function<ParseResult(const Json::Value&)>;
-
 // Function Description:
 // - Creates a function that can be used to generate a SplitPaneArgs for the
 //   legacy Split[SplitState] actions. These actions don't accept args from
@@ -160,12 +157,12 @@ using ParseActionFunction = std::function<ParseResult(const Json::Value&)>;
 // Return Value:
 // - A function that can be used to "parse" json into one of the legacy
 //   Split[SplitState] args.
-ParseActionFunction LegacyParseSplitPaneArgs(SplitState style)
+std::function<IActionArgs(const Json::Value&)> LegacyParseSplitPaneArgs(SplitState style)
 {
-    auto pfn = [style](const Json::Value & /*value*/) -> ParseResult {
+    auto pfn = [style](const Json::Value & /*value*/) -> IActionArgs {
         auto args = winrt::make_self<winrt::TerminalApp::implementation::SplitPaneArgs>();
         args->SplitStyle(style);
-        return { *args, {} };
+        return *args;
     };
     return pfn;
 }
@@ -181,12 +178,12 @@ ParseActionFunction LegacyParseSplitPaneArgs(SplitState style)
 // Return Value:
 // - A function that can be used to "parse" json into one of the legacy
 //   MoveFocus[Direction] args.
-ParseActionFunction LegacyParseMoveFocusArgs(Direction direction)
+std::function<IActionArgs(const Json::Value&)> LegacyParseMoveFocusArgs(Direction direction)
 {
-    auto pfn = [direction](const Json::Value & /*value*/) -> ParseResult {
+    auto pfn = [direction](const Json::Value & /*value*/) -> IActionArgs {
         auto args = winrt::make_self<winrt::TerminalApp::implementation::MoveFocusArgs>();
         args->Direction(direction);
-        return { *args, {} };
+        return *args;
     };
     return pfn;
 }
@@ -202,12 +199,12 @@ ParseActionFunction LegacyParseMoveFocusArgs(Direction direction)
 // Return Value:
 // - A function that can be used to "parse" json into one of the legacy
 //   ResizePane[Direction] args.
-ParseActionFunction LegacyParseResizePaneArgs(Direction direction)
+std::function<IActionArgs(const Json::Value&)> LegacyParseResizePaneArgs(Direction direction)
 {
-    auto pfn = [direction](const Json::Value & /*value*/) -> ParseResult {
+    auto pfn = [direction](const Json::Value & /*value*/) -> IActionArgs {
         auto args = winrt::make_self<winrt::TerminalApp::implementation::ResizePaneArgs>();
         args->Direction(direction);
-        return { *args, {} };
+        return *args;
     };
     return pfn;
 }
@@ -223,14 +220,14 @@ ParseActionFunction LegacyParseResizePaneArgs(Direction direction)
 // Return Value:
 // - A function that can be used to "parse" json into one of the legacy
 //   NewTabWithProfile[Index] args.
-ParseActionFunction LegacyParseNewTabWithProfileArgs(int index)
+std::function<IActionArgs(const Json::Value&)> LegacyParseNewTabWithProfileArgs(int index)
 {
-    auto pfn = [index](const Json::Value & /*value*/) -> ParseResult {
+    auto pfn = [index](const Json::Value & /*value*/) -> IActionArgs {
         auto args = winrt::make_self<winrt::TerminalApp::implementation::NewTabArgs>();
         auto newTerminalArgs = winrt::make_self<winrt::TerminalApp::implementation::NewTerminalArgs>();
         newTerminalArgs->ProfileIndex(index);
         args->TerminalArgs(*newTerminalArgs);
-        return { *args, {} };
+        return *args;
     };
     return pfn;
 }
@@ -246,12 +243,12 @@ ParseActionFunction LegacyParseNewTabWithProfileArgs(int index)
 // Return Value:
 // - A function that can be used to "parse" json into one of the legacy
 //   SwitchToTab[Index] args.
-ParseActionFunction LegacyParseSwitchToTabArgs(int index)
+std::function<IActionArgs(const Json::Value&)> LegacyParseSwitchToTabArgs(int index)
 {
-    auto pfn = [index](const Json::Value & /*value*/) -> ParseResult {
+    auto pfn = [index](const Json::Value & /*value*/) -> IActionArgs {
         auto args = winrt::make_self<winrt::TerminalApp::implementation::SwitchToTabArgs>();
         args->TabIndex(index);
-        return { *args, {} };
+        return *args;
     };
     return pfn;
 }
@@ -264,11 +261,11 @@ ParseActionFunction LegacyParseSwitchToTabArgs(int index)
 // - direction: the direction to create the parse function for.
 // Return Value:
 // - A CopyTextArgs with TrimWhitespace set to true, to emulate "CopyTextWithoutNewlines".
-ParseResult LegacyParseCopyTextWithoutNewlinesArgs(const Json::Value& /*json*/)
+IActionArgs LegacyParseCopyTextWithoutNewlinesArgs(const Json::Value& /*json*/)
 {
     auto args = winrt::make_self<winrt::TerminalApp::implementation::CopyTextArgs>();
     args->TrimWhitespace(false);
-    return { *args, {} };
+    return *args;
 };
 
 // Function Description:
@@ -279,12 +276,12 @@ ParseResult LegacyParseCopyTextWithoutNewlinesArgs(const Json::Value& /*json*/)
 // - delta: the font size delta to create the parse function for.
 // Return Value:
 // - A function that can be used to "parse" json into an AdjustFontSizeArgs.
-ParseActionFunction LegacyParseAdjustFontSizeArgs(int delta)
+std::function<IActionArgs(const Json::Value&)> LegacyParseAdjustFontSizeArgs(int delta)
 {
-    auto pfn = [delta](const Json::Value & /*value*/) -> ParseResult {
+    auto pfn = [delta](const Json::Value & /*value*/) -> IActionArgs {
         auto args = winrt::make_self<winrt::TerminalApp::implementation::AdjustFontSizeArgs>();
         args->Delta(delta);
-        return { *args, {} };
+        return *args;
     };
     return pfn;
 }
@@ -294,7 +291,7 @@ ParseActionFunction LegacyParseAdjustFontSizeArgs(int delta)
 // from json. Each type of IActionArgs that can accept arbitrary args should be
 // placed into this map, with the corresponding deserializer function as the
 // value.
-static const std::map<ShortcutAction, ParseActionFunction, std::less<>> argParsers{
+static const std::map<ShortcutAction, std::function<IActionArgs(const Json::Value&)>, std::less<>> argParsers{
     { ShortcutAction::CopyText, winrt::TerminalApp::implementation::CopyTextArgs::FromJson },
     { ShortcutAction::CopyTextWithoutNewlines, LegacyParseCopyTextWithoutNewlinesArgs },
 
@@ -430,14 +427,8 @@ static ShortcutAction GetActionFromString(const std::string_view actionString)
 //   `"unbound"`, then we'll clear the keybinding from the existing keybindings.
 // Arguments:
 // - json: and array of JsonObject's to deserialize into our _keyShortcuts mapping.
-std::vector<::TerminalApp::SettingsLoadWarnings> winrt::TerminalApp::implementation::AppKeyBindings::LayerJson(const Json::Value& json)
+void winrt::TerminalApp::implementation::AppKeyBindings::LayerJson(const Json::Value& json)
 {
-    // It's possible that the user provided keybindings have some warnings in
-    // them - problems that we should alert the user to, but we can recover
-    // from. Most of these warnings cannot be detected later in the Validate
-    // settings phase, so we'll collect them now.
-    std::vector<::TerminalApp::SettingsLoadWarnings> warnings;
-
     for (const auto& value : json)
     {
         if (!value.isObject())
@@ -450,22 +441,11 @@ std::vector<::TerminalApp::SettingsLoadWarnings> winrt::TerminalApp::implementat
 
         if (keys)
         {
-            const auto validString = keys.isString();
-            const auto validArray = keys.isArray() && keys.size() == 1;
-
-            // GH#4239 - If the user provided more than one key
-            // chord to a "keys" array, warn the user here.
-            // TODO: GH#1334 - remove this check.
-            if (keys.isArray() && keys.size() > 1)
-            {
-                warnings.push_back(::TerminalApp::SettingsLoadWarnings::TooManyKeysForChord);
-            }
-
-            if (!validString && !validArray)
+            if (!keys.isArray() || keys.size() != 1)
             {
                 continue;
             }
-            const auto keyChordString = keys.isString() ? winrt::to_hstring(keys.asString()) : winrt::to_hstring(keys[0].asString());
+            const auto keyChordString = winrt::to_hstring(keys[0].asString());
             // Invalid is our placeholder that the action was not parsed.
             ShortcutAction action = ShortcutAction::Invalid;
 
@@ -504,21 +484,13 @@ std::vector<::TerminalApp::SettingsLoadWarnings> winrt::TerminalApp::implementat
             // does, we'll try to deserialize any "args" that were provided with
             // the binding.
             IActionArgs args{ nullptr };
-            std::vector<::TerminalApp::SettingsLoadWarnings> parseWarnings;
             const auto deserializersIter = argParsers.find(action);
             if (deserializersIter != argParsers.end())
             {
                 auto pfn = deserializersIter->second;
                 if (pfn)
                 {
-                    std::tie(args, parseWarnings) = pfn(argsVal);
-                }
-                warnings.insert(warnings.end(), parseWarnings.begin(), parseWarnings.end());
-
-                // if an arg parser was registered, but failed, bail
-                if (pfn && args == nullptr)
-                {
-                    continue;
+                    args = pfn(argsVal);
                 }
             }
 
@@ -549,6 +521,4 @@ std::vector<::TerminalApp::SettingsLoadWarnings> winrt::TerminalApp::implementat
             }
         }
     }
-
-    return warnings;
 }

src/cascadia/TerminalApp/AppLogic.cpp

@@ -27,17 +27,14 @@ namespace winrt
 // !!! IMPORTANT !!!
 // Make sure that these keys are in the same order as the
 // SettingsLoadWarnings/Errors enum is!
-static const std::array<std::wstring_view, static_cast<uint32_t>(SettingsLoadWarnings::WARNINGS_SIZE)> settingsLoadWarningsLabels {
+static const std::array<std::wstring_view, 5> settingsLoadWarningsLabels {
     USES_RESOURCE(L"MissingDefaultProfileText"),
     USES_RESOURCE(L"DuplicateProfileText"),
     USES_RESOURCE(L"UnknownColorSchemeText"),
     USES_RESOURCE(L"InvalidBackgroundImage"),
-    USES_RESOURCE(L"InvalidIcon"),
-    USES_RESOURCE(L"AtLeastOneKeybindingWarning"),
-    USES_RESOURCE(L"TooManyKeysForChord"),
-    USES_RESOURCE(L"MissingRequiredParameter")
+    USES_RESOURCE(L"InvalidIcon")
 };
-static const std::array<std::wstring_view, static_cast<uint32_t>(SettingsLoadErrors::ERRORS_SIZE)> settingsLoadErrorsLabels {
+static const std::array<std::wstring_view, 2> settingsLoadErrorsLabels {
     USES_RESOURCE(L"NoProfilesText"),
     USES_RESOURCE(L"AllProfilesHiddenText")
 };
@@ -115,27 +112,6 @@ static Documents::Run _BuildErrorRun(const winrt::hstring& text, const ResourceD
     return textRun;
 }
 
-// Method Description:
-// - Returns whether the user is either a member of the Administrators group or
-//   is currently elevated.
-// Return Value:
-// - true if the user is an administrator
-static bool _isUserAdmin() noexcept
-try
-{
-    SID_IDENTIFIER_AUTHORITY ntAuthority{ SECURITY_NT_AUTHORITY };
-    wil::unique_sid adminGroupSid{};
-    THROW_IF_WIN32_BOOL_FALSE(AllocateAndInitializeSid(&ntAuthority, 2, SECURITY_BUILTIN_DOMAIN_RID, DOMAIN_ALIAS_RID_ADMINS, 0, 0, 0, 0, 0, 0, &adminGroupSid));
-    BOOL b;
-    THROW_IF_WIN32_BOOL_FALSE(CheckTokenMembership(NULL, adminGroupSid.get(), &b));
-    return !!b;
-}
-catch (...)
-{
-    LOG_CAUGHT_EXCEPTION();
-    return false;
-}
-
 namespace winrt::TerminalApp::implementation
 {
     AppLogic::AppLogic() :
@@ -152,7 +128,6 @@ namespace winrt::TerminalApp::implementation
         // The TerminalPage has to be constructed during our construction, to
         // make sure that there's a terminal page for callers of
         // SetTitleBarContent
-        _isElevated = _isUserAdmin();
         _root = winrt::make_self<TerminalPage>();
     }
 
@@ -167,17 +142,6 @@ namespace winrt::TerminalApp::implementation
         return _isUwp;
     }
 
-    // Method Description:
-    // - Called around the codebase to discover if Terminal is running elevated
-    // Arguments:
-    // - <none> - reports internal state
-    // Return Value:
-    // - True if elevated, false otherwise.
-    bool AppLogic::IsElevated() const noexcept
-    {
-        return _isElevated;
-    }
-
     // Method Description:
     // - Called by UWP context invoker to let us know that we may have to change some of our behaviors
     //   for being a UWP
@@ -400,44 +364,11 @@ namespace winrt::TerminalApp::implementation
         // Use the default profile to determine how big of a window we need.
         const auto [_, settings] = _settings->BuildSettings(nullptr);
 
-        auto proposedSize = TermControl::GetProposedDimensions(settings, dpi);
-
-        const float scale = static_cast<float>(dpi) / static_cast<float>(USER_DEFAULT_SCREEN_DPI);
-
-        // GH#2061 - If the global setting "Always show tab bar" is
+        // TODO MSFT:21150597 - If the global setting "Always show tab bar" is
         // set or if "Show tabs in title bar" is set, then we'll need to add
         // the height of the tab bar here.
-        if (_settings->GlobalSettings().GetShowTabsInTitlebar())
-        {
-            // If we're showing the tabs in the titlebar, we need to use a
-            // TitlebarContol here to calculate how much space to reserve.
-            //
-            // We'll create a fake TitlebarControl, and we'll propose an
-            // available size to it with Measure(). After Measure() is called,
-            // the TitlebarControl's DesiredSize will contain the _unscaled_
-            // size that the titlebar would like to use. We'll use that as part
-            // of the height calculation here.
-            auto titlebar = TitlebarControl{ static_cast<uint64_t>(0) };
-            titlebar.Measure({ SHRT_MAX, SHRT_MAX });
-            proposedSize.Y += (titlebar.DesiredSize().Height) * scale;
-        }
-        else if (_settings->GlobalSettings().GetAlwaysShowTabs())
-        {
-            // Otherwise, let's use a TabRowControl to calculate how much extra
-            // space we'll need.
-            //
-            // Similarly to above, we'll measure it with an arbitrarily large
-            // available space, to make sure we get all the space it wants.
-            auto tabControl = TabRowControl();
-            tabControl.Measure({ SHRT_MAX, SHRT_MAX });
 
-            // For whatever reason, there's about 6px of unaccounted-for space
-            // in the application. I couldn't tell you where these 6px are
-            // coming from, but they need to be included in this math.
-            proposedSize.Y += (tabControl.DesiredSize().Height + 6) * scale;
-        }
-
-        return proposedSize;
+        return TermControl::GetProposedDimensions(settings, dpi);
     }
 
     // Method Description:
@@ -773,41 +704,6 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    // Method Description:
-    // - Implements the F7 handler (per GH#638)
-    // Return value:
-    // - whether F7 was handled
-    bool AppLogic::OnF7Pressed()
-    {
-        if (_root)
-        {
-            // Manually bubble the OnF7Pressed event up through the focus tree.
-            auto xamlRoot{ _root->XamlRoot() };
-            auto focusedObject{ Windows::UI::Xaml::Input::FocusManager::GetFocusedElement(xamlRoot) };
-            do
-            {
-                if (auto f7Listener{ focusedObject.try_as<IF7Listener>() })
-                {
-                    if (f7Listener.OnF7Pressed())
-                    {
-                        return true;
-                    }
-                    // otherwise, keep walking. bubble the event manually.
-                }
-
-                if (auto focusedElement{ focusedObject.try_as<Windows::UI::Xaml::FrameworkElement>() })
-                {
-                    focusedObject = focusedElement.Parent();
-                }
-                else
-                {
-                    break; // we hit a non-FE object, stop bubbling.
-                }
-            } while (focusedObject);
-        }
-        return false;
-    }
-
     // Method Description:
     // - Used to tell the app that the 'X' button has been clicked and
     //   the user wants to close the app. We kick off the close warning

src/cascadia/TerminalApp/AppLogic.h

@@ -21,7 +21,6 @@ namespace winrt::TerminalApp::implementation
         void Create();
         bool IsUwp() const noexcept;
         void RunAsUwp();
-        bool IsElevated() const noexcept;
         void LoadSettings();
         [[nodiscard]] std::shared_ptr<::TerminalApp::CascadiaSettings> GetSettings() const noexcept;
 
@@ -39,7 +38,6 @@ namespace winrt::TerminalApp::implementation
 
         hstring Title();
         void TitlebarClicked();
-        bool OnF7Pressed();
 
         void WindowCloseButtonClicked();
 
@@ -48,7 +46,6 @@ namespace winrt::TerminalApp::implementation
 
     private:
         bool _isUwp{ false };
-        bool _isElevated{ false };
 
         // If you add controls here, but forget to null them either here or in
         // the ctor, you're going to have a bad time. It'll mysteriously fail to

src/cascadia/TerminalApp/AppLogic.idl

@@ -3,7 +3,6 @@
 
 import "../TerminalPage.idl";
 import "../ShortcutActionDispatch.idl";
-import "../IF7Listener.idl";
 
 namespace TerminalApp
 {
@@ -13,7 +12,7 @@ namespace TerminalApp
         MaximizedMode,
     };
 
-    [default_interface] runtimeclass AppLogic: IF7Listener {
+    [default_interface] runtimeclass AppLogic {
         AppLogic();
 
         // For your own sanity, it's better to do setup outside the ctor.
@@ -25,7 +24,6 @@ namespace TerminalApp
 
         Boolean IsUwp();
         void RunAsUwp();
-        Boolean IsElevated();
 
         Int32 SetStartupCommandline(String[] commands);
         String EarlyExitMessage { get; };

src/cascadia/TerminalApp/CascadiaSettings.cpp

@@ -206,11 +206,9 @@ void CascadiaSettings::_ValidateSettings()
     // there's _NO_ keys bound to any actions. That's highly irregular, and
     // likely an indication of an error somehow.
 
-    // GH#3522 - With variable args to keybindings, it's possible that a user
+    // TODO:GH#3522 With variable args to keybindings, it's possible that a user
     // set a keybinding without all the required args for an action. Display a
     // warning if an action didn't have a required arg.
-    // This will also catch other keybinding warnings, like from GH#4239
-    _ValidateKeybindings();
 }
 
 // Method Description:
@@ -653,23 +651,3 @@ GUID CascadiaSettings::_GetProfileForIndex(std::optional<int> index) const
     }
     return profileGuid;
 }
-
-// Method Description:
-// - If there were any warnings we generated while parsing the user's
-//   keybindings, add them to the list of warnings here. If there were warnings
-//   generated in this way, we'll add a AtLeastOneKeybindingWarning, which will
-//   act as a header for the other warnings
-// Arguments:
-// - <none>
-// Return Value:
-// - <none>
-void CascadiaSettings::_ValidateKeybindings()
-{
-    auto keybindingWarnings = _globals.GetKeybindingsWarnings();
-
-    if (!keybindingWarnings.empty())
-    {
-        _warnings.push_back(::TerminalApp::SettingsLoadWarnings::AtLeastOneKeybindingWarning);
-        _warnings.insert(_warnings.end(), keybindingWarnings.begin(), keybindingWarnings.end());
-    }
-}

src/cascadia/TerminalApp/CascadiaSettings.h

@@ -34,7 +34,6 @@ namespace TerminalAppLocalTests
 namespace TerminalAppUnitTests
 {
     class DynamicProfileTests;
-    class JsonTests;
 };
 
 namespace TerminalApp
@@ -117,7 +116,6 @@ private:
     void _RemoveHiddenProfiles();
     void _ValidateAllSchemesExist();
     void _ValidateMediaResources();
-    void _ValidateKeybindings();
 
     friend class TerminalAppLocalTests::SettingsTests;
     friend class TerminalAppLocalTests::ProfileTests;
@@ -125,5 +123,4 @@ private:
     friend class TerminalAppLocalTests::KeyBindingsTests;
     friend class TerminalAppLocalTests::TabTests;
     friend class TerminalAppUnitTests::DynamicProfileTests;
-    friend class TerminalAppUnitTests::JsonTests;
 };

src/cascadia/TerminalApp/CascadiaSettingsSerialization.cpp

@@ -704,7 +704,7 @@ ColorScheme* CascadiaSettings::_FindMatchingColorScheme(const Json::Value& schem
 bool CascadiaSettings::_IsPackaged()
 {
     UINT32 length = 0;
-    LONG rc = GetCurrentPackageFullName(&length, nullptr);
+    LONG rc = GetCurrentPackageFullName(&length, NULL);
     return rc != APPMODEL_ERROR_NO_PACKAGE;
 }
 
@@ -724,15 +724,15 @@ void CascadiaSettings::_WriteSettings(const std::string_view content)
     wil::unique_hfile hOut{ CreateFileW(pathToSettingsFile.c_str(),
                                         GENERIC_WRITE,
                                         FILE_SHARE_READ | FILE_SHARE_WRITE,
-                                        nullptr,
+                                        NULL,
                                         CREATE_ALWAYS,
                                         FILE_ATTRIBUTE_NORMAL,
-                                        nullptr) };
+                                        NULL) };
     if (!hOut)
     {
         THROW_LAST_ERROR();
     }
-    THROW_LAST_ERROR_IF(!WriteFile(hOut.get(), content.data(), gsl::narrow<DWORD>(content.size()), nullptr, nullptr));
+    THROW_LAST_ERROR_IF(!WriteFile(hOut.get(), content.data(), gsl::narrow<DWORD>(content.size()), 0, 0));
 }
 
 // Method Description:
@@ -853,7 +853,7 @@ std::wstring CascadiaSettings::GetSettingsPath(const bool useRoamingPath)
     // the new AppModel paths (Packages/xxx/RoamingState, etc.) for standard path requests.
     // Using this flag allows us to avoid Windows.Storage.ApplicationData completely.
     const auto knowFolderId = useRoamingPath ? FOLDERID_RoamingAppData : FOLDERID_LocalAppData;
-    if (FAILED(SHGetKnownFolderPath(knowFolderId, KF_FLAG_FORCE_APP_DATA_REDIRECTION, nullptr, &localAppDataFolder)))
+    if (FAILED(SHGetKnownFolderPath(knowFolderId, KF_FLAG_FORCE_APP_DATA_REDIRECTION, 0, &localAppDataFolder)))
     {
         THROW_LAST_ERROR();
     }

src/cascadia/TerminalApp/ColorScheme.cpp

@@ -18,7 +18,6 @@ static constexpr std::string_view TableKey{ "colors" };
 static constexpr std::string_view ForegroundKey{ "foreground" };
 static constexpr std::string_view BackgroundKey{ "background" };
 static constexpr std::string_view SelectionBackgroundKey{ "selectionBackground" };
-static constexpr std::string_view CursorColorKey{ "cursorColor" };
 static constexpr std::array<std::string_view, 16> TableColors = {
     "black",
     "red",
@@ -43,18 +42,16 @@ ColorScheme::ColorScheme() :
     _table{},
     _defaultForeground{ DEFAULT_FOREGROUND_WITH_ALPHA },
     _defaultBackground{ DEFAULT_BACKGROUND_WITH_ALPHA },
-    _selectionBackground{ DEFAULT_FOREGROUND },
-    _cursorColor{ DEFAULT_CURSOR_COLOR }
+    _selectionBackground{ DEFAULT_FOREGROUND }
 {
 }
 
-ColorScheme::ColorScheme(std::wstring name, COLORREF defaultFg, COLORREF defaultBg, COLORREF cursorColor) :
+ColorScheme::ColorScheme(std::wstring name, COLORREF defaultFg, COLORREF defaultBg) :
     _schemeName{ name },
     _table{},
     _defaultForeground{ defaultFg },
     _defaultBackground{ defaultBg },
-    _selectionBackground{ DEFAULT_FOREGROUND },
-    _cursorColor{ cursorColor }
+    _selectionBackground{ DEFAULT_FOREGROUND }
 {
 }
 
@@ -74,7 +71,6 @@ void ColorScheme::ApplyScheme(TerminalSettings terminalSettings) const
     terminalSettings.DefaultForeground(_defaultForeground);
     terminalSettings.DefaultBackground(_defaultBackground);
     terminalSettings.SelectionBackground(_selectionBackground);
-    terminalSettings.CursorColor(_cursorColor);
 
     auto const tableCount = gsl::narrow_cast<int>(_table.size());
     for (int i = 0; i < tableCount; i++)
@@ -96,7 +92,6 @@ Json::Value ColorScheme::ToJson() const
     root[JsonKey(ForegroundKey)] = Utils::ColorToHexString(_defaultForeground);
     root[JsonKey(BackgroundKey)] = Utils::ColorToHexString(_defaultBackground);
     root[JsonKey(SelectionBackgroundKey)] = Utils::ColorToHexString(_selectionBackground);
-    root[JsonKey(CursorColorKey)] = Utils::ColorToHexString(_cursorColor);
 
     int i = 0;
     for (const auto& colorName : TableColors)
@@ -171,11 +166,6 @@ void ColorScheme::LayerJson(const Json::Value& json)
         const auto color = Utils::ColorFromHexString(sbString.asString());
         _selectionBackground = color;
     }
-    if (auto sbString{ json[JsonKey(CursorColorKey)] })
-    {
-        const auto color = Utils::ColorFromHexString(sbString.asString());
-        _cursorColor = color;
-    }
 
     // Legacy Deserialization. Leave in place to allow forward compatibility
     if (auto table{ json[JsonKey(TableKey)] })
@@ -230,11 +220,6 @@ COLORREF ColorScheme::GetSelectionBackground() const noexcept
     return _selectionBackground;
 }
 
-COLORREF ColorScheme::GetCursorColor() const noexcept
-{
-    return _cursorColor;
-}
-
 // Method Description:
 // - Parse the name from the JSON representation of a ColorScheme.
 // Arguments:

src/cascadia/TerminalApp/ColorScheme.h

@@ -35,7 +35,7 @@ class TerminalApp::ColorScheme
 {
 public:
     ColorScheme();
-    ColorScheme(std::wstring name, COLORREF defaultFg, COLORREF defaultBg, COLORREF cursorColor);
+    ColorScheme(std::wstring name, COLORREF defaultFg, COLORREF defaultBg);
     ~ColorScheme();
 
     void ApplyScheme(winrt::Microsoft::Terminal::Settings::TerminalSettings terminalSettings) const;
@@ -50,7 +50,6 @@ public:
     COLORREF GetForeground() const noexcept;
     COLORREF GetBackground() const noexcept;
     COLORREF GetSelectionBackground() const noexcept;
-    COLORREF GetCursorColor() const noexcept;
 
     static std::optional<std::wstring> GetNameFromJson(const Json::Value& json);
 
@@ -60,7 +59,6 @@ private:
     COLORREF _defaultForeground;
     COLORREF _defaultBackground;
     COLORREF _selectionBackground;
-    COLORREF _cursorColor;
 
     friend class TerminalAppLocalTests::SettingsTests;
     friend class TerminalAppLocalTests::ColorSchemeTests;

src/cascadia/TerminalApp/GlobalAppSettings.cpp

@@ -43,7 +43,6 @@ static constexpr std::wstring_view SystemThemeValue{ L"system" };
 
 GlobalAppSettings::GlobalAppSettings() :
     _keybindings{ winrt::make_self<winrt::TerminalApp::implementation::AppKeyBindings>() },
-    _keybindingsWarnings{},
     _colorSchemes{},
     _defaultProfile{},
     _alwaysShowTabs{ true },
@@ -262,14 +261,22 @@ void GlobalAppSettings::LayerJson(const Json::Value& json)
         _defaultProfile = guid;
     }
 
-    JsonUtils::GetBool(json, AlwaysShowTabsKey, _alwaysShowTabs);
-
-    JsonUtils::GetBool(json, ConfirmCloseAllKey, _confirmCloseAllTabs);
-
-    JsonUtils::GetInt(json, InitialRowsKey, _initialRows);
-
-    JsonUtils::GetInt(json, InitialColsKey, _initialCols);
-
+    if (auto alwaysShowTabs{ json[JsonKey(AlwaysShowTabsKey)] })
+    {
+        _alwaysShowTabs = alwaysShowTabs.asBool();
+    }
+    if (auto confirmCloseAllTabs{ json[JsonKey(ConfirmCloseAllKey)] })
+    {
+        _confirmCloseAllTabs = confirmCloseAllTabs.asBool();
+    }
+    if (auto initialRows{ json[JsonKey(InitialRowsKey)] })
+    {
+        _initialRows = initialRows.asInt();
+    }
+    if (auto initialCols{ json[JsonKey(InitialColsKey)] })
+    {
+        _initialCols = initialCols.asInt();
+    }
     if (auto rowsToScroll{ json[JsonKey(RowsToScrollKey)] })
     {
         //if it's not an int we fall back to setting it to 0, which implies using the system setting. This will be the case if it's set to "system"
@@ -282,19 +289,29 @@ void GlobalAppSettings::LayerJson(const Json::Value& json)
             _rowsToScroll = 0;
         }
     }
-
     if (auto initialPosition{ json[JsonKey(InitialPositionKey)] })
     {
         _ParseInitialPosition(GetWstringFromJson(initialPosition), _initialX, _initialY);
     }
+    if (auto showTitleInTitlebar{ json[JsonKey(ShowTitleInTitlebarKey)] })
+    {
+        _showTitleInTitlebar = showTitleInTitlebar.asBool();
+    }
 
-    JsonUtils::GetBool(json, ShowTitleInTitlebarKey, _showTitleInTitlebar);
+    if (auto showTabsInTitlebar{ json[JsonKey(ShowTabsInTitlebarKey)] })
+    {
+        _showTabsInTitlebar = showTabsInTitlebar.asBool();
+    }
 
-    JsonUtils::GetBool(json, ShowTabsInTitlebarKey, _showTabsInTitlebar);
+    if (auto wordDelimiters{ json[JsonKey(WordDelimitersKey)] })
+    {
+        _wordDelimiters = GetWstringFromJson(wordDelimiters);
+    }
 
-    JsonUtils::GetWstring(json, WordDelimitersKey, _wordDelimiters);
-
-    JsonUtils::GetBool(json, CopyOnSelectKey, _copyOnSelect);
+    if (auto copyOnSelect{ json[JsonKey(CopyOnSelectKey)] })
+    {
+        _copyOnSelect = copyOnSelect.asBool();
+    }
 
     if (auto launchMode{ json[JsonKey(LaunchModeKey)] })
     {
@@ -313,17 +330,13 @@ void GlobalAppSettings::LayerJson(const Json::Value& json)
 
     if (auto keybindings{ json[JsonKey(KeybindingsKey)] })
     {
-        auto warnings = _keybindings->LayerJson(keybindings);
-        // It's possible that the user provided keybindings have some warnings
-        // in them - problems that we should alert the user to, but we can
-        // recover from. Most of these warnings cannot be detected later in the
-        // Validate settings phase, so we'll collect them now. If there were any
-        // warnings generated from parsing these keybindings, add them to our
-        // list of warnings.
-        _keybindingsWarnings.insert(_keybindingsWarnings.end(), warnings.begin(), warnings.end());
+        _keybindings->LayerJson(keybindings);
     }
 
-    JsonUtils::GetBool(json, SnapToGridOnResizeKey, _SnapToGridOnResize);
+    if (auto snapToGridOnResize{ json[JsonKey(SnapToGridOnResizeKey)] })
+    {
+        _SnapToGridOnResize = snapToGridOnResize.asBool();
+    }
 }
 
 // Method Description:
@@ -524,17 +537,3 @@ void GlobalAppSettings::AddColorScheme(ColorScheme scheme)
     std::wstring name{ scheme.GetName() };
     _colorSchemes[name] = std::move(scheme);
 }
-
-// Method Description:
-// - Return the warnings that we've collected during parsing the JSON for the
-//   keybindings. It's possible that the user provided keybindings have some
-//   warnings in them - problems that we should alert the user to, but we can
-//   recover from.
-// Arguments:
-// - <none>
-// Return Value:
-// - <none>
-std::vector<TerminalApp::SettingsLoadWarnings> GlobalAppSettings::GetKeybindingsWarnings() const
-{
-    return _keybindingsWarnings;
-}

src/cascadia/TerminalApp/GlobalAppSettings.h

@@ -83,14 +83,11 @@ public:
 
     void ApplyToSettings(winrt::Microsoft::Terminal::Settings::TerminalSettings& settings) const noexcept;
 
-    std::vector<TerminalApp::SettingsLoadWarnings> GetKeybindingsWarnings() const;
-
     GETSET_PROPERTY(bool, SnapToGridOnResize, true);
 
 private:
     GUID _defaultProfile;
     winrt::com_ptr<winrt::TerminalApp::implementation::AppKeyBindings> _keybindings;
-    std::vector<::TerminalApp::SettingsLoadWarnings> _keybindingsWarnings;
 
     std::unordered_map<std::wstring, ColorScheme> _colorSchemes;
 

src/cascadia/TerminalApp/IF7Listener.idl

@@ -1,16 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace TerminalApp
-{
-    // C++/winrt makes it difficult to share this idl between two projects,
-    // Instead, we just pin the uuid and include it in both TermControl and App
-    // If you update this one, please update the one in TerminalControl\TermControl.idl
-    // If you change this interface, please update the guid.
-    // If you press F7 and get a runtime error, go make sure both copies are the same.
-    [uuid("339e1a87-5315-4da6-96f0-565549b6472b")]
-    interface IF7Listener
-    {
-        Boolean OnF7Pressed();
-    }
-}

src/cascadia/TerminalApp/JsonUtils.cpp

@@ -52,74 +52,8 @@ void TerminalApp::JsonUtils::GetOptionalDouble(const Json::Value& json,
     const auto conversionFn = [](const Json::Value& value) -> double {
         return value.asFloat();
     };
-    const auto validationFn = [](const Json::Value& value) -> bool {
-        return value.isNumeric();
-    };
     GetOptionalValue(json,
                      key,
                      target,
-                     conversionFn,
-                     validationFn);
-}
-
-void TerminalApp::JsonUtils::GetInt(const Json::Value& json,
-                                    std::string_view key,
-                                    int& target)
-{
-    const auto conversionFn = [](const Json::Value& value) -> int {
-        return value.asInt();
-    };
-    const auto validationFn = [](const Json::Value& value) -> bool {
-        return value.isInt();
-    };
-    GetValue(json, key, target, conversionFn, validationFn);
-}
-
-void TerminalApp::JsonUtils::GetUInt(const Json::Value& json,
-                                     std::string_view key,
-                                     uint32_t& target)
-{
-    const auto conversionFn = [](const Json::Value& value) -> uint32_t {
-        return value.asUInt();
-    };
-    const auto validationFn = [](const Json::Value& value) -> bool {
-        return value.isUInt();
-    };
-    GetValue(json, key, target, conversionFn, validationFn);
-}
-
-void TerminalApp::JsonUtils::GetDouble(const Json::Value& json,
-                                       std::string_view key,
-                                       double& target)
-{
-    const auto conversionFn = [](const Json::Value& value) -> double {
-        return value.asFloat();
-    };
-    const auto validationFn = [](const Json::Value& value) -> bool {
-        return value.isNumeric();
-    };
-    GetValue(json, key, target, conversionFn, validationFn);
-}
-
-void TerminalApp::JsonUtils::GetBool(const Json::Value& json,
-                                     std::string_view key,
-                                     bool& target)
-{
-    const auto conversionFn = [](const Json::Value& value) -> bool {
-        return value.asBool();
-    };
-    const auto validationFn = [](const Json::Value& value) -> bool {
-        return value.isBool();
-    };
-    GetValue(json, key, target, conversionFn, validationFn);
-}
-
-void TerminalApp::JsonUtils::GetWstring(const Json::Value& json,
-                                        std::string_view key,
-                                        std::wstring& target)
-{
-    const auto conversionFn = [](const Json::Value& value) -> std::wstring {
-        return GetWstringFromJson(value);
-    };
-    GetValue(json, key, target, conversionFn, nullptr);
+                     conversionFn);
 }

src/cascadia/TerminalApp/JsonUtils.h

@@ -46,99 +46,24 @@ namespace TerminalApp::JsonUtils
     // - target: the optional object to receive the value from json
     // - conversion: a std::function<T(const Json::Value&)> which can be used to
     //   convert the Json::Value to the appropriate type.
-    // - validation: optional, if provided, will be called first to ensure that
-    //   the json::value is of the correct type before attempting to call
-    //   `conversion`.
     // Return Value:
     // - <none>
     template<typename T, typename F>
     void GetOptionalValue(const Json::Value& json,
                           std::string_view key,
                           std::optional<T>& target,
-                          F&& conversion,
-                          const std::function<bool(const Json::Value&)>& validation = nullptr)
+                          F&& conversion)
     {
         if (json.isMember(JsonKey(key)))
         {
             if (auto jsonVal{ json[JsonKey(key)] })
             {
-                if (validation == nullptr || validation(jsonVal))
-                {
-                    target = conversion(jsonVal);
-                }
+                target = conversion(jsonVal);
             }
             else
             {
-                // This branch is hit when the json object contained the key,
-                // but the key was set to `null`. In this case, explicitly clear
-                // the target.
                 target = std::nullopt;
             }
         }
     }
-
-    // Method Description:
-    // - Helper that can be used for retrieving a value from a json
-    //   object, and parsing it's value to set on a given target object.
-    //    - If the key we're looking for _doesn't_ exist in the json object,
-    //      we'll leave the target object unmodified.
-    //    - If the key exists in the json object, we'll use the provided
-    //      `validation` function to ensure that the json value is of the
-    //      correct type.
-    //    - If we successfully validate the json value type (or no validation
-    //      function was provided), then we'll use `conversion` to parse the
-    //      value and place the result into `target`
-    // - Each caller should provide a conversion function that takes a
-    //   Json::Value and returns an object of the same type as target.
-    // - Unlike GetOptionalValue, if the key exists but is set to `null`, we'll
-    //   just ignore it.
-    // Arguments:
-    // - json: The json object to search for the given key
-    // - key: The key to look for in the json object
-    // - target: the optional object to receive the value from json
-    // - conversion: a std::function<T(const Json::Value&)> which can be used to
-    //   convert the Json::Value to the appropriate type.
-    // - validation: optional, if provided, will be called first to ensure that
-    //   the json::value is of the correct type before attempting to call
-    //   `conversion`.
-    // Return Value:
-    // - <none>
-    template<typename T, typename F>
-    void GetValue(const Json::Value& json,
-                  std::string_view key,
-                  T& target,
-                  F&& conversion,
-                  const std::function<bool(const Json::Value&)>& validation = nullptr)
-    {
-        if (json.isMember(JsonKey(key)))
-        {
-            if (auto jsonVal{ json[JsonKey(key)] })
-            {
-                if (validation == nullptr || validation(jsonVal))
-                {
-                    target = conversion(jsonVal);
-                }
-            }
-        }
-    }
-
-    void GetInt(const Json::Value& json,
-                std::string_view key,
-                int& target);
-
-    void GetUInt(const Json::Value& json,
-                 std::string_view key,
-                 uint32_t& target);
-
-    void GetDouble(const Json::Value& json,
-                   std::string_view key,
-                   double& target);
-
-    void GetBool(const Json::Value& json,
-                 std::string_view key,
-                 bool& target);
-
-    void GetWstring(const Json::Value& json,
-                    std::string_view key,
-                    std::wstring& target);
 };

src/cascadia/TerminalApp/MinMaxCloseControl.xaml

@@ -131,24 +131,16 @@ the MIT License. See LICENSE in the project root for license information. -->
         </ResourceDictionary>
     </StackPanel.Resources>
 
-    <Button Height="36.0" MinWidth="46.0" Width="46.0"
-            x:Name="MinimizeButton"
-            x:Uid="WindowMinimizeButton"
-            Style="{StaticResource CaptionButton}"
-            Click="_MinimizeClick"
-            AutomationProperties.AccessibilityView="Raw">
+    <Button Height="36.0" MinWidth="46.0" Width="46.0" x:Name="MinimizeButton" Style="{StaticResource CaptionButton}" Click="_MinimizeClick"
+            AutomationProperties.Name="Minimize">
         <Button.Resources>
             <ResourceDictionary>
                 <x:String x:Key="CaptionButtonPath">M 0 0 H 10</x:String>
             </ResourceDictionary>
         </Button.Resources>
     </Button>
-    <Button Height="36.0" MinWidth="46.0" Width="46.0"
-            x:Name="MaximizeButton"
-            x:Uid="WindowMaximizeButton"
-            Style="{StaticResource CaptionButton}"
-            Click="_MaximizeClick"
-            AutomationProperties.AccessibilityView="Raw">
+    <Button Height="36.0" MinWidth="46.0" Width="46.0" x:Name="MaximizeButton" Style="{StaticResource CaptionButton}" Click="_MaximizeClick"
+            AutomationProperties.Name="Maximize">
         <Button.Resources>
             <ResourceDictionary>
                 <x:String x:Key="CaptionButtonPath">M 0 0 H 10 V 10 H 0 V 0</x:String>
@@ -156,12 +148,8 @@ the MIT License. See LICENSE in the project root for license information. -->
             </ResourceDictionary>
         </Button.Resources>
     </Button>
-    <Button Height="36.0" MinWidth="46.0" Width="46.0"
-            x:Name="CloseButton"
-            x:Uid="WindowCloseButton"
-            Style="{StaticResource CaptionButton}"
-            Click="_CloseClick"
-            AutomationProperties.AccessibilityView="Raw">
+    <Button Height="36.0" MinWidth="46.0" Width="46.0" x:Name="CloseButton" Style="{StaticResource CaptionButton}" Click="_CloseClick"
+            AutomationProperties.Name="Close">
         <Button.Resources>
             <ResourceDictionary>
                 <ResourceDictionary.ThemeDictionaries>

src/cascadia/TerminalApp/Pane.cpp

@@ -803,10 +803,10 @@ void Pane::_CreateRowColDefinitions(const Size& rootSize)
         const auto paneSizes = _CalcChildrenSizes(rootSize.Width);
 
         auto firstColDef = Controls::ColumnDefinition();
-        firstColDef.Width(GridLengthHelper::FromValueAndType(paneSizes.first, GridUnitType::Star));
+        firstColDef.Width(GridLengthHelper::FromPixels(paneSizes.first));
 
         auto secondColDef = Controls::ColumnDefinition();
-        secondColDef.Width(GridLengthHelper::FromValueAndType(paneSizes.second, GridUnitType::Star));
+        secondColDef.Width(GridLengthHelper::FromPixels(paneSizes.second));
 
         _root.ColumnDefinitions().Append(firstColDef);
         _root.ColumnDefinitions().Append(secondColDef);
@@ -819,10 +819,10 @@ void Pane::_CreateRowColDefinitions(const Size& rootSize)
         const auto paneSizes = _CalcChildrenSizes(rootSize.Height);
 
         auto firstRowDef = Controls::RowDefinition();
-        firstRowDef.Height(GridLengthHelper::FromValueAndType(paneSizes.first, GridUnitType::Star));
+        firstRowDef.Height(GridLengthHelper::FromPixels(paneSizes.first));
 
         auto secondRowDef = Controls::RowDefinition();
-        secondRowDef.Height(GridLengthHelper::FromValueAndType(paneSizes.second, GridUnitType::Star));
+        secondRowDef.Height(GridLengthHelper::FromPixels(paneSizes.second));
 
         _root.RowDefinitions().Append(firstRowDef);
         _root.RowDefinitions().Append(secondRowDef);

src/cascadia/TerminalApp/PowershellCoreProfileGenerator.cpp

@@ -196,7 +196,7 @@ catch (...)
 static void _accumulateStorePowerShellInstances(std::vector<PowerShellInstance>& out)
 {
     wil::unique_cotaskmem_string localAppDataFolder;
-    if (FAILED(SHGetKnownFolderPath(FOLDERID_LocalAppData, 0, nullptr, &localAppDataFolder)))
+    if (FAILED(SHGetKnownFolderPath(FOLDERID_LocalAppData, 0, 0, &localAppDataFolder)))
     {
         return;
     }

src/cascadia/TerminalApp/Profile.cpp

@@ -49,8 +49,6 @@ static constexpr std::string_view BackgroundImageKey{ "backgroundImage" };
 static constexpr std::string_view BackgroundImageOpacityKey{ "backgroundImageOpacity" };
 static constexpr std::string_view BackgroundImageStretchModeKey{ "backgroundImageStretchMode" };
 static constexpr std::string_view BackgroundImageAlignmentKey{ "backgroundImageAlignment" };
-static constexpr std::string_view RetroTerminalEffectKey{ "experimental.retroTerminalEffect" };
-static constexpr std::string_view AntialiasingModeKey{ "antialiasingMode" };
 
 // Possible values for closeOnExit
 static constexpr std::string_view CloseOnExitAlways{ "always" };
@@ -85,10 +83,8 @@ static constexpr std::string_view ImageAlignmentTopRight{ "topRight" };
 static constexpr std::string_view ImageAlignmentBottomLeft{ "bottomLeft" };
 static constexpr std::string_view ImageAlignmentBottomRight{ "bottomRight" };
 
-// Possible values for TextAntialiasingMode
-static constexpr std::wstring_view AntialiasingModeGrayscale{ L"grayscale" };
-static constexpr std::wstring_view AntialiasingModeCleartype{ L"cleartype" };
-static constexpr std::wstring_view AntialiasingModeAliased{ L"aliased" };
+// Terminal effects
+static constexpr std::string_view RetroTerminalEffectKey{ "experimental.retroTerminalEffect" };
 
 Profile::Profile() :
     Profile(std::nullopt)
@@ -104,12 +100,12 @@ Profile::Profile(const std::optional<GUID>& guid) :
     _defaultForeground{},
     _defaultBackground{},
     _selectionBackground{},
-    _cursorColor{},
     _colorTable{},
     _tabTitle{},
     _suppressApplicationTitle{},
     _historySize{ DEFAULT_HISTORY_SIZE },
     _snapOnInput{ true },
+    _cursorColor{ DEFAULT_CURSOR_COLOR },
     _cursorShape{ CursorStyle::Bar },
     _cursorHeight{ DEFAULT_CURSOR_HEIGHT },
 
@@ -128,8 +124,7 @@ Profile::Profile(const std::optional<GUID>& guid) :
     _backgroundImageOpacity{},
     _backgroundImageStretchMode{},
     _backgroundImageAlignment{},
-    _retroTerminalEffect{},
-    _antialiasingMode{ TextAntialiasingMode::Grayscale }
+    _retroTerminalEffect{}
 {
 }
 
@@ -178,11 +173,11 @@ TerminalSettings Profile::CreateTerminalSettings(const std::unordered_map<std::w
     }
     terminalSettings.HistorySize(_historySize);
     terminalSettings.SnapOnInput(_snapOnInput);
+    terminalSettings.CursorColor(_cursorColor);
     terminalSettings.CursorHeight(_cursorHeight);
     terminalSettings.CursorShape(_cursorShape);
 
     // Fill in the remaining properties from the profile
-    terminalSettings.ProfileName(_name);
     terminalSettings.UseAcrylic(_useAcrylic);
     terminalSettings.TintOpacity(_acrylicTransparency);
 
@@ -227,10 +222,6 @@ TerminalSettings Profile::CreateTerminalSettings(const std::unordered_map<std::w
     {
         terminalSettings.SelectionBackground(_selectionBackground.value());
     }
-    if (_cursorColor)
-    {
-        terminalSettings.CursorColor(_cursorColor.value());
-    }
 
     if (_scrollbarState)
     {
@@ -266,8 +257,6 @@ TerminalSettings Profile::CreateTerminalSettings(const std::unordered_map<std::w
         terminalSettings.RetroTerminalEffect(_retroTerminalEffect.value());
     }
 
-    terminalSettings.AntialiasingMode(_antialiasingMode);
-
     return terminalSettings;
 }
 
@@ -299,10 +288,6 @@ Json::Value Profile::ToJson() const
     {
         root[JsonKey(SelectionBackgroundKey)] = Utils::ColorToHexString(_selectionBackground.value());
     }
-    if (_cursorColor)
-    {
-        root[JsonKey(CursorColorKey)] = Utils::ColorToHexString(_cursorColor.value());
-    }
     if (_schemeName)
     {
         const auto scheme = winrt::to_string(_schemeName.value());
@@ -319,6 +304,7 @@ Json::Value Profile::ToJson() const
     }
     root[JsonKey(HistorySizeKey)] = _historySize;
     root[JsonKey(SnapOnInputKey)] = _snapOnInput;
+    root[JsonKey(CursorColorKey)] = Utils::ColorToHexString(_cursorColor);
     // Only add the cursor height property if we're a legacy-style cursor.
     if (_cursorShape == CursorStyle::Vintage)
     {
@@ -391,8 +377,6 @@ Json::Value Profile::ToJson() const
         root[JsonKey(RetroTerminalEffectKey)] = _retroTerminalEffect.value();
     }
 
-    root[JsonKey(AntialiasingModeKey)] = SerializeTextAntialiasingMode(_antialiasingMode).data();
-
     return root;
 }
 
@@ -628,11 +612,19 @@ bool Profile::_ConvertJsonToBool(const Json::Value& json)
 void Profile::LayerJson(const Json::Value& json)
 {
     // Profile-specific Settings
-    JsonUtils::GetWstring(json, NameKey, _name);
+    if (json.isMember(JsonKey(NameKey)))
+    {
+        auto name{ json[JsonKey(NameKey)] };
+        _name = GetWstringFromJson(name);
+    }
 
     JsonUtils::GetOptionalGuid(json, GuidKey, _guid);
 
-    JsonUtils::GetBool(json, HiddenKey, _hidden);
+    if (json.isMember(JsonKey(HiddenKey)))
+    {
+        auto hidden{ json[JsonKey(HiddenKey)] };
+        _hidden = hidden.asBool();
+    }
 
     // Core Settings
     JsonUtils::GetOptionalColor(json, ForegroundKey, _defaultForeground);
@@ -641,8 +633,6 @@ void Profile::LayerJson(const Json::Value& json)
 
     JsonUtils::GetOptionalColor(json, SelectionBackgroundKey, _selectionBackground);
 
-    JsonUtils::GetOptionalColor(json, CursorColorKey, _cursorColor);
-
     JsonUtils::GetOptionalString(json, ColorSchemeKey, _schemeName);
     // TODO:GH#1069 deprecate old settings key
     JsonUtils::GetOptionalString(json, ColorSchemeKeyOld, _schemeName);
@@ -664,14 +654,28 @@ void Profile::LayerJson(const Json::Value& json)
             i++;
         }
     }
-
-    // TODO:MSFT:20642297 - Use a sentinel value (-1) for "Infinite scrollback"
-    JsonUtils::GetInt(json, HistorySizeKey, _historySize);
-
-    JsonUtils::GetBool(json, SnapOnInputKey, _snapOnInput);
-
-    JsonUtils::GetUInt(json, CursorHeightKey, _cursorHeight);
-
+    if (json.isMember(JsonKey(HistorySizeKey)))
+    {
+        auto historySize{ json[JsonKey(HistorySizeKey)] };
+        // TODO:MSFT:20642297 - Use a sentinel value (-1) for "Infinite scrollback"
+        _historySize = historySize.asInt();
+    }
+    if (json.isMember(JsonKey(SnapOnInputKey)))
+    {
+        auto snapOnInput{ json[JsonKey(SnapOnInputKey)] };
+        _snapOnInput = snapOnInput.asBool();
+    }
+    if (json.isMember(JsonKey(CursorColorKey)))
+    {
+        auto cursorColor{ json[JsonKey(CursorColorKey)] };
+        const auto color = Utils::ColorFromHexString(cursorColor.asString());
+        _cursorColor = color;
+    }
+    if (json.isMember(JsonKey(CursorHeightKey)))
+    {
+        auto cursorHeight{ json[JsonKey(CursorHeightKey)] };
+        _cursorHeight = cursorHeight.asUInt();
+    }
     if (json.isMember(JsonKey(CursorShapeKey)))
     {
         auto cursorShape{ json[JsonKey(CursorShapeKey)] };
@@ -682,25 +686,46 @@ void Profile::LayerJson(const Json::Value& json)
     // Control Settings
     JsonUtils::GetOptionalGuid(json, ConnectionTypeKey, _connectionType);
 
-    JsonUtils::GetWstring(json, CommandlineKey, _commandline);
-
-    JsonUtils::GetWstring(json, FontFaceKey, _fontFace);
-
-    JsonUtils::GetInt(json, FontSizeKey, _fontSize);
-
-    JsonUtils::GetDouble(json, AcrylicTransparencyKey, _acrylicTransparency);
-
-    JsonUtils::GetBool(json, UseAcrylicKey, _useAcrylic);
-
-    JsonUtils::GetBool(json, SuppressApplicationTitleKey, _suppressApplicationTitle);
-
+    if (json.isMember(JsonKey(CommandlineKey)))
+    {
+        auto commandline{ json[JsonKey(CommandlineKey)] };
+        _commandline = GetWstringFromJson(commandline);
+    }
+    if (json.isMember(JsonKey(FontFaceKey)))
+    {
+        auto fontFace{ json[JsonKey(FontFaceKey)] };
+        _fontFace = GetWstringFromJson(fontFace);
+    }
+    if (json.isMember(JsonKey(FontSizeKey)))
+    {
+        auto fontSize{ json[JsonKey(FontSizeKey)] };
+        _fontSize = fontSize.asInt();
+    }
+    if (json.isMember(JsonKey(AcrylicTransparencyKey)))
+    {
+        auto acrylicTransparency{ json[JsonKey(AcrylicTransparencyKey)] };
+        _acrylicTransparency = acrylicTransparency.asFloat();
+    }
+    if (json.isMember(JsonKey(UseAcrylicKey)))
+    {
+        auto useAcrylic{ json[JsonKey(UseAcrylicKey)] };
+        _useAcrylic = useAcrylic.asBool();
+    }
+    if (json.isMember(JsonKey(SuppressApplicationTitleKey)))
+    {
+        auto suppressApplicationTitle{ json[JsonKey(SuppressApplicationTitleKey)] };
+        _suppressApplicationTitle = suppressApplicationTitle.asBool();
+    }
     if (json.isMember(JsonKey(CloseOnExitKey)))
     {
         auto closeOnExit{ json[JsonKey(CloseOnExitKey)] };
         _closeOnExitMode = ParseCloseOnExitMode(closeOnExit);
     }
-
-    JsonUtils::GetWstring(json, PaddingKey, _padding);
+    if (json.isMember(JsonKey(PaddingKey)))
+    {
+        auto padding{ json[JsonKey(PaddingKey)] };
+        _padding = GetWstringFromJson(padding);
+    }
 
     JsonUtils::GetOptionalString(json, ScrollbarStateKey, _scrollbarState);
 
@@ -717,12 +742,6 @@ void Profile::LayerJson(const Json::Value& json)
     JsonUtils::GetOptionalValue(json, BackgroundImageAlignmentKey, _backgroundImageAlignment, &Profile::_ConvertJsonToAlignment);
 
     JsonUtils::GetOptionalValue(json, RetroTerminalEffectKey, _retroTerminalEffect, Profile::_ConvertJsonToBool);
-
-    if (json.isMember(JsonKey(AntialiasingModeKey)))
-    {
-        auto antialiasingMode{ json[JsonKey(AntialiasingModeKey)] };
-        _antialiasingMode = ParseTextAntialiasingMode(GetWstringFromJson(antialiasingMode));
-    }
 }
 
 void Profile::SetFontFace(std::wstring fontFace) noexcept
@@ -1330,49 +1349,3 @@ void Profile::SetRetroTerminalEffect(bool value) noexcept
 {
     _retroTerminalEffect = value;
 }
-
-// Method Description:
-// - Helper function for converting a user-specified antialiasing mode
-//   corresponding TextAntialiasingMode enum value
-// Arguments:
-// - antialiasingMode: The string value from the settings file to parse
-// Return Value:
-// - The corresponding enum value which maps to the string provided by the user
-TextAntialiasingMode Profile::ParseTextAntialiasingMode(const std::wstring& antialiasingMode)
-{
-    if (antialiasingMode == AntialiasingModeCleartype)
-    {
-        return TextAntialiasingMode::Cleartype;
-    }
-    else if (antialiasingMode == AntialiasingModeAliased)
-    {
-        return TextAntialiasingMode::Aliased;
-    }
-    else if (antialiasingMode == AntialiasingModeGrayscale)
-    {
-        return TextAntialiasingMode::Grayscale;
-    }
-    // default behavior for invalid data
-    return TextAntialiasingMode::Grayscale;
-}
-
-// Method Description:
-// - Helper function for converting a TextAntialiasingMode to its corresponding
-//   string value.
-// Arguments:
-// - antialiasingMode: The enum value to convert to a string.
-// Return Value:
-// - The string value for the given TextAntialiasingMode
-std::wstring_view Profile::SerializeTextAntialiasingMode(const TextAntialiasingMode antialiasingMode)
-{
-    switch (antialiasingMode)
-    {
-    case TextAntialiasingMode::Cleartype:
-        return AntialiasingModeCleartype;
-    case TextAntialiasingMode::Aliased:
-        return AntialiasingModeAliased;
-    default:
-    case TextAntialiasingMode::Grayscale:
-        return AntialiasingModeGrayscale;
-    }
-}

src/cascadia/TerminalApp/Profile.h

@@ -123,9 +123,6 @@ private:
     static winrt::Microsoft::Terminal::Settings::CursorStyle _ParseCursorShape(const std::wstring& cursorShapeString);
     static std::wstring_view _SerializeCursorStyle(const winrt::Microsoft::Terminal::Settings::CursorStyle cursorShape);
 
-    static winrt::Microsoft::Terminal::Settings::TextAntialiasingMode ParseTextAntialiasingMode(const std::wstring& antialiasingMode);
-    static std::wstring_view SerializeTextAntialiasingMode(const winrt::Microsoft::Terminal::Settings::TextAntialiasingMode antialiasingMode);
-
     static GUID _GenerateGuidForProfile(const std::wstring& name, const std::optional<std::wstring>& source) noexcept;
 
     static bool _ConvertJsonToBool(const Json::Value& json);
@@ -142,12 +139,12 @@ private:
     std::optional<uint32_t> _defaultForeground;
     std::optional<uint32_t> _defaultBackground;
     std::optional<uint32_t> _selectionBackground;
-    std::optional<uint32_t> _cursorColor;
     std::array<uint32_t, COLOR_TABLE_SIZE> _colorTable;
     std::optional<std::wstring> _tabTitle;
     bool _suppressApplicationTitle;
     int32_t _historySize;
     bool _snapOnInput;
+    uint32_t _cursorColor;
     uint32_t _cursorHeight;
     winrt::Microsoft::Terminal::Settings::CursorStyle _cursorShape;
 
@@ -169,8 +166,6 @@ private:
 
     std::optional<std::wstring> _icon;
 
-    winrt::Microsoft::Terminal::Settings::TextAntialiasingMode _antialiasingMode;
-
     friend class TerminalAppLocalTests::SettingsTests;
     friend class TerminalAppLocalTests::ProfileTests;
     friend class TerminalAppUnitTests::JsonTests;

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

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -223,18 +223,6 @@ Temporarily using the Windows Terminal default settings.
   <data name="InvalidIcon" xml:space="preserve">
     <value>Found a profile with an invalid "icon". Defaulting that profile to have no icon. Make sure that when setting an "icon", the value is a valid file path to an image.</value>
   </data>
-  <data name="AtLeastOneKeybindingWarning" xml:space="preserve">
-    <value>Warnings were found while parsing your keybindings:
-  </value>
-  </data>
-  <data name="TooManyKeysForChord" xml:space="preserve">
-    <value>    Found a keybinding with too many strings for the "keys" array. There should only be one string value in the "keys" array.
-  </value>
-  </data>
-  <data name="MissingRequiredParameter" xml:space="preserve">
-    <value>    Found a keybinding that was missing a required parameter value. This keybinding will be ignored.
-  </value>
-  </data>
   <data name="CmdCommandArgDesc" xml:space="preserve">
     <value>An optional command, with arguments, to be spawned in the new tab or pane</value>
   </data>
@@ -268,19 +256,4 @@ Temporarily using the Windows Terminal default settings.
   <data name="CmdStartingDirArgDesc" xml:space="preserve">
     <value>Open in the given directory instead of the profile's set startingDirectory</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>
-  <data name="NewTabSplitButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>New Tab</value>
-  </data>
-  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Close</value>
-  </data>
-  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Maximize</value>
-  </data>
-  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Minimize</value>
-  </data>
 </root>

src/cascadia/TerminalApp/TabRowControl.xaml

@@ -22,7 +22,6 @@ the MIT License. See LICENSE in the project root for license information. -->
         <mux:TabView.TabStripFooter>
             <mux:SplitButton
                 x:Name="NewTabButton"
-                x:Uid="NewTabSplitButton"
                 Click="OnNewTabButtonClick"
                 VerticalAlignment="Stretch"
                 HorizontalAlignment="Left"
@@ -30,8 +29,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                 UseLayoutRounding="true"
                 FontFamily="Segoe MDL2 Assets"
                 FontWeight="SemiLight"
-                FontSize="12"
-                AutomationProperties.AccessibilityView="Control">
+                FontSize="12">
                 <!-- U+E710 is the fancy plus icon. -->
                 <mux:SplitButton.Resources>
 		    <!-- Override the SplitButton* resources to match the tab view's button's styles. -->

src/cascadia/TerminalApp/TerminalApp.vcxproj

@@ -19,7 +19,6 @@
   </PropertyGroup>
   <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
-  <Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" />
   <!-- ========================= XAML files ======================== -->
   <ItemGroup>
     <!-- DON'T PUT XAML FILES HERE! Put them in TerminalAppLib.vcxproj -->
@@ -78,17 +77,11 @@
       <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
     </ProjectReference>
   </ItemGroup>
-
-  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\build\native\Microsoft.UI.Xaml.targets')" />
-  <Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\build\native\Microsoft.UI.Xaml.targets'))" />
-    <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets'))" />
-  </Target>
-
+  <PropertyGroup>
+    <!-- A small helper for paths to the compiled cppwinrt projects -->
+    <_BinRoot Condition="'$(Platform)' != 'Win32'">$(OpenConsoleDir)$(Platform)\$(Configuration)\</_BinRoot>
+    <_BinRoot Condition="'$(Platform)' == 'Win32'">$(OpenConsoleDir)$(Configuration)\</_BinRoot>
+  </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(OpenConsoleDir)\dep\jsoncpp\json;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -63,14 +63,6 @@ namespace winrt::TerminalApp::implementation
         _tabView = _tabRow.TabView();
         _rearranging = false;
 
-        // GH#3581 - There's a platform limitation that causes us to crash when we rearrange tabs.
-        // Xaml tries to send a drag visual (to wit: a screenshot) to the drag hosting process,
-        // but that process is running at a different IL than us.
-        // For now, we're disabling elevated drag.
-        const auto isElevated = ::winrt::Windows::UI::Xaml::Application::Current().as<::winrt::TerminalApp::App>().Logic().IsElevated();
-        _tabView.CanReorderTabs(!isElevated);
-        _tabView.CanDragTabs(!isElevated);
-
         _tabView.TabDragStarting([weakThis{ get_weak() }](auto&& /*o*/, auto&& /*a*/) {
             if (auto page{ weakThis.get() })
             {
@@ -380,7 +372,6 @@ namespace winrt::TerminalApp::implementation
                 WUX::Controls::IconSourceElement iconElement;
                 iconElement.IconSource(iconSource);
                 profileMenuItem.Icon(iconElement);
-                Automation::AutomationProperties::SetAccessibilityView(iconElement, Automation::Peers::AccessibilityView::Raw);
             }
 
             if (profile.GetGuid() == defaultProfileGuid)
@@ -519,6 +510,7 @@ namespace winrt::TerminalApp::implementation
 
         // Create a connection based on the values in our settings object.
         const auto connection = _CreateConnectionFromSettings(profileGuid, settings);
+
         TermControl term{ settings, connection };
 
         // Add the new tab to the list of our tabs.
@@ -610,10 +602,8 @@ namespace winrt::TerminalApp::implementation
             profile->GetConnectionType() == AzureConnectionType &&
             TerminalConnection::AzureConnection::IsAzureConnectionAvailable())
         {
-            // TODO GH#4661: Replace this with directly using the AzCon when our VT is better
-            std::filesystem::path azBridgePath{ wil::GetModuleFileNameW<std::wstring>(nullptr) };
-            azBridgePath.replace_filename(L"TerminalAzBridge.exe");
-            connection = TerminalConnection::ConptyConnection(azBridgePath.wstring(), L".", L"Azure", settings.InitialRows(), settings.InitialCols(), winrt::guid());
+            connection = TerminalConnection::AzureConnection(settings.InitialRows(),
+                                                             settings.InitialCols());
         }
 
         else if (profile->HasConnectionType() &&
@@ -673,9 +663,8 @@ namespace winrt::TerminalApp::implementation
                                               const RoutedEventArgs&)
     {
         const auto feedbackUriValue = RS_(L"FeedbackUriValue");
-        winrt::Windows::Foundation::Uri feedbackUri{ feedbackUriValue };
 
-        winrt::Windows::System::Launcher::LaunchUriAsync(feedbackUri);
+        winrt::Windows::System::Launcher::LaunchUriAsync({ feedbackUriValue });
     }
 
     // Method Description:
@@ -1053,12 +1042,10 @@ namespace winrt::TerminalApp::implementation
     // Arguments:
     // - splitType: one value from the TerminalApp::SplitState enum, indicating how the
     //   new pane should be split from its parent.
-    // - splitMode: value from TerminalApp::SplitType enum, indicating the profile to be used in the newly split pane.
     // - newTerminalArgs: An object that may contain a blob of parameters to
     //   control which profile is created and with possible other
     //   configurations. See CascadiaSettings::BuildSettings for more details.
     void TerminalPage::_SplitPane(const TerminalApp::SplitState splitType,
-                                  const TerminalApp::SplitType splitMode,
                                   const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs)
     {
         // Do nothing if we're requesting no split.
@@ -1077,24 +1064,7 @@ namespace winrt::TerminalApp::implementation
 
         auto focusedTab = _GetStrongTabImpl(*indexOpt);
 
-        winrt::Microsoft::Terminal::Settings::TerminalSettings controlSettings;
-        GUID realGuid;
-        bool profileFound = false;
-
-        if (splitMode == TerminalApp::SplitType::Duplicate)
-        {
-            std::optional<GUID> current_guid = focusedTab->GetFocusedProfile();
-            if (current_guid)
-            {
-                profileFound = true;
-                controlSettings = _settings->BuildSettings(current_guid.value());
-                realGuid = current_guid.value();
-            }
-        }
-        if (!profileFound)
-        {
-            std::tie(realGuid, controlSettings) = _settings->BuildSettings(newTerminalArgs);
-        }
+        const auto [realGuid, controlSettings] = _settings->BuildSettings(newTerminalArgs);
 
         const auto controlConnection = _CreateConnectionFromSettings(realGuid, controlSettings);
 
@@ -1353,7 +1323,7 @@ namespace winrt::TerminalApp::implementation
     bool TerminalPage::_CopyText(const bool trimTrailingWhitespace)
     {
         const auto control = _GetActiveControl();
-        return control.CopySelectionToClipboard(!trimTrailingWhitespace);
+        return control.CopySelectionToClipboard(trimTrailingWhitespace);
     }
 
     // Method Description:

src/cascadia/TerminalApp/TerminalPage.h

@@ -122,7 +122,7 @@ namespace winrt::TerminalApp::implementation
         // Todo: add more event implementations here
         // MSFT:20641986: Add keybindings for New Window
         void _Scroll(int delta);
-        void _SplitPane(const winrt::TerminalApp::SplitState splitType, const winrt::TerminalApp::SplitType splitMode = winrt::TerminalApp::SplitType::Manual, const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs = nullptr);
+        void _SplitPane(const winrt::TerminalApp::SplitState splitType, const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs = nullptr);
         void _ResizePane(const Direction& direction);
         void _ScrollPage(int delta);
         void _SetAcceleratorForMenuItem(Windows::UI::Xaml::Controls::MenuFlyoutItem& menuItem, const winrt::Microsoft::Terminal::Settings::KeyChord& keyChord);

src/cascadia/TerminalApp/TerminalWarnings.h

@@ -25,11 +25,7 @@ namespace TerminalApp
         DuplicateProfile = 1,
         UnknownColorScheme = 2,
         InvalidBackgroundImage = 3,
-        InvalidIcon = 4,
-        AtLeastOneKeybindingWarning = 5,
-        TooManyKeysForChord = 6,
-        MissingRequiredParameter = 7,
-        WARNINGS_SIZE // IMPORTANT: This MUST be the last value in this enum. It's an unused placeholder.
+        InvalidIcon = 4
     };
 
     // SettingsLoadWarnings are scenarios where the settings had invalid state
@@ -37,8 +33,7 @@ namespace TerminalApp
     enum class SettingsLoadErrors : uint32_t
     {
         NoProfiles = 0,
-        AllProfilesHidden = 1,
-        ERRORS_SIZE // IMPORTANT: This MUST be the last value in this enum. It's an unused placeholder.
+        AllProfilesHidden = 1
     };
 
     // This is a helper class to wrap up a SettingsLoadErrors into a proper

src/cascadia/TerminalApp/WslDistroGenerator.cpp

@@ -63,13 +63,13 @@ std::vector<TerminalApp::Profile> WslDistroGenerator::GenerateProfiles()
                                              nullptr,
                                              &si,
                                              &pi));
-    switch (WaitForSingleObject(pi.hProcess, 2000))
+    switch (WaitForSingleObject(pi.hProcess, INFINITE))
     {
     case WAIT_OBJECT_0:
         break;
     case WAIT_ABANDONED:
     case WAIT_TIMEOUT:
-        return profiles;
+        THROW_HR(ERROR_CHILD_NOT_COMPLETE);
     case WAIT_FAILED:
         THROW_LAST_ERROR();
     default:

src/cascadia/TerminalApp/defaults.json

@@ -22,6 +22,7 @@
             "startingDirectory": "%USERPROFILE%",
             "closeOnExit": "graceful",
             "colorScheme": "Campbell Powershell",
+            "cursorColor": "#FFFFFF",
             "cursorShape": "bar",
             "fontFace": "Consolas",
             "fontSize": 12,
@@ -29,8 +30,7 @@
             "icon": "ms-appx:///ProfileIcons/{61c54bbd-c2c6-5271-96e7-009a87ff44bf}.png",
             "padding": "8, 8, 8, 8",
             "snapOnInput": true,
-            "useAcrylic": false,
-            "antialiasingMode": "grayscale"
+            "useAcrylic": false
         },
         {
             "guid": "{0caa0dad-35be-5f56-a8ff-afceeeaa6101}",
@@ -40,6 +40,7 @@
             "startingDirectory": "%USERPROFILE%",
             "closeOnExit": "graceful",
             "colorScheme": "Campbell",
+            "cursorColor": "#FFFFFF",
             "cursorShape": "bar",
             "fontFace": "Consolas",
             "fontSize": 12,
@@ -47,8 +48,7 @@
             "icon": "ms-appx:///ProfileIcons/{0caa0dad-35be-5f56-a8ff-afceeeaa6101}.png",
             "padding": "8, 8, 8, 8",
             "snapOnInput": true,
-            "useAcrylic": false,
-            "antialiasingMode": "grayscale"
+            "useAcrylic": false
         }
     ],
     "schemes":
@@ -57,7 +57,6 @@
             "name": "Campbell",
             "foreground": "#CCCCCC",
             "background": "#0C0C0C",
-            "cursorColor": "#FFFFFF",
             "black": "#0C0C0C",
             "red": "#C50F1F",
             "green": "#13A10E",
@@ -79,7 +78,6 @@
             "name": "Campbell Powershell",
             "foreground": "#CCCCCC",
             "background": "#012456",
-            "cursorColor": "#FFFFFF",
             "black": "#0C0C0C",
             "red": "#C50F1F",
             "green": "#13A10E",
@@ -101,7 +99,6 @@
             "name": "Vintage",
             "foreground": "#C0C0C0",
             "background": "#000000",
-            "cursorColor": "#FFFFFF",
             "black": "#000000",
             "red": "#800000",
             "green": "#008000",
@@ -123,7 +120,6 @@
             "name": "One Half Dark",
             "foreground": "#DCDFE4",
             "background": "#282C34",
-            "cursorColor": "#FFFFFF",
             "black": "#282C34",
             "red": "#E06C75",
             "green": "#98C379",
@@ -145,7 +141,6 @@
             "name": "One Half Light",
             "foreground": "#383A42",
             "background": "#FAFAFA",
-            "cursorColor": "#4F525D",
             "black": "#383A42",
             "red": "#E45649",
             "green": "#50A14F",
@@ -167,7 +162,6 @@
             "name": "Solarized Dark",
             "foreground": "#839496",
             "background": "#002B36",
-            "cursorColor": "#FFFFFF",
             "black": "#073642",
             "red": "#DC322F",
             "green": "#859900",
@@ -189,7 +183,6 @@
             "name": "Solarized Light",
             "foreground": "#657B83",
             "background": "#FDF6E3",
-            "cursorColor": "#002B36",
             "black": "#073642",
             "red": "#DC322F",
             "green": "#859900",
@@ -210,55 +203,55 @@
     ],
     "keybindings":
     [
-        { "command": "closePane", "keys": "ctrl+shift+w" },
-        { "command": "closeWindow", "keys": "alt+f4" },
-        { "command": "copy", "keys": "ctrl+shift+c" },
-        { "command": "copy", "keys": "ctrl+insert" },
-        { "command": "decreaseFontSize", "keys": "ctrl+-" },
-        { "command": "duplicateTab", "keys": "ctrl+shift+d" },
-        { "command": "increaseFontSize", "keys": "ctrl+=" },
-        { "command": { "action": "moveFocus", "direction": "down" }, "keys": "alt+down" },
-        { "command": { "action": "moveFocus", "direction": "left" }, "keys": "alt+left" },
-        { "command": { "action": "moveFocus", "direction": "right" }, "keys": "alt+right" },
-        { "command": { "action": "moveFocus", "direction": "up" }, "keys": "alt+up" },
-        { "command": "newTab", "keys": "ctrl+shift+t" },
-        { "command": { "action": "newTab", "index": 0 }, "keys": "ctrl+shift+1" },
-        { "command": { "action": "newTab", "index": 1 }, "keys": "ctrl+shift+2" },
-        { "command": { "action": "newTab", "index": 2 }, "keys": "ctrl+shift+3" },
-        { "command": { "action": "newTab", "index": 3 }, "keys": "ctrl+shift+4" },
-        { "command": { "action": "newTab", "index": 4 }, "keys": "ctrl+shift+5" },
-        { "command": { "action": "newTab", "index": 5 }, "keys": "ctrl+shift+6" },
-        { "command": { "action": "newTab", "index": 6 }, "keys": "ctrl+shift+7" },
-        { "command": { "action": "newTab", "index": 7 }, "keys": "ctrl+shift+8" },
-        { "command": { "action": "newTab", "index": 8 }, "keys": "ctrl+shift+9" },
-        { "command": "nextTab", "keys": "ctrl+tab" },
-        { "command": "openNewTabDropdown", "keys": "ctrl+shift+space" },
-        { "command": "openSettings", "keys": "ctrl+," },
-        { "command": "paste", "keys": "ctrl+shift+v" },
-        { "command": "paste", "keys": "shift+insert" },
-        { "command": "prevTab", "keys": "ctrl+shift+tab" },
-        { "command": "resetFontSize", "keys": "ctrl+0" },
-        { "command": { "action": "resizePane", "direction": "down" }, "keys": "alt+shift+down" },
-        { "command": { "action": "resizePane", "direction": "left" }, "keys": "alt+shift+left" },
-        { "command": { "action": "resizePane", "direction": "right" }, "keys": "alt+shift+right" },
-        { "command": { "action": "resizePane", "direction": "up" }, "keys": "alt+shift+up" },
-        { "command": "scrollDown", "keys": "ctrl+shift+down" },
-        { "command": "scrollDownPage", "keys": "ctrl+shift+pgdn" },
-        { "command": "scrollUp", "keys": "ctrl+shift+up" },
-        { "command": "scrollUpPage", "keys": "ctrl+shift+pgup" },
-        { "command": { "action": "splitPane", "split": "horizontal"}, "keys": "alt+shift+-" },
-        { "command": { "action": "splitPane", "split": "vertical"}, "keys": "alt+shift+plus" },
-        { "command": { "action": "switchToTab", "index": 0 }, "keys": "ctrl+alt+1" },
-        { "command": { "action": "switchToTab", "index": 1 }, "keys": "ctrl+alt+2" },
-        { "command": { "action": "switchToTab", "index": 2 }, "keys": "ctrl+alt+3" },
-        { "command": { "action": "switchToTab", "index": 3 }, "keys": "ctrl+alt+4" },
-        { "command": { "action": "switchToTab", "index": 4 }, "keys": "ctrl+alt+5" },
-        { "command": { "action": "switchToTab", "index": 5 }, "keys": "ctrl+alt+6" },
-        { "command": { "action": "switchToTab", "index": 6 }, "keys": "ctrl+alt+7" },
-        { "command": { "action": "switchToTab", "index": 7 }, "keys": "ctrl+alt+8" },
-        { "command": { "action": "switchToTab", "index": 8 }, "keys": "ctrl+alt+9" },
-        { "command": "find", "keys": "ctrl+shift+f" },
-        { "command": "toggleFullscreen", "keys": "alt+enter" },
-        { "command": "toggleFullscreen", "keys": "f11" }
+        { "command": "closePane", "keys": [ "ctrl+shift+w" ] },
+        { "command": "closeWindow", "keys": [ "alt+f4" ] },
+        { "command": "copy", "keys": [ "ctrl+shift+c" ] },
+        { "command": "copy", "keys": [ "ctrl+insert" ] },
+        { "command": "decreaseFontSize", "keys": [ "ctrl+-" ] },
+        { "command": "duplicateTab", "keys": [ "ctrl+shift+d" ] },
+        { "command": "increaseFontSize", "keys": [ "ctrl+=" ] },
+        { "command": { "action": "moveFocus", "direction": "down" }, "keys": [ "alt+down" ] },
+        { "command": { "action": "moveFocus", "direction": "left" }, "keys": [ "alt+left" ] },
+        { "command": { "action": "moveFocus", "direction": "right" }, "keys": [ "alt+right" ] },
+        { "command": { "action": "moveFocus", "direction": "up" }, "keys": [ "alt+up" ] },
+        { "command": "newTab", "keys": [ "ctrl+shift+t" ] },
+        { "command": { "action": "newTab", "index": 0 }, "keys": ["ctrl+shift+1"] },
+        { "command": { "action": "newTab", "index": 1 }, "keys": ["ctrl+shift+2"] },
+        { "command": { "action": "newTab", "index": 2 }, "keys": ["ctrl+shift+3"] },
+        { "command": { "action": "newTab", "index": 3 }, "keys": ["ctrl+shift+4"] },
+        { "command": { "action": "newTab", "index": 4 }, "keys": ["ctrl+shift+5"] },
+        { "command": { "action": "newTab", "index": 5 }, "keys": ["ctrl+shift+6"] },
+        { "command": { "action": "newTab", "index": 6 }, "keys": ["ctrl+shift+7"] },
+        { "command": { "action": "newTab", "index": 7 }, "keys": ["ctrl+shift+8"] },
+        { "command": { "action": "newTab", "index": 8 }, "keys": ["ctrl+shift+9"] },
+        { "command": "nextTab", "keys": [ "ctrl+tab" ] },
+        { "command": "openNewTabDropdown", "keys": [ "ctrl+shift+space" ] },
+        { "command": "openSettings", "keys": [ "ctrl+," ] },
+        { "command": "paste", "keys": [ "ctrl+shift+v" ] },
+        { "command": "paste", "keys": [ "shift+insert" ] },
+        { "command": "prevTab", "keys": [ "ctrl+shift+tab" ] },
+        { "command": "resetFontSize", "keys": ["ctrl+0"]},
+        { "command": { "action": "resizePane", "direction": "down" }, "keys": [ "alt+shift+down" ] },
+        { "command": { "action": "resizePane", "direction": "left" }, "keys": [ "alt+shift+left" ] },
+        { "command": { "action": "resizePane", "direction": "right" }, "keys": [ "alt+shift+right" ] },
+        { "command": { "action": "resizePane", "direction": "up" }, "keys": [ "alt+shift+up" ] },
+        { "command": "scrollDown", "keys": [ "ctrl+shift+down" ] },
+        { "command": "scrollDownPage", "keys": [ "ctrl+shift+pgdn" ] },
+        { "command": "scrollUp", "keys": [ "ctrl+shift+up" ] },
+        { "command": "scrollUpPage", "keys": [ "ctrl+shift+pgup" ] },
+        { "command": { "action": "splitPane", "split": "horizontal"}, "keys": [ "alt+shift+-" ] },
+        { "command": { "action": "splitPane", "split": "vertical"}, "keys": [ "alt+shift+plus" ] },
+        { "command": { "action": "switchToTab", "index": 0 }, "keys": ["ctrl+alt+1"] },
+        { "command": { "action": "switchToTab", "index": 1 }, "keys": ["ctrl+alt+2"] },
+        { "command": { "action": "switchToTab", "index": 2 }, "keys": ["ctrl+alt+3"] },
+        { "command": { "action": "switchToTab", "index": 3 }, "keys": ["ctrl+alt+4"] },
+        { "command": { "action": "switchToTab", "index": 4 }, "keys": ["ctrl+alt+5"] },
+        { "command": { "action": "switchToTab", "index": 5 }, "keys": ["ctrl+alt+6"] },
+        { "command": { "action": "switchToTab", "index": 6 }, "keys": ["ctrl+alt+7"] },
+        { "command": { "action": "switchToTab", "index": 7 }, "keys": ["ctrl+alt+8"] },
+        { "command": { "action": "switchToTab", "index": 8 }, "keys": ["ctrl+alt+9"] },
+        { "command": "find", "keys": [ "ctrl+shift+f" ] },
+        { "command": "toggleFullscreen", "keys": [ "alt+enter" ] },
+        { "command": "toggleFullscreen", "keys": [ "f11" ] }
     ]
 }

src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj

@@ -22,11 +22,9 @@
       When we do this, the XBF ends up in resources.pri.
     -->
     <DisableEmbeddedXbf>false</DisableEmbeddedXbf>
-    <XamlComponentResourceLocation>nested</XamlComponentResourceLocation>
   </PropertyGroup>
   <Import Project="..\..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
-  <Import Project="..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props" Condition="Exists('..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.props')" />
 
   <ItemDefinitionGroup>
     <ClCompile>
@@ -188,7 +186,6 @@
   <ItemGroup>
     <!-- If you add idl files here, make sure to include their implementation's
     header in TerminalApp.vcxproj (as well as in this file) -->
-    <Midl Include="../IF7Listener.idl" />
     <Midl Include="../App.idl">
       <DependentUpon>../App.xaml</DependentUpon>
     </Midl>
@@ -216,7 +213,7 @@
   </ItemGroup>
   <!-- ========================= Misc Files ======================== -->
   <ItemGroup>
-    <PRIResource Include="../Resources/Resources.language-en.resw" />
+    <PRIResource Include="../Resources/en-US/Resources.resw" />
     <None Include="../packages.config" />
   </ItemGroup>
   <!-- ========================= Project References ======================== -->
@@ -284,9 +281,39 @@
   </ItemDefinitionGroup>
   <!-- ========================= Globals ======================== -->
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
-
-  <Import Project="..\..\..\..\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\..\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\build\native\Microsoft.UI.Xaml.targets')" />
-  <Import Project="..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
+  <!-- Manually include MUX here, instead of importing its targets file. We need
+  to reference its winmd, but very specifically with the
+  CopyLocalSatelliteAssemblies and Private properties set to false, as to not
+  have projects including us double-including MUX's .winmd. The following blob
+  is taken straight from the MUX build targets, with the aforementioned
+  changes.-->
+  <PropertyGroup>
+    <Native-Platform Condition="'$(Platform)' == 'Win32'">x86</Native-Platform>
+    <Native-Platform Condition="'$(Platform)' != 'Win32'">$(Platform)</Native-Platform>
+    <_MUXRoot>$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\</_MUXRoot>
+    <_MUXAppRoot>$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\</_MUXAppRoot>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Microsoft.UI.XAML -->
+    <Reference Include="$(_MUXRoot)lib\uap10.0\Microsoft.UI.Xaml.winmd">
+      <Implementation>Microsoft.UI.Xaml.dll</Implementation>
+      <IsWinMDFile>true</IsWinMDFile>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+      <Private>true</Private>
+    </Reference>
+    <ReferenceCopyLocalPaths Include="$(_MUXRoot)runtimes\win10-$(Native-Platform)\native\Microsoft.UI.Xaml.dll" />
+    <ReferenceCopyLocalPaths Include="$(_MUXRoot)runtimes\win10-$(Native-Platform)\native\Microsoft.UI.Xaml.pri" />
+    <!-- Microsoft.UI.XAML.Application -->
+    <Reference Include="$(_MUXAppRoot)lib\uap10.0\Microsoft.Toolkit.Win32.UI.XamlHost.winmd">
+      <Implementation>Microsoft.Toolkit.Win32.UI.XamlHost.dll</Implementation>
+      <IsWinMDFile>true</IsWinMDFile>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+      <Private>false</Private>
+    </Reference>
+    <ReferenceCopyLocalPaths Include="$(_MUXAppRoot)lib\uap10.0\Microsoft.Toolkit.Win32.UI.XamlHost.*" />
+    <ReferenceCopyLocalPaths Include="$(_MUXAppRoot)runtimes\win10-$(Native-Platform)\native\Microsoft.Toolkit.Win32.UI.XamlHost.*" />
+  </ItemGroup>
+  <!-- End MUX import -->
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
@@ -294,7 +321,6 @@
     <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.3.191217003-prerelease\build\native\Microsoft.UI.Xaml.targets'))" />
     <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.0.0\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets'))" />
   </Target>
-
   <!--
     By default, the PRI file will contain resource paths beginning with the
     project name. Since we enabled XBF embedding, this *also* includes App.xbf.
@@ -328,4 +354,4 @@
   <Target Name="_TerminalAppGenerateUserSettingsH" Inputs="..\userDefaults.json" Outputs="Generated Files\userDefaults.h" BeforeTargets="BeforeClCompile">
     <Exec Command="powershell.exe -noprofile –ExecutionPolicy Unrestricted $(OpenConsoleDir)\tools\GenerateHeaderForJson.ps1 -JsonFile ..\userDefaults.json -OutPath '&quot;Generated Files\userDefaults.h&quot;' -VariableName UserSettingsJson" />
   </Target>
-</Project>
+</Project>

src/cascadia/TerminalApp/lib/pch.h

@@ -36,7 +36,6 @@
 #include <winrt/Windows.UI.Xaml.Hosting.h>
 #include "winrt/Windows.UI.Xaml.Markup.h"
 #include "winrt/Windows.UI.Xaml.Documents.h"
-#include "winrt/Windows.UI.Xaml.Automation.h"
 #include <winrt/Windows.ApplicationModel.DataTransfer.h>
 
 #include <winrt/Microsoft.Toolkit.Win32.UI.XamlHost.h>

src/cascadia/TerminalApp/packages.config

@@ -2,5 +2,5 @@
 <packages>
   <package id="Microsoft.Toolkit.Win32.UI.XamlApplication" version="6.0.0" targetFramework="native" />
   <package id="Microsoft.UI.Xaml" version="2.3.191217003-prerelease" targetFramework="native" />
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.200316.3" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.190730.2" targetFramework="native" />
 </packages>

src/cascadia/TerminalAzBridge/ConsoleInputReader.cpp

@@ -1,87 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "ConsoleInputReader.h"
-#include "unicode.hpp"
-
-ConsoleInputReader::ConsoleInputReader(HANDLE handle) :
-    _handle(handle)
-{
-    _buffer.resize(BufferSize);
-    _convertedString.reserve(BufferSize);
-}
-
-void ConsoleInputReader::SetWindowSizeChangedCallback(std::function<void()> callback)
-{
-    _windowSizeChangedCallback = std::move(callback);
-}
-
-std::optional<std::wstring_view> ConsoleInputReader::Read()
-{
-    DWORD readCount{ 0 };
-
-    _convertedString.clear();
-    while (_convertedString.empty())
-    {
-        _buffer.resize(BufferSize);
-        BOOL succeeded =
-            ReadConsoleInputW(_handle, _buffer.data(), gsl::narrow_cast<DWORD>(_buffer.size()), &readCount);
-        if (!succeeded)
-        {
-            return std::nullopt;
-        }
-
-        _buffer.resize(readCount);
-        for (auto it = _buffer.begin(); it != _buffer.end(); ++it)
-        {
-            if (it->EventType == WINDOW_BUFFER_SIZE_EVENT && _windowSizeChangedCallback)
-            {
-                _windowSizeChangedCallback();
-            }
-            else if (it->EventType == KEY_EVENT)
-            {
-                const auto& keyEvent = it->Event.KeyEvent;
-                if (keyEvent.bKeyDown || (!keyEvent.bKeyDown && keyEvent.wVirtualKeyCode == VK_MENU))
-                {
-                    // Got a high surrogate at the end of the buffer
-                    if (IS_HIGH_SURROGATE(keyEvent.uChar.UnicodeChar))
-                    {
-                        _highSurrogate.emplace(keyEvent.uChar.UnicodeChar);
-                        continue; // we've consumed it -- only dispatch it if we get a low
-                    }
-
-                    if (IS_LOW_SURROGATE(keyEvent.uChar.UnicodeChar))
-                    {
-                        // No matter what we do, we want to destructively consume the high surrogate
-                        if (const auto oldHighSurrogate{ std::exchange(_highSurrogate, std::nullopt) })
-                        {
-                            _convertedString.push_back(*_highSurrogate);
-                        }
-                        else
-                        {
-                            // If we get a low without a high surrogate, we've done everything we can.
-                            // This is an illegal state.
-                            _convertedString.push_back(UNICODE_REPLACEMENT);
-                            continue; // onto the next event
-                        }
-                    }
-
-                    // (\0 with a scancode is probably a modifier key, not a VT input key)
-                    if (keyEvent.uChar.UnicodeChar != L'\0' || keyEvent.wVirtualScanCode == 0)
-                    {
-                        if (_highSurrogate) // non-destructive: we don't want to set it to nullopt needlessly for every character
-                        {
-                            // If we get a high surrogate *here*, we didn't find a low surrogate.
-                            // This state is also illegal.
-                            _convertedString.push_back(UNICODE_REPLACEMENT);
-                            _highSurrogate.reset();
-                        }
-                        _convertedString.push_back(keyEvent.uChar.UnicodeChar);
-                    }
-                }
-            }
-        }
-    }
-    return _convertedString;
-}

src/cascadia/TerminalAzBridge/ConsoleInputReader.h

@@ -1,33 +0,0 @@
-/*++
-
-Copyright (c) Microsoft Corporation.
-Licensed under the MIT license.
-
-Module Name:
-
-    ConsoleInputReader.h
-
-Abstract:
-
-    This file contains a class whose sole purpose is to
-    abstract away a bunch of details you usually need to
-    know to read VT from a console input handle.
-
---*/
-
-class ConsoleInputReader
-{
-public:
-    ConsoleInputReader(HANDLE handle);
-    void SetWindowSizeChangedCallback(std::function<void()> callback);
-    std::optional<std::wstring_view> Read();
-
-private:
-    static constexpr size_t BufferSize{ 128 };
-
-    HANDLE _handle;
-    std::wstring _convertedString;
-    std::vector<INPUT_RECORD> _buffer;
-    std::optional<wchar_t> _highSurrogate;
-    std::function<void()> _windowSizeChangedCallback;
-};

src/cascadia/TerminalAzBridge/TerminalAzBridge.vcxproj

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{067F0A06-FCB7-472C-96E9-B03B54E8E18D}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>TerminalAzBridge</RootNamespace>
-    <ProjectName>TerminalAzBridge</ProjectName>
-    <TargetName>TerminalAzBridge</TargetName>
-    <ConfigurationType>Application</ConfigurationType>
-    <OpenConsoleUniversalApp>false</OpenConsoleUniversalApp>
-    <ApplicationType>Windows Store</ApplicationType>
-    <NoOutputRedirection>true</NoOutputRedirection>
-  </PropertyGroup>
-
-  <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
-  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
-
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <PropertyGroup>
-    <GenerateManifest>true</GenerateManifest>
-    <EmbedManifest>true</EmbedManifest>
-  </PropertyGroup>
-
-  <!-- Source Files -->
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="ConsoleInputReader.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="ConsoleInputReader.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <!-- Dependencies -->
-  <ItemGroup>
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj">
-      <Project>{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}</Project>
-    </ProjectReference>
-    <ProjectReference Include="$(OpenConsoleDir)src\types\lib\types.vcxproj" />
-  </ItemGroup>
-
-  <!--
-    This ItemGroup and the Globals PropertyGroup below it are required in order
-    to enable F5 debugging for the unpackaged application
-    -->
-  <ItemGroup>
-    <PropertyPageSchema Include="$(VCTargetsPath)$(LangID)\debugger_general.xml" />
-    <PropertyPageSchema Include="$(VCTargetsPath)$(LangID)\debugger_local_windows.xml" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-
-  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
-
-  <Import Project="$(OpenConsoleDir)\build\rules\GenerateSxsManifestsFromWinmds.targets" />
-</Project>

src/cascadia/TerminalAzBridge/main.cpp

@@ -1,104 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "winrt/Microsoft.Terminal.TerminalConnection.h"
-#include "ConsoleInputReader.h"
-
-using namespace winrt;
-using namespace winrt::Windows::Foundation;
-using namespace winrt::Microsoft::Terminal::TerminalConnection;
-
-static COORD GetConsoleScreenSize(HANDLE outputHandle)
-{
-    CONSOLE_SCREEN_BUFFER_INFOEX csbiex{};
-    csbiex.cbSize = sizeof(csbiex);
-    GetConsoleScreenBufferInfoEx(outputHandle, &csbiex);
-    return {
-        (csbiex.srWindow.Right - csbiex.srWindow.Left) + 1,
-        (csbiex.srWindow.Bottom - csbiex.srWindow.Top) + 1
-    };
-}
-
-static ConnectionState RunConnectionToCompletion(const ITerminalConnection& connection, HANDLE outputHandle, HANDLE inputHandle)
-{
-    connection.TerminalOutput([outputHandle](const winrt::hstring& output) {
-        WriteConsoleW(outputHandle, output.data(), output.size(), nullptr, nullptr);
-    });
-
-    // Detach a thread to spin the console read indefinitely.
-    // This application exits when the connection is closed, so
-    // the connection's lifetime will outlast this thread.
-    std::thread([connection, outputHandle, inputHandle] {
-        ConsoleInputReader reader{ inputHandle };
-        reader.SetWindowSizeChangedCallback([&]() {
-            const auto size = GetConsoleScreenSize(outputHandle);
-
-            connection.Resize(size.Y, size.X);
-        });
-
-        while (true)
-        {
-            auto input = reader.Read();
-            if (input)
-            {
-                connection.WriteInput(*input);
-            }
-        }
-    }).detach();
-
-    std::condition_variable stateChangeVar;
-    std::optional<ConnectionState> state;
-    std::mutex stateMutex;
-
-    connection.StateChanged([&](auto&& /*s*/, auto&& /*e*/) {
-        std::unique_lock<std::mutex> lg{ stateMutex };
-        state = connection.State();
-        stateChangeVar.notify_all();
-    });
-
-    connection.Start();
-
-    std::unique_lock<std::mutex> lg{ stateMutex };
-    stateChangeVar.wait(lg, [&]() {
-        if (!state.has_value())
-        {
-            return false;
-        }
-        return state.value() == ConnectionState::Closed || state.value() == ConnectionState::Failed;
-    });
-
-    return state.value();
-}
-
-int wmain(int /*argc*/, wchar_t** /*argv*/)
-{
-    winrt::init_apartment(winrt::apartment_type::single_threaded);
-
-    DWORD inputMode{}, outputMode{};
-    HANDLE conIn{ GetStdHandle(STD_INPUT_HANDLE) }, conOut{ GetStdHandle(STD_OUTPUT_HANDLE) };
-    UINT codepage{ GetConsoleCP() }, outputCodepage{ GetConsoleOutputCP() };
-
-    RETURN_IF_WIN32_BOOL_FALSE(GetConsoleMode(conIn, &inputMode));
-    RETURN_IF_WIN32_BOOL_FALSE(GetConsoleMode(conOut, &outputMode));
-
-    RETURN_IF_WIN32_BOOL_FALSE(SetConsoleMode(conIn, ENABLE_WINDOW_INPUT | ENABLE_VIRTUAL_TERMINAL_INPUT));
-    RETURN_IF_WIN32_BOOL_FALSE(SetConsoleMode(conOut, ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING | ENABLE_WRAP_AT_EOL_OUTPUT | DISABLE_NEWLINE_AUTO_RETURN));
-    RETURN_IF_WIN32_BOOL_FALSE(SetConsoleCP(CP_UTF8));
-    RETURN_IF_WIN32_BOOL_FALSE(SetConsoleOutputCP(CP_UTF8));
-
-    auto restoreConsoleModes = wil::scope_exit([&]() {
-        SetConsoleMode(conIn, inputMode);
-        SetConsoleMode(conOut, outputMode);
-        SetConsoleCP(codepage);
-        SetConsoleOutputCP(outputCodepage);
-    });
-
-    const auto size = GetConsoleScreenSize(conOut);
-
-    AzureConnection azureConn{ gsl::narrow_cast<uint32_t>(size.Y), gsl::narrow_cast<uint32_t>(size.X) };
-
-    const auto state = RunConnectionToCompletion(azureConn, conOut, conIn);
-
-    return state == ConnectionState::Closed ? 0 : 1;
-}

src/cascadia/TerminalAzBridge/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.200316.3" targetFramework="native" />
-</packages>

src/cascadia/TerminalAzBridge/pch.cpp

@@ -1,4 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"

src/cascadia/TerminalAzBridge/pch.h

@@ -1,36 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
-- pch.h
-
-Abstract:
-- Contains external headers to include in the precompile phase of console build process.
-- Avoid including internal project headers. Instead include them only in the classes that need them (helps with test project building).
---*/
-
-#pragma once
-
-// Ignore checked iterators warning from VC compiler.
-#define _SCL_SECURE_NO_WARNINGS
-
-// Block minwindef.h min/max macros to prevent <algorithm> conflict
-#define NOMINMAX
-
-#define WIN32_LEAN_AND_MEAN
-#include <unknwn.h>
-
-#define NT_SUCCESS(Status) (((NTSTATUS)(Status)) >= 0)
-
-#include <windows.h>
-
-#include "../inc/LibraryIncludes.h"
-
-#include <wil/cppwinrt.h>
-
-#include <winrt/Windows.system.h>
-#include <winrt/Windows.Foundation.Collections.h>
-
-#include <wil/resource.h>
-#include <wil/win32_helpers.h>

src/cascadia/TerminalConnection/AzureConnection.cpp

@@ -12,7 +12,6 @@
 #include <sstream>
 #include <stdlib.h>
 #include <LibraryResources.h>
-#include <unicode.hpp>
 
 #include "AzureConnection.g.cpp"
 
@@ -33,38 +32,6 @@ static constexpr int CurrentCredentialVersion = 1;
 static constexpr auto PasswordVaultResourceName = L"Terminal";
 static constexpr auto HttpUserAgent = L"Terminal/0.0";
 
-#define FAILOUT_IF_OPTIONAL_EMPTY(optional) \
-    do                                      \
-    {                                       \
-        if (!((optional).has_value()))      \
-        {                                   \
-            return E_FAIL;                  \
-        }                                   \
-    } while (0, 0)
-
-static constexpr int USER_INPUT_COLOR = 93; // yellow - the color of something the user can type
-static constexpr int USER_INFO_COLOR = 97; // white - the color of clarifying information
-
-static inline std::wstring _colorize(const unsigned int colorCode, const std::wstring_view text)
-{
-    return wil::str_printf<std::wstring>(L"\x1b[%um%.*s\x1b[m", colorCode, gsl::narrow_cast<size_t>(text.size()), text.data());
-}
-
-// Takes N resource names, loads the first one as a format string, and then
-// loads all the remaining ones into the %s arguments in the first one after
-// colorizing them in the USER_INPUT_COLOR.
-// This is intended to be used to drop UserEntry resources into an existing string.
-template<typename... Args>
-static inline std::wstring _formatResWithColoredUserInputOptions(const std::wstring_view resourceKey, Args&&... args)
-{
-    return wil::str_printf<std::wstring>(GetLibraryResourceString(resourceKey).data(), (_colorize(USER_INPUT_COLOR, GetLibraryResourceString(args)).data())...);
-}
-
-static inline std::wstring _formatTenantLine(int tenantNumber, const std::wstring_view tenantName, const std::wstring_view tenantID)
-{
-    return wil::str_printf<std::wstring>(RS_(L"AzureIthTenant").data(), _colorize(USER_INPUT_COLOR, std::to_wstring(tenantNumber)).data(), _colorize(USER_INFO_COLOR, tenantName).data(), tenantID.data());
-}
-
 namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 {
     // This function exists because the clientID only gets added by the release pipelines
@@ -78,6 +45,8 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
     AzureConnection::AzureConnection(const uint32_t initialRows, const uint32_t initialCols) :
         _initialRows{ initialRows },
         _initialCols{ initialCols },
+        _maxStored{},
+        _maxSize{},
         _expiry{}
     {
     }
@@ -86,7 +55,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
     // - helper that will write an unterminated string (generally, from a resource) to the output stream.
     // Arguments:
     // - str: the string to write.
-    void AzureConnection::_WriteStringWithNewline(const std::wstring_view str)
+    void AzureConnection::_WriteStringWithNewline(const winrt::hstring& str)
     {
         _TerminalOutputHandlers(str + L"\r\n");
     }
@@ -110,35 +79,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         _transitionToState(ConnectionState::Connecting);
     }
 
-    std::optional<std::wstring> AzureConnection::_ReadUserInput(InputMode mode)
-    {
-        std::unique_lock<std::mutex> inputLock{ _inputMutex };
-
-        if (_isStateAtOrBeyond(ConnectionState::Closing))
-        {
-            return std::nullopt;
-        }
-
-        _currentInputMode = mode;
-
-        _TerminalOutputHandlers(L"\x1b[92m"); // Make prompted user input green
-
-        _inputEvent.wait(inputLock, [this, mode]() {
-            return _currentInputMode != mode || _isStateAtOrBeyond(ConnectionState::Closing);
-        });
-
-        _TerminalOutputHandlers(L"\x1b[m");
-
-        if (_isStateAtOrBeyond(ConnectionState::Closing))
-        {
-            return std::nullopt;
-        }
-
-        std::wstring readInput{};
-        _userInput.swap(readInput);
-        return readInput;
-    }
-
     // Method description:
     // - ascribes to the ITerminalConnection interface
     // - handles the different possible inputs in the different states
@@ -152,46 +92,108 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             return;
         }
 
-        if (_state == AzureState::TermConnected)
+        // Parse the input differently depending on which state we're in
+        switch (_state)
+        {
+        // The user has stored connection settings, let them choose one of them, create a new one or remove all stored ones
+        case AzureState::AccessStored:
+        {
+            const auto s = winrt::to_string(data);
+            int storeNum = -1;
+            try
+            {
+                storeNum = std::stoi(s);
+            }
+            catch (...)
+            {
+                std::lock_guard<std::mutex> lg{ _commonMutex };
+                if (data == RS_(L"AzureUserEntry_RemoveStored"))
+                {
+                    _removeOrNew = true;
+                }
+                else if (data == RS_(L"AzureUserEntry_NewLogin"))
+                {
+                    _removeOrNew = false;
+                }
+
+                if (_removeOrNew.has_value())
+                {
+                    _canProceed.notify_one();
+                }
+                else
+                {
+                    _WriteStringWithNewline(RS_(L"AzureInvalidAccessInput"));
+                }
+                return;
+            }
+            if (storeNum >= _maxStored)
+            {
+                _WriteStringWithNewline(RS_(L"AzureNumOutOfBoundsError"));
+                return;
+            }
+            std::lock_guard<std::mutex> lg{ _commonMutex };
+            _storedNumber = storeNum;
+            _canProceed.notify_one();
+            return;
+        }
+        // The user has multiple tenants in their Azure account, let them choose one of them
+        case AzureState::TenantChoice:
+        {
+            int tenantNum = -1;
+            try
+            {
+                tenantNum = std::stoi(winrt::to_string(data));
+            }
+            catch (...)
+            {
+                _WriteStringWithNewline(RS_(L"AzureNonNumberError"));
+                return;
+            }
+            if (tenantNum >= _maxSize)
+            {
+                _WriteStringWithNewline(RS_(L"AzureNumOutOfBoundsError"));
+                return;
+            }
+            std::lock_guard<std::mutex> lg{ _commonMutex };
+            _tenantNumber = tenantNum;
+            _canProceed.notify_one();
+            return;
+        }
+        // User has the option to save their connection settings for future logins
+        case AzureState::StoreTokens:
+        {
+            std::lock_guard<std::mutex> lg{ _commonMutex };
+            if (data == RS_(L"AzureUserEntry_Yes"))
+            {
+                _store = true;
+            }
+            else if (data == RS_(L"AzureUserEntry_No"))
+            {
+                _store = false;
+            }
+
+            if (_store.has_value())
+            {
+                _canProceed.notify_one();
+            }
+            else
+            {
+                _WriteStringWithNewline(RS_(L"AzureInvalidStoreInput"));
+            }
+            return;
+        }
+        // We are connected, send user's input over the websocket
+        case AzureState::TermConnected:
         {
-            // If we're connected, we don't need to do any fun input shenanigans.
             websocket_outgoing_message msg;
             const auto str = winrt::to_string(data);
             msg.set_utf8_message(str);
 
             _cloudShellSocket.send(msg).get();
+        }
+        default:
             return;
         }
-
-        std::lock_guard<std::mutex> lock{ _inputMutex };
-        if (data.size() > 0 && (gsl::at(data, 0) == UNICODE_BACKSPACE || gsl::at(data, 0) == UNICODE_DEL)) // BS or DEL
-        {
-            if (_userInput.size() > 0)
-            {
-                _userInput.pop_back();
-                _TerminalOutputHandlers(L"\x08 \x08"); // overstrike the character with a space
-            }
-        }
-        else
-        {
-            _TerminalOutputHandlers(data); // echo back
-
-            switch (_currentInputMode)
-            {
-            case InputMode::Line:
-                if (data.size() > 0 && gsl::at(data, 0) == UNICODE_CARRIAGERETURN)
-                {
-                    _TerminalOutputHandlers(L"\r\n"); // we probably got a \r, so we need to advance to the next line.
-                    _currentInputMode = InputMode::None; // toggling the mode indicates completion
-                    _inputEvent.notify_one();
-                    break;
-                }
-                [[fallthrough]];
-            default:
-                std::copy(data.cbegin(), data.cend(), std::back_inserter(_userInput));
-                break;
-            }
-        }
     }
 
     // Method description:
@@ -229,8 +231,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
     {
         if (_transitionToState(ConnectionState::Closing))
         {
-            _inputEvent.notify_all();
-
+            _canProceed.notify_all();
             if (_state == AzureState::TermConnected)
             {
                 // Close the websocket connection
@@ -403,8 +404,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             _state = AzureState::DeviceFlow;
             return S_FALSE;
         }
-
-        int numTenants{ 0 };
+        _maxStored = 0;
         for (const auto& entry : credList)
         {
             auto nameJson = json::value::parse(entry.UserName().c_str());
@@ -422,11 +422,12 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                 continue;
             }
 
-            _WriteStringWithNewline(_formatTenantLine(numTenants, nameJson.at(L"displayName").as_string(), nameJson.at(L"tenantID").as_string()));
-            numTenants++;
+            winrt::hstring tenantLine{ wil::str_printf<std::wstring>(RS_(L"AzureIthTenant").c_str(), _maxStored, nameJson.at(L"displayName").as_string().c_str(), nameJson.at(L"tenantID").as_string().c_str()) };
+            _WriteStringWithNewline(tenantLine);
+            _maxStored++;
         }
 
-        if (!numTenants)
+        if (!_maxStored)
         {
             if (oldVersionEncountered)
             {
@@ -438,53 +439,33 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         }
 
         _WriteStringWithNewline(RS_(L"AzureEnterTenant"));
-        _WriteStringWithNewline(_formatResWithColoredUserInputOptions(USES_RESOURCE(L"AzureNewLogin"), USES_RESOURCE(L"AzureUserEntry_NewLogin")));
-        _WriteStringWithNewline(_formatResWithColoredUserInputOptions(USES_RESOURCE(L"AzureRemoveStored"), USES_RESOURCE(L"AzureUserEntry_RemoveStored")));
+        _WriteStringWithNewline(RS_(L"AzureNewLogin"));
+        _WriteStringWithNewline(RS_(L"AzureRemoveStored"));
 
-        int selectedTenant{ -1 };
-        do
+        std::unique_lock<std::mutex> storedLock{ _commonMutex };
+        _canProceed.wait(storedLock, [=]() {
+            return (_storedNumber >= 0 && _storedNumber < _maxStored) || _removeOrNew.has_value() || _isStateAtOrBeyond(ConnectionState::Closing);
+        });
+        // User might have closed the tab while we waited for input
+        if (_isStateAtOrBeyond(ConnectionState::Closing))
         {
-            auto maybeTenantSelection = _ReadUserInput(InputMode::Line);
-            FAILOUT_IF_OPTIONAL_EMPTY(maybeTenantSelection);
-
-            const auto& tenantSelection = maybeTenantSelection.value();
-            if (tenantSelection == RS_(L"AzureUserEntry_RemoveStored"))
-            {
-                // User wants to remove the stored settings
-                _RemoveCredentials();
-                _state = AzureState::DeviceFlow;
-                return S_OK;
-            }
-            else if (tenantSelection == RS_(L"AzureUserEntry_NewLogin"))
-            {
-                // User wants to login with a different account
-                _state = AzureState::DeviceFlow;
-                return S_OK;
-            }
-            else
-            {
-                try
-                {
-                    selectedTenant = std::stoi(tenantSelection);
-                    if (selectedTenant < 0 || selectedTenant >= numTenants)
-                    {
-                        _WriteStringWithNewline(RS_(L"AzureNumOutOfBoundsError"));
-                        continue; // go 'round again
-                    }
-                    break;
-                }
-                catch (...)
-                {
-                    // suppress exceptions in conversion
-                }
-            }
-
-            // if we got here, we didn't break out of the loop early and need to go 'round again
-            _WriteStringWithNewline(_formatResWithColoredUserInputOptions(USES_RESOURCE(L"AzureInvalidAccessInput"), USES_RESOURCE(L"AzureUserEntry_NewLogin"), USES_RESOURCE(L"AzureUserEntry_RemoveStored")));
-        } while (true);
-
+            return E_FAIL;
+        }
+        else if (_removeOrNew.has_value() && _removeOrNew.value())
+        {
+            // User wants to remove the stored settings
+            _RemoveCredentials();
+            _state = AzureState::DeviceFlow;
+            return S_OK;
+        }
+        else if (_removeOrNew.has_value() && !_removeOrNew.value())
+        {
+            // User wants to login with a different account
+            _state = AzureState::DeviceFlow;
+            return S_OK;
+        }
         // User wants to login with one of the saved connection settings
-        auto desiredCredential = credList.GetAt(selectedTenant);
+        auto desiredCredential = credList.GetAt(_storedNumber);
         desiredCredential.RetrievePassword();
         auto nameJson = json::value::parse(desiredCredential.UserName().c_str());
         auto passWordJson = json::value::parse(desiredCredential.Password().c_str());
@@ -586,43 +567,27 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         try
         {
             const auto tenantListAsArray = _tenantList.as_array();
-            auto numTenants = gsl::narrow<int>(tenantListAsArray.size());
-            for (int i = 0; i < numTenants; i++)
+            _maxSize = gsl::narrow<int>(tenantListAsArray.size());
+            for (int i = 0; i < _maxSize; i++)
             {
                 const auto& tenant = tenantListAsArray.at(i);
                 const auto [tenantId, tenantDisplayName] = _crackTenant(tenant);
-                _WriteStringWithNewline(_formatTenantLine(i, tenantDisplayName, tenantId));
+                winrt::hstring tenantLine{ wil::str_printf<std::wstring>(RS_(L"AzureIthTenant").c_str(), i, tenantDisplayName.c_str(), tenantId.c_str()) };
+                _WriteStringWithNewline(tenantLine);
             }
             _WriteStringWithNewline(RS_(L"AzureEnterTenant"));
-
-            int selectedTenant{ -1 };
-            do
+            // Use a lock to wait for the user to input a valid number
+            std::unique_lock<std::mutex> tenantNumberLock{ _commonMutex };
+            _canProceed.wait(tenantNumberLock, [=]() {
+                return (_tenantNumber >= 0 && _tenantNumber < _maxSize) || _isStateAtOrBeyond(ConnectionState::Closing);
+            });
+            // User might have closed the tab while we waited for input
+            if (_isStateAtOrBeyond(ConnectionState::Closing))
             {
-                auto maybeTenantSelection = _ReadUserInput(InputMode::Line);
-                FAILOUT_IF_OPTIONAL_EMPTY(maybeTenantSelection);
+                return E_FAIL;
+            }
 
-                const auto& tenantSelection = maybeTenantSelection.value();
-                try
-                {
-                    selectedTenant = std::stoi(tenantSelection);
-
-                    if (selectedTenant < 0 || selectedTenant >= numTenants)
-                    {
-                        _WriteStringWithNewline(RS_(L"AzureNumOutOfBoundsError"));
-                        continue;
-                    }
-                    break;
-                }
-                catch (...)
-                {
-                    // suppress exceptions in conversion
-                }
-
-                // if we got here, we didn't break out of the loop early and need to go 'round again
-                _WriteStringWithNewline(RS_(L"AzureNonNumberError"));
-            } while (true);
-
-            const auto& chosenTenant = tenantListAsArray.at(selectedTenant);
+            const auto& chosenTenant = tenantListAsArray.at(_tenantNumber);
             std::tie(_tenantID, _displayName) = _crackTenant(chosenTenant);
 
             // We have to refresh now that we have the tenantID
@@ -644,28 +609,24 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
     // - S_OK otherwise
     HRESULT AzureConnection::_StoreHelper()
     {
-        _WriteStringWithNewline(_formatResWithColoredUserInputOptions(USES_RESOURCE(L"AzureStorePrompt"), USES_RESOURCE(L"AzureUserEntry_Yes"), USES_RESOURCE(L"AzureUserEntry_No")));
+        _WriteStringWithNewline(RS_(L"AzureStorePrompt"));
         // Wait for user input
-        do
+        std::unique_lock<std::mutex> storeLock{ _commonMutex };
+        _canProceed.wait(storeLock, [=]() {
+            return _store.has_value() || _isStateAtOrBeyond(ConnectionState::Closing);
+        });
+        // User might have closed the tab while we waited for input
+        if (_isStateAtOrBeyond(ConnectionState::Closing))
         {
-            auto maybeStoreCredentials = _ReadUserInput(InputMode::Line);
-            FAILOUT_IF_OPTIONAL_EMPTY(maybeStoreCredentials);
+            return E_FAIL;
+        }
 
-            const auto& storeCredentials = maybeStoreCredentials.value();
-            if (storeCredentials == RS_(L"AzureUserEntry_Yes"))
-            {
-                _StoreCredential();
-                _WriteStringWithNewline(RS_(L"AzureTokensStored"));
-                break;
-            }
-            else if (storeCredentials == RS_(L"AzureUserEntry_No"))
-            {
-                break; // we're done, but the user wants nothing.
-            }
-
-            // if we got here, we didn't break out of the loop early and need to go 'round again
-            _WriteStringWithNewline(_formatResWithColoredUserInputOptions(USES_RESOURCE(L"AzureInvalidStoreInput"), USES_RESOURCE(L"AzureUserEntry_Yes"), USES_RESOURCE(L"AzureUserEntry_No")));
-        } while (true);
+        if (_store.value())
+        {
+            // User has opted to store the connection settings
+            _StoreCredential();
+            _WriteStringWithNewline(RS_(L"AzureTokensStored"));
+        }
 
         _state = AzureState::TermConnecting;
         return S_OK;
@@ -693,7 +654,11 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         _WriteStringWithNewline(RS_(L"AzureSuccess"));
 
         // Request for a terminal for said cloud shell
-        const auto shellType = settingsResponse.at(L"properties").at(L"preferredShellType").as_string();
+        // We only support bash for now, so don't bother with the user's preferred shell
+        // fyi: we can't call powershell yet because it sends VT sequences we don't support yet
+        // TODO: GitHub #1883
+        //const auto shellType = settingsResponse.at(L"properties").at(L"preferredShellType").as_string();
+        const auto shellType = L"bash";
         _WriteStringWithNewline(RS_(L"AzureRequestingTerminal"));
         const auto socketUri = _GetTerminal(shellType);
         _TerminalOutputHandlers(L"\r\n");
@@ -703,14 +668,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         connReqTask.wait();
 
         _state = AzureState::TermConnected;
-
-        std::wstring queuedUserInput{};
-        std::swap(_userInput, queuedUserInput);
-        if (queuedUserInput.size() > 0)
-        {
-            WriteInput(static_cast<winrt::hstring>(queuedUserInput)); // send the user's queued up input back through
-        }
-
         return S_OK;
     }
 
@@ -876,8 +833,9 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         http_request shellRequest(L"PUT");
         shellRequest.set_request_uri(L"providers/Microsoft.Portal/consoles/default?api-version=2018-10-01");
         _HeaderHelper(shellRequest);
-        // { "properties": { "osType": "linux" } }
-        auto body = json::value::object({ { U("properties"), json::value::object({ { U("osType"), json::value::string(U("linux")) } }) } });
+        const auto innerBody = json::value::parse(U("{ \"osType\" : \"linux\" }"));
+        json::value body;
+        body[U("properties")] = innerBody;
         shellRequest.set_body(body);
 
         // Send the request and get the response as a json value
@@ -956,15 +914,17 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             _WriteStringWithNewline(RS_(L"AzureNoTokens"));
             return;
         }
-
-        for (const auto& cred : credList)
+        while (credList.Size() > 0)
         {
             try
             {
-                vault.Remove(cred);
+                vault.Remove(credList.GetAt(0));
+            }
+            catch (...)
+            {
+                _WriteStringWithNewline(RS_(L"AzureTokensRemoved"));
+                return;
             }
-            CATCH_LOG();
         }
-        _WriteStringWithNewline(RS_(L"AzureTokensRemoved"));
     }
 }

src/cascadia/TerminalConnection/AzureConnection.h

@@ -31,6 +31,12 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
     private:
         uint32_t _initialRows{};
         uint32_t _initialCols{};
+        int _storedNumber{ -1 };
+        int _maxStored;
+        int _tenantNumber{ -1 };
+        int _maxSize;
+        std::condition_variable _canProceed;
+        std::mutex _commonMutex;
 
         enum class AzureState
         {
@@ -45,6 +51,9 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 
         AzureState _state{ AzureState::AccessStored };
 
+        std::optional<bool> _store;
+        std::optional<bool> _removeOrNew;
+
         wil::unique_handle _hOutputThread;
 
         static DWORD WINAPI StaticOutputThreadProc(LPVOID lpParameter);
@@ -58,17 +67,17 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         const utility::string_t _loginUri{ U("https://login.microsoftonline.com/") };
         const utility::string_t _resourceUri{ U("https://management.azure.com/") };
         const utility::string_t _wantedResource{ U("https://management.core.windows.net/") };
-        const int _expireLimit{ 2700 };
+        int _expireLimit{ 2700 };
         web::json::value _tenantList;
         utility::string_t _displayName;
         utility::string_t _tenantID;
         utility::string_t _accessToken;
         utility::string_t _refreshToken;
-        int _expiry{ 0 };
+        int _expiry;
         utility::string_t _cloudShellUri;
         utility::string_t _terminalID;
 
-        void _WriteStringWithNewline(const std::wstring_view str);
+        void _WriteStringWithNewline(const winrt::hstring& str);
         web::json::value _RequestHelper(web::http::client::http_client theClient, web::http::http_request theRequest);
         web::json::value _GetDeviceCode();
         web::json::value _WaitForUser(utility::string_t deviceCode, int pollInterval, int expiresIn);
@@ -81,18 +90,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         void _StoreCredential();
         void _RemoveCredentials();
 
-        enum class InputMode
-        {
-            None = 0,
-            Line
-        };
-        InputMode _currentInputMode{ InputMode::None };
-        std::wstring _userInput;
-        std::condition_variable _inputEvent;
-        std::mutex _inputMutex;
-
-        std::optional<std::wstring> _ReadUserInput(InputMode mode);
-
         web::websockets::client::websocket_client _cloudShellSocket;
     };
 }

src/cascadia/TerminalConnection/ConptyConnection.cpp

@@ -201,7 +201,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
     try
     {
         const COORD dimensions{ gsl::narrow_cast<SHORT>(_initialCols), gsl::narrow_cast<SHORT>(_initialRows) };
-        THROW_IF_FAILED(_CreatePseudoConsoleAndPipes(dimensions, PSEUDOCONSOLE_RESIZE_QUIRK, &_inPipe, &_outPipe, &_hPC));
+        THROW_IF_FAILED(_CreatePseudoConsoleAndPipes(dimensions, 0, &_inPipe, &_outPipe, &_hPC));
         THROW_IF_FAILED(_LaunchAttachedClient());
 
         _startTime = std::chrono::high_resolution_clock::now();
@@ -359,10 +359,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 
     DWORD ConptyConnection::_OutputThread()
     {
-        // Keep us alive until the output thread terminates; the destructor
-        // won't wait for us, and the known exit points _do_.
-        auto strongThis{ get_strong() };
-
         // process the data of the output pipe in a loop
         while (true)
         {

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

@@ -123,14 +123,14 @@
   <data name="AzureEnterTenant" xml:space="preserve">
     <value>Please enter the desired tenant number.</value>
   </data>
-  <data name="AzureNewLogin" xml:space="default">
-    <value>Enter %s to login with a different account</value>
+  <data name="AzureNewLogin" xml:space="preserve">
+    <value>Enter "n" to login with a different account.</value>
   </data>
-  <data name="AzureRemoveStored" xml:space="default">
-    <value>Enter %s to remove the above saved connection settings.</value>
+  <data name="AzureRemoveStored" xml:space="preserve">
+    <value>Enter "r" to remove the above saved connection settings.</value>
   </data>
-  <data name="AzureInvalidAccessInput" xml:space="default">
-    <value>Please enter a valid number to access the stored connection settings, %s to make a new one, or %s to remove the stored ones.</value>
+  <data name="AzureInvalidAccessInput" xml:space="preserve">
+    <value>Please enter a valid number to access the stored connection settings, n to make a new one, or r to remove the stored ones.</value>
   </data>
   <data name="AzureNonNumberError" xml:space="preserve">
     <value>Please enter a number.</value>
@@ -144,11 +144,11 @@
   <data name="AzureNoCloudAccount" xml:space="preserve">
     <value>You have not set up your cloud shell account yet. Please go to https://shell.azure.com to set it up.</value>
   </data>
-  <data name="AzureStorePrompt" xml:space="default">
-    <value>Do you want to save these connection settings for future logins? [%s/%s]</value>
+  <data name="AzureStorePrompt" xml:space="preserve">
+    <value>Do you want to save these connection settings for future logins? [y/n]</value>
   </data>
-  <data name="AzureInvalidStoreInput" xml:space="default">
-    <value>Please enter %s or %s</value>
+  <data name="AzureInvalidStoreInput" xml:space="preserve">
+    <value>Please enter y or n</value>
   </data>
   <data name="AzureRequestingCloud" xml:space="preserve">
     <value>Requesting a cloud shell instance...</value>
@@ -183,8 +183,8 @@
   <data name="AzureUnknownTenantName" xml:space="preserve">
     <value>&lt;unknown tenant name&gt;</value>
   </data>
-  <data name="AzureIthTenant" xml:space="default">
-    <value>Tenant %s: %s (%s)</value>
+  <data name="AzureIthTenant" xml:space="preserve">
+    <value>Tenant %d: %s (%s)</value>
   </data>
   <data name="AzureSuccessfullyAuthenticated" xml:space="preserve">
     <value>Authenticated.</value>
@@ -217,4 +217,4 @@ If this resource spans multiple lines, it will not be displayed properly. Yeah.<
   <data name="TelnetInternetOrServerIssue" xml:space="preserve">
     <value>Could not connect to telnet server.</value>
   </data>
-</root>
+</root>

src/cascadia/TerminalConnection/TerminalConnection.vcxproj

@@ -59,7 +59,7 @@
     <Midl Include="TelnetConnection.idl" />
   </ItemGroup>
   <ItemGroup>
-    <PRIResource Include="Resources/Resources.language-en.resw" />
+    <PRIResource Include="Resources/en-US/Resources.resw" />
     <None Include="packages.config" />
   </ItemGroup>
   <!-- ========================= Project References ======================== -->
@@ -95,4 +95,4 @@
     </Link>
   </ItemDefinitionGroup>
   <Import Project="..\..\..\packages\vcpkg-telnetpp.1.0.1\build\native\vcpkg-telnetpp.targets" Condition="Exists('..\..\..\packages\vcpkg-telnetpp.1.0.1\build\native\vcpkg-telnetpp.targets')" />
-</Project>
+</Project>

src/cascadia/TerminalConnection/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.200316.3" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.190730.2" targetFramework="native" />
   <package id="vcpkg-cpprestsdk" version="2.10.14" targetFramework="native" />
   <package id="vcpkg-telnetpp" version="1.0.1" targetFramework="native" />
 </packages>

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

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -117,51 +117,27 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="SearchBox_CaseSensitivity.ToolTipService.ToolTip" xml:space="preserve">
+  <data name="CaseSensitivityButtonLocalizedText.ToolTipService.ToolTip" xml:space="preserve">
     <value>Match Case</value>
-    <comment>The tooltip text for the case sensitivity button on the search box control.</comment>
+    <comment>The tooltip text for CaseSensitivityButton</comment>
   </data>
-  <data name="SearchBox_Close.ToolTipService.ToolTip" xml:space="preserve">
+  <data name="CloseButtonLocalizedText.ToolTipService.ToolTip" xml:space="preserve">
     <value>Close</value>
-    <comment>The tooltip text for the close button on the search box control.</comment>
+    <comment>The tooltip text for CloseButton</comment>
   </data>
-  <data name="SearchBox_SearchBackwards.ToolTipService.ToolTip" xml:space="preserve">
+  <data name="GoBackwardButtonLocalizedText.ToolTipService.ToolTip" xml:space="preserve">
     <value>Find Up</value>
-    <comment>The tooltip text for the search backward button.</comment>
+    <comment>The tooltip text for GoBackward Button</comment>
   </data>
-  <data name="SearchBox_SearchForwards.ToolTipService.ToolTip" xml:space="preserve">
+  <data name="GoForwardButtonLocalizedText.ToolTipService.ToolTip" xml:space="preserve">
     <value>Find Down</value>
-    <comment>The tooltip text for the search forward button.</comment>
+    <comment>The tooltip text for GoForward Button</comment>
   </data>
-  <data name="SearchBox_TextBox.PlaceholderText" xml:space="preserve">
+  <data name="TextBoxLocalizedText.PlaceholderText" xml:space="preserve">
     <value>Find...</value>
-    <comment>The placeholder text in the search box control.</comment>
+    <comment>The placeholder text in the search dialog TextBox</comment>
   </data>
   <data name="DragFileCaption" xml:space="preserve">
     <value>Copy path to file</value>
-    <comment>The displayed caption for dragging a file onto a terminal.</comment>
   </data>
-  <data name="SearchBox_CaseSensitivity.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Case Sensitivity</value>
-    <comment>The name of the case sensitivity button on the search box control for accessibility.</comment>
-  </data>
-  <data name="SearchBox_SearchForwards.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Search Forward</value>
-    <comment>The name of the search forward button for accessibility.</comment>
-  </data>
-  <data name="SearchBox_SearchBackwards.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Search Backward</value>
-    <comment>The name of the search backward button for accessibility.</comment>
-  </data>
-  <data name="SearchBox_TextBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Search Text</value>
-    <comment>The name of the text box on the search box control for accessibility.</comment>
-  </data>
-  <data name="TerminalControl_ControlType" xml:space="preserve">
-    <value>terminal</value>
-    <comment>The type of control that the terminal ahderes to. Used to identify how a user can interact with this kind of control.</comment>
-  </data>
-  <data name="SearchBox_Close.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
-    <value>Close Search Box</value>
-  </data>
-</root>
+</root>

src/cascadia/TerminalControl/SearchBoxControl.xaml

@@ -36,7 +36,6 @@
                     <Style x:Key="SearchBoxBackground" TargetType="StackPanel">
                         <Setter Property="Background" Value="#333333" />
                     </Style>
-                    <Style x:Key="PathStyle" TargetType="PathIcon" />
                     <!-- TextBox colors !-->
                     <SolidColorBrush x:Key="TextControlBackground" Color="#333333"/>
                     <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush" Color="#B5B5B5"/>
@@ -94,7 +93,6 @@
                     <Style x:Key="SearchBoxBackground" TargetType="StackPanel">
                         <Setter Property="Background" Value="#CCCCCC" />
                     </Style>
-                    <Style x:Key="PathStyle" TargetType="PathIcon" />
                     <!-- TextBox colors !-->
                     <SolidColorBrush x:Key="TextControlBackground" Color="#CCCCCC"/>
                     <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush" Color="#636363"/>
@@ -149,54 +147,35 @@
                     <Style x:Key="SearchBoxBackground" TargetType="StackPanel">
                         <Setter Property="Background" Value="{ThemeResource SystemColorWindowColor}" />
                     </Style>
-                    <Style x:Key="PathStyle" TargetType="PathIcon">
-                        <Setter Property="Foreground" Value="{ThemeResource SystemColorWindowTextColor}" />
-                    </Style>
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
 
     <StackPanel Orientation="Horizontal" Style="{ThemeResource SearchBoxBackground}" Padding="5" CornerRadius="0,0,2,2">
-        <TextBox  x:Name="TextBox"
-                  x:Uid="SearchBox_TextBox"
-                  CornerRadius="2"
-                  Width="160"
-                  PlaceholderForeground="{ThemeResource TextBoxPlaceholderTextThemeBrush}"
-                  FontSize="15"
-                  KeyDown="TextBoxKeyDown"
-                  Margin="5"
-                  HorizontalAlignment="Left"
-                  VerticalAlignment="Center">
+        <TextBox  x:Name="TextBox" x:Uid="TextBoxLocalizedText" AutomationProperties.Name="Search Text" CornerRadius="2" Width="160"
+                  PlaceholderForeground="{ThemeResource TextBoxPlaceholderTextThemeBrush}"   FontSize="15" KeyDown = "TextBoxKeyDown"
+                  Margin="5" HorizontalAlignment="Left" VerticalAlignment="Center">
         </TextBox>
 
-        <ToggleButton x:Name="GoBackwardButton"
-                      x:Uid="SearchBox_SearchBackwards"
-                      HorizontalAlignment="Right"
-                      Style="{StaticResource ToggleButtonStyle}"
-                      Click="GoBackwardClicked"
-                      IsChecked="True">
+        <ToggleButton x:Name="GoBackwardButton" x:Uid="GoBackwardButtonLocalizedText" AutomationProperties.Name="Set Search Backward"
+                      HorizontalAlignment="Right" Style="{StaticResource ToggleButtonStyle}"
+                      Click="GoBackwardClicked" IsChecked="True">
             <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE74A;" Style="{ThemeResource FontIconStyle}"/>
         </ToggleButton>
-        <ToggleButton x:Name="GoForwardButton"
-                      x:Uid="SearchBox_SearchForwards"
-                      Style="{StaticResource ToggleButtonStyle}"
+        <ToggleButton x:Name="GoForwardButton" x:Uid="GoForwardButtonLocalizedText"
+                      AutomationProperties.Name="Set Search Forward" Style="{StaticResource ToggleButtonStyle}"
                       Click="GoForwardClicked">
             <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE74B;" Style="{ThemeResource FontIconStyle}"/>
         </ToggleButton>
 
-        <ToggleButton x:Name="CaseSensitivityButton"
-                      x:Uid="SearchBox_CaseSensitivity"
-                      Style="{StaticResource ToggleButtonStyle}">
-            <PathIcon Data="M8.87305 10H7.60156L6.5625 7.25195H2.40625L1.42871 10H0.150391L3.91016 0.197266H5.09961L8.87305 10ZM6.18652 6.21973L4.64844 2.04297C4.59831 1.90625 4.54818 1.6875 4.49805 1.38672H4.4707C4.42513 1.66471 4.37272 1.88346 4.31348 2.04297L2.78906 6.21973H6.18652ZM15.1826 10H14.0615V8.90625H14.0342C13.5465 9.74479 12.8288 10.1641 11.8809 10.1641C11.1836 10.1641 10.6367 9.97949 10.2402 9.61035C9.84831 9.24121 9.65234 8.7513 9.65234 8.14062C9.65234 6.83268 10.4225 6.07161 11.9629 5.85742L14.0615 5.56348C14.0615 4.37402 13.5807 3.7793 12.6191 3.7793C11.776 3.7793 11.015 4.06641 10.3359 4.64062V3.49219C11.0241 3.05469 11.8171 2.83594 12.7148 2.83594C14.36 2.83594 15.1826 3.70638 15.1826 5.44727V10ZM14.0615 6.45898L12.373 6.69141C11.8535 6.76432 11.4616 6.89421 11.1973 7.08105C10.9329 7.26335 10.8008 7.58919 10.8008 8.05859C10.8008 8.40039 10.9215 8.68066 11.1631 8.89941C11.4092 9.11361 11.735 9.2207 12.1406 9.2207C12.6966 9.2207 13.1546 9.02702 13.5146 8.63965C13.8792 8.24772 14.0615 7.75326 14.0615 7.15625V6.45898Z"
-                      Style="{ThemeResource PathStyle}" />
+        <ToggleButton x:Name="CaseSensitivityButton" x:Uid="CaseSensitivityButtonLocalizedText"
+                      AutomationProperties.Name="CaseSensitivity" Style="{StaticResource ToggleButtonStyle}">
+            <PathIcon Data="M8.87305 10H7.60156L6.5625 7.25195H2.40625L1.42871 10H0.150391L3.91016 0.197266H5.09961L8.87305 10ZM6.18652 6.21973L4.64844 2.04297C4.59831 1.90625 4.54818 1.6875 4.49805 1.38672H4.4707C4.42513 1.66471 4.37272 1.88346 4.31348 2.04297L2.78906 6.21973H6.18652ZM15.1826 10H14.0615V8.90625H14.0342C13.5465 9.74479 12.8288 10.1641 11.8809 10.1641C11.1836 10.1641 10.6367 9.97949 10.2402 9.61035C9.84831 9.24121 9.65234 8.7513 9.65234 8.14062C9.65234 6.83268 10.4225 6.07161 11.9629 5.85742L14.0615 5.56348C14.0615 4.37402 13.5807 3.7793 12.6191 3.7793C11.776 3.7793 11.015 4.06641 10.3359 4.64062V3.49219C11.0241 3.05469 11.8171 2.83594 12.7148 2.83594C14.36 2.83594 15.1826 3.70638 15.1826 5.44727V10ZM14.0615 6.45898L12.373 6.69141C11.8535 6.76432 11.4616 6.89421 11.1973 7.08105C10.9329 7.26335 10.8008 7.58919 10.8008 8.05859C10.8008 8.40039 10.9215 8.68066 11.1631 8.89941C11.4092 9.11361 11.735 9.2207 12.1406 9.2207C12.6966 9.2207 13.1546 9.02702 13.5146 8.63965C13.8792 8.24772 14.0615 7.75326 14.0615 7.15625V6.45898Z"/>
         </ToggleButton>
 
-        <Button x:Name="CloseButton"
-                x:Uid="SearchBox_Close"
-                Padding="0"
-                Click="CloseClick"
-                Style="{ThemeResource ButtonStyle}">
+        <Button x:Name="CloseButton" x:Uid="CloseButtonLocalizedText" AutomationProperties.Name="Close"
+                Padding="0" Click="CloseClick" Style="{ ThemeResource ButtonStyle}">
             <FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE711;" FontSize="12"/>
         </Button>
     </StackPanel>

src/cascadia/TerminalControl/TSFInputControl.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
 #include "pch.h"
@@ -17,17 +17,43 @@ using namespace winrt::Windows::UI::Xaml;
 namespace winrt::Microsoft::Terminal::TerminalControl::implementation
 {
     TSFInputControl::TSFInputControl() :
-        _editContext{ nullptr },
-        _inComposition{ false },
-        _activeTextStart{ 0 }
+        _editContext{ nullptr }
     {
-        InitializeComponent();
+        _Create();
+    }
+
+    // Method Description:
+    // - Creates XAML controls for displaying user input and hooks up CoreTextEditContext handlers
+    //   for handling text input from the Text Services Framework.
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void TSFInputControl::_Create()
+    {
+        // TextBlock for user input form TSF
+        _textBlock = Controls::TextBlock();
+        _textBlock.Visibility(Visibility::Collapsed);
+        _textBlock.IsTextSelectionEnabled(false);
+        _textBlock.TextDecorations(TextDecorations::Underline);
+
+        // Canvas for controlling exact position of the TextBlock
+        _canvas = Windows::UI::Xaml::Controls::Canvas();
+        _canvas.Visibility(Visibility::Collapsed);
+
+        // add the Textblock to the Canvas
+        _canvas.Children().Append(_textBlock);
+
+        // set the content of this control to be the Canvas
+        this->Content(_canvas);
 
         // Create a CoreTextEditingContext for since we are acting like a custom edit control
         auto manager = Core::CoreTextServicesManager::GetForCurrentView();
         _editContext = manager.CreateEditContext();
 
-        // InputPane is manually shown inside of TermControl.
+        // sets the Input Pane display policy to Manual for now so that it can manually show the
+        // software keyboard when the control gains focus and dismiss it when the control loses focus.
+        // TODO GitHub #3639: Should Input Pane display policy be Automatic
         _editContext.InputPaneDisplayPolicy(Core::CoreTextInputPaneDisplayPolicy::Manual);
 
         // set the input scope to Text because this control is for any text.
@@ -91,28 +117,6 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         }
     }
 
-    // Method Description:
-    // - Clears the input buffer and tells the text server to clear their buffer as well.
-    //   Also clears the TextBlock and sets the active text starting point to 0.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - <none>
-    void TSFInputControl::ClearBuffer()
-    {
-        if (!_inputBuffer.empty())
-        {
-            TextBlock().Text(L"");
-            const auto bufLen = ::base::ClampedNumeric<int32_t>(_inputBuffer.length());
-            _inputBuffer.clear();
-            _editContext.NotifyFocusLeave();
-            _editContext.NotifyTextChanged({ 0, bufLen }, 0, { 0, 0 });
-            _editContext.NotifyFocusEnter();
-            _activeTextStart = 0;
-            _inComposition = false;
-        }
-    }
-
     // Method Description:
     // - Handler for LayoutRequested event by CoreEditContext responsible
     //   for returning the current position the IME should be placed
@@ -134,56 +138,57 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         // Get the cursor position in text buffer position
         auto cursorArgs = winrt::make_self<CursorPositionEventArgs>();
         _CurrentCursorPositionHandlers(*this, *cursorArgs);
-        const COORD cursorPos = { ::base::ClampedNumeric<short>(cursorArgs->CurrentPosition().X), ::base::ClampedNumeric<short>(cursorArgs->CurrentPosition().Y) };
+        const COORD cursorPos = { gsl::narrow_cast<SHORT>(cursorArgs->CurrentPosition().X), gsl::narrow_cast<SHORT>(cursorArgs->CurrentPosition().Y) };
 
         // Get Font Info as we use this is the pixel size for characters in the display
         auto fontArgs = winrt::make_self<FontInfoEventArgs>();
         _CurrentFontInfoHandlers(*this, *fontArgs);
 
-        const auto fontWidth = fontArgs->FontSize().Width;
-        const auto fontHeight = fontArgs->FontSize().Height;
+        const float fontWidth = fontArgs->FontSize().Width;
+        const float fontHeight = fontArgs->FontSize().Height;
 
         // Convert text buffer cursor position to client coordinate position within the window
         COORD clientCursorPos;
-        clientCursorPos.X = ::base::ClampMul(cursorPos.X, ::base::ClampedNumeric<short>(fontWidth));
-        clientCursorPos.Y = ::base::ClampMul(cursorPos.Y, ::base::ClampedNumeric<short>(fontHeight));
+        COORD screenCursorPos;
+        THROW_IF_FAILED(ShortMult(cursorPos.X, gsl::narrow<SHORT>(fontWidth), &clientCursorPos.X));
+        THROW_IF_FAILED(ShortMult(cursorPos.Y, gsl::narrow<SHORT>(fontHeight), &clientCursorPos.Y));
 
         // Convert from client coordinate to screen coordinate by adding window position
-        COORD screenCursorPos;
-        screenCursorPos.X = ::base::ClampAdd(clientCursorPos.X, ::base::ClampedNumeric<short>(windowBounds.X));
-        screenCursorPos.Y = ::base::ClampAdd(clientCursorPos.Y, ::base::ClampedNumeric<short>(windowBounds.Y));
+        THROW_IF_FAILED(ShortAdd(clientCursorPos.X, gsl::narrow_cast<SHORT>(windowBounds.X), &screenCursorPos.X));
+        THROW_IF_FAILED(ShortAdd(clientCursorPos.Y, gsl::narrow_cast<SHORT>(windowBounds.Y), &screenCursorPos.Y));
 
         // get any offset (margin + tabs, etc..) of the control within the window
         const auto offsetPoint = this->TransformToVisual(nullptr).TransformPoint(winrt::Windows::Foundation::Point(0, 0));
 
         // add the margin offsets if any
-        screenCursorPos.X = ::base::ClampAdd(screenCursorPos.X, ::base::ClampedNumeric<short>(offsetPoint.X));
-        screenCursorPos.Y = ::base::ClampAdd(screenCursorPos.Y, ::base::ClampedNumeric<short>(offsetPoint.Y));
+        const auto currentMargin = this->Margin();
+        THROW_IF_FAILED(ShortAdd(screenCursorPos.X, gsl::narrow_cast<SHORT>(offsetPoint.X), &screenCursorPos.X));
+        THROW_IF_FAILED(ShortAdd(screenCursorPos.Y, gsl::narrow_cast<SHORT>(offsetPoint.Y), &screenCursorPos.Y));
 
         // Get scale factor for view
         const double scaleFactor = DisplayInformation::GetForCurrentView().RawPixelsPerViewPixel();
 
-        // position textblock to cursor position
-        Canvas().SetLeft(TextBlock(), clientCursorPos.X);
-        Canvas().SetTop(TextBlock(), ::base::ClampedNumeric<double>(clientCursorPos.Y));
-
-        // calculate FontSize in pixels from DIPs
-        const double fontSizePx = (fontHeight * 72) / USER_DEFAULT_SCREEN_DPI;
-        TextBlock().FontSize(fontSizePx);
-        TextBlock().FontFamily(Media::FontFamily(fontArgs->FontFace()));
-
-        const auto widthToTerminalEnd = Canvas().ActualWidth() - ::base::ClampedNumeric<double>(clientCursorPos.X);
-        TextBlock().MaxWidth(widthToTerminalEnd);
-
-        // Set the text block bounds
-        const auto yOffset = ::base::ClampedNumeric<float>(TextBlock().ActualHeight()) - fontHeight;
-        const auto textBottom = ::base::ClampedNumeric<float>(screenCursorPos.Y) + yOffset;
-        Rect selectionRect = Rect(screenCursorPos.X, textBottom, 0, fontHeight);
+        // Set the selection layout bounds
+        Rect selectionRect = Rect(screenCursorPos.X, screenCursorPos.Y, 0, fontHeight);
         request.LayoutBounds().TextBounds(ScaleRect(selectionRect, scaleFactor));
 
         // Set the control bounds of the whole control
         Rect controlRect = Rect(screenCursorPos.X, screenCursorPos.Y, 0, fontHeight);
         request.LayoutBounds().ControlBounds(ScaleRect(controlRect, scaleFactor));
+
+        // position textblock to cursor position
+        _canvas.SetLeft(_textBlock, clientCursorPos.X);
+        _canvas.SetTop(_textBlock, static_cast<double>(clientCursorPos.Y));
+
+        // width is cursor to end of canvas
+        _textBlock.Width(200); // TODO GitHub #3640: Determine proper Width
+        _textBlock.Height(fontHeight);
+
+        // calculate FontSize in pixels from DIPs
+        const double fontSizePx = (fontHeight * 72) / USER_DEFAULT_SCREEN_DPI;
+        _textBlock.FontSize(fontSizePx);
+
+        _textBlock.FontFamily(Media::FontFamily(fontArgs->FontFace()));
     }
 
     // Method Description:
@@ -196,7 +201,8 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
     // - <none>
     void TSFInputControl::_compositionStartedHandler(CoreTextEditContext sender, CoreTextCompositionStartedEventArgs const& /*args*/)
     {
-        _inComposition = true;
+        _canvas.Visibility(Visibility::Visible);
+        _textBlock.Visibility(Visibility::Visible);
     }
 
     // Method Description:
@@ -209,19 +215,30 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
     // - <none>
     void TSFInputControl::_compositionCompletedHandler(CoreTextEditContext sender, CoreTextCompositionCompletedEventArgs const& /*args*/)
     {
-        _inComposition = false;
-
         // only need to do work if the current buffer has text
         if (!_inputBuffer.empty())
         {
-            _SendAndClearText();
+            // call event handler with data handled by parent
+            _compositionCompletedHandlers(_inputBuffer);
+
+            // clear the buffer for next round
+            const auto bufferLength = gsl::narrow_cast<int32_t>(_inputBuffer.length());
+            _inputBuffer.clear();
+            _textBlock.Text(L"");
+
+            // indicate text is now 0
+            _editContext.NotifyTextChanged({ 0, bufferLength }, 0, { 0, 0 });
+
+            // hide the controls until composition starts again
+            _canvas.Visibility(Visibility::Collapsed);
+            _textBlock.Visibility(Visibility::Collapsed);
         }
     }
 
     // Method Description:
     // - Handler for FocusRemoved event by CoreEditContext responsible
     //   for removing focus for the TSFInputControl control accordingly
-    //   when focus was forcibly removed from text input control.
+    //   when focus was forcibly removed from text input control. (TODO GitHub #3644)
     //   NOTE: Documentation says application should handle this event
     // Arguments:
     // - sender: CoreTextEditContext sending the request. Not used in method.
@@ -248,9 +265,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
 
         try
         {
-            const auto textEnd = ::base::ClampMin<size_t>(range.EndCaretPosition, _inputBuffer.length());
-            const auto length = ::base::ClampSub<size_t>(textEnd, range.StartCaretPosition);
-            const auto textRequested = _inputBuffer.substr(range.StartCaretPosition, length);
+            const auto textRequested = _inputBuffer.substr(range.StartCaretPosition, static_cast<size_t>(range.EndCaretPosition) - static_cast<size_t>(range.StartCaretPosition));
 
             args.Request().Text(textRequested);
         }
@@ -295,37 +310,17 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
     // - <none>
     void TSFInputControl::_textUpdatingHandler(CoreTextEditContext sender, CoreTextTextUpdatingEventArgs const& args)
     {
-        const auto incomingText = args.Text();
+        const auto text = args.Text();
         const auto range = args.Range();
 
         try
         {
-            // When a user deletes the last character in their current composition, some machines
-            // will fire a CompositionCompleted before firing a TextUpdating event that deletes the last character.
-            // The TextUpdating will have a lower StartCaretPosition, so in this scenario, _activeTextStart
-            // needs to update to be the StartCaretPosition.
-            // A known issue related to this behavior is that the last character that's deleted from a composition
-            // will get sent to the terminal before we receive the TextUpdate to delete the character.
-            // See GH #5054.
-            _activeTextStart = ::base::ClampMin(_activeTextStart, ::base::ClampedNumeric<size_t>(range.StartCaretPosition));
-
             _inputBuffer = _inputBuffer.replace(
                 range.StartCaretPosition,
-                ::base::ClampSub<size_t>(range.EndCaretPosition, range.StartCaretPosition),
-                incomingText);
+                static_cast<size_t>(range.EndCaretPosition) - static_cast<size_t>(range.StartCaretPosition),
+                text);
 
-            // Emojis/Kaomojis/Symbols chosen through the IME without starting composition
-            // will be sent straight through to the terminal.
-            if (!_inComposition)
-            {
-                _SendAndClearText();
-            }
-            else
-            {
-                Canvas().Visibility(Visibility::Visible);
-                const auto text = _inputBuffer.substr(_activeTextStart);
-                TextBlock().Text(text);
-            }
+            _textBlock.Text(_inputBuffer);
 
             // Notify the TSF that the update succeeded
             args.Result(CoreTextTextUpdatingResult::Succeeded);
@@ -339,27 +334,6 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         }
     }
 
-    // Method Description:
-    // - Send the portion of the textBuffer starting at _activeTextStart to the end of the buffer.
-    //   Then clear the TextBlock and hide it until the next time text is received.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - <none>
-    void TSFInputControl::_SendAndClearText()
-    {
-        const auto text = _inputBuffer.substr(_activeTextStart);
-
-        _compositionCompletedHandlers(text);
-
-        _activeTextStart = _inputBuffer.length();
-
-        TextBlock().Text(L"");
-
-        // hide the controls until text input starts again
-        Canvas().Visibility(Visibility::Collapsed);
-    }
-
     // Method Description:
     // - Handler for FormatUpdating event by CoreEditContext responsible
     //   for handling different format updates for a particular range of text.

src/cascadia/TerminalControl/TSFInputControl.h

@@ -36,10 +36,11 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
 
         void NotifyFocusEnter();
         void NotifyFocusLeave();
-        void ClearBuffer();
 
         void Close();
 
+        static void OnCompositionChanged(Windows::UI::Xaml::DependencyObject const&, Windows::UI::Xaml::DependencyPropertyChangedEventArgs const&);
+
         // -------------------------------- WinRT Events ---------------------------------
         TYPED_EVENT(CurrentCursorPosition, TerminalControl::TSFInputControl, TerminalControl::CursorPositionEventArgs);
         TYPED_EVENT(CurrentFontInfo, TerminalControl::TSFInputControl, TerminalControl::FontInfoEventArgs);
@@ -66,13 +67,14 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         winrt::Windows::UI::Text::Core::CoreTextEditContext::CompositionStarted_revoker _compositionStartedRevoker;
         winrt::Windows::UI::Text::Core::CoreTextEditContext::CompositionCompleted_revoker _compositionCompletedRevoker;
 
+        Windows::UI::Xaml::Controls::Canvas _canvas;
+        Windows::UI::Xaml::Controls::TextBlock _textBlock;
+
         Windows::UI::Text::Core::CoreTextEditContext _editContext;
 
         std::wstring _inputBuffer;
 
-        bool _inComposition;
-        size_t _activeTextStart;
-        void _SendAndClearText();
+        void _Create();
     };
 }
 namespace winrt::Microsoft::Terminal::TerminalControl::factory_implementation

src/cascadia/TerminalControl/TSFInputControl.idl

@@ -27,7 +27,6 @@ namespace Microsoft.Terminal.TerminalControl
 
         void NotifyFocusEnter();
         void NotifyFocusLeave();
-        void ClearBuffer();
 
         void Close();
     }

src/cascadia/TerminalControl/TSFInputControl.xaml

@@ -1,18 +0,0 @@
-<UserControl
-    x:Class="Microsoft.Terminal.TerminalControl.TSFInputControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    d:DesignHeight="768"
-    d:DesignWidth="1024">
-
-    <Canvas x:Name="Canvas"
-            Visibility="Collapsed">
-        <TextBlock x:Name="TextBlock"
-                   IsTextSelectionEnabled="false"
-                   TextWrapping="Wrap"
-                   TextDecorations="Underline" />
-    </Canvas>
-</UserControl>

src/cascadia/TerminalControl/TermControl.h

@@ -61,14 +61,13 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         winrt::fire_and_forget UpdateSettings(Settings::IControlSettings newSettings);
 
         hstring Title();
-        hstring GetProfileName() const;
 
-        bool CopySelectionToClipboard(bool collapseText);
+        bool CopySelectionToClipboard(bool trimTrailingWhitespace);
         void PasteTextFromClipboard();
         void Close();
         Windows::Foundation::Size CharacterDimensions() const;
-        Windows::Foundation::Size MinimumSize();
-        float SnapDimensionToGrid(const bool widthOrHeight, const float dimension);
+        Windows::Foundation::Size MinimumSize() const;
+        float SnapDimensionToGrid(const bool widthOrHeight, const float dimension) const;
 
         void ScrollViewport(int viewTop);
         int GetScrollOffset();
@@ -81,14 +80,12 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
 
         void CreateSearchBoxControl();
 
-        bool OnF7Pressed();
-
         ~TermControl();
 
         Windows::UI::Xaml::Automation::Peers::AutomationPeer OnCreateAutomationPeer();
         ::Microsoft::Console::Types::IUiaData* GetUiaData() const;
         const FontInfo GetActualFont() const;
-        const Windows::UI::Xaml::Thickness GetPadding();
+        const Windows::UI::Xaml::Thickness GetPadding() const;
 
         TerminalConnection::ConnectionState ConnectionState() const;
 
@@ -108,13 +105,20 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         // clang-format on
 
     private:
-        friend struct TermControlT<TermControl>; // friend our parent so it can bind private event handlers
         TerminalConnection::ITerminalConnection _connection;
         bool _initializedTerminal;
 
+        Windows::UI::Xaml::Controls::Grid _root;
+        Windows::UI::Xaml::Controls::Image _bgImageLayer;
+        Windows::UI::Xaml::Controls::SwapChainPanel _swapChainPanel;
+        Windows::UI::Xaml::Controls::Primitives::ScrollBar _scrollBar;
+
         winrt::com_ptr<SearchBoxControl> _searchBox;
 
+        TSFInputControl _tsfInputControl;
+
         event_token _connectionOutputEventToken;
+        TermControl::Tapped_revoker _tappedRevoker;
         TerminalConnection::ITerminalConnection::StateChanged_revoker _connectionStateChangedRevoker;
 
         std::unique_ptr<::Microsoft::Terminal::Core::Terminal> _terminal;
@@ -155,22 +159,26 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         // imported from WinUser
         // Used for PointerPoint.Timestamp Property (https://docs.microsoft.com/en-us/uwp/api/windows.ui.input.pointerpoint.timestamp#Windows_UI_Input_PointerPoint_Timestamp)
         Timestamp _multiClickTimer;
-        Timestamp _lastMouseClickTimestamp;
+        Timestamp _lastMouseClick;
         unsigned int _multiClickCounter;
         std::optional<winrt::Windows::Foundation::Point> _lastMouseClickPos;
+        std::optional<winrt::Windows::Foundation::Point> _clickDragStartPos{ std::nullopt };
 
-        std::optional<winrt::Windows::Foundation::Point> _focusRaisedClickPos;
-        bool _clickDrag;
-
+        // Event revokers -- we need to deregister ourselves before we die,
+        // lest we get callbacks afterwards.
+        winrt::Windows::UI::Xaml::Controls::Control::SizeChanged_revoker _sizeChangedRevoker;
+        winrt::Windows::UI::Xaml::Controls::SwapChainPanel::CompositionScaleChanged_revoker _compositionScaleChangedRevoker;
         winrt::Windows::UI::Xaml::Controls::SwapChainPanel::LayoutUpdated_revoker _layoutUpdatedRevoker;
+        winrt::Windows::UI::Xaml::UIElement::LostFocus_revoker _lostFocusRevoker;
+        winrt::Windows::UI::Xaml::UIElement::GotFocus_revoker _gotFocusRevoker;
 
+        void _Create();
         void _ApplyUISettings();
         void _InitializeBackgroundBrush();
         winrt::fire_and_forget _BackgroundColorChanged(const uint32_t color);
         bool _InitializeTerminal();
         void _UpdateFont(const bool initialUpdate = false);
         void _SetFontSize(int fontSize);
-        void _TappedHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::TappedRoutedEventArgs const& e);
         void _KeyDownHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e);
         void _CharacterHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::CharacterReceivedRoutedEventArgs const& e);
         void _PointerPressedHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
@@ -211,8 +219,6 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
 
         ::Microsoft::Terminal::Core::ControlKeyStates _GetPressedModifierKeys() const;
         bool _TrySendKeyEvent(const WORD vkey, const WORD scanCode, ::Microsoft::Terminal::Core::ControlKeyStates modifiers);
-        bool _TrySendMouseEvent(Windows::UI::Input::PointerPoint const& point);
-        bool _CanSendVTMouseInput();
 
         const COORD _GetTerminalPosition(winrt::Windows::Foundation::Point cursorPosition);
         const unsigned int _NumberOfClicks(winrt::Windows::Foundation::Point clickPos, Timestamp clickTime);

src/cascadia/TerminalControl/TermControl.idl

@@ -7,17 +7,6 @@ namespace Microsoft.Terminal.TerminalControl
     delegate void FontSizeChangedEventArgs(Int32 width, Int32 height, Boolean isInitialChange);
     delegate void ScrollPositionChangedEventArgs(Int32 viewTop, Int32 viewHeight, Int32 bufferLength);
 
-    // C++/winrt makes it difficult to share this idl between two projects,
-    // Instead, we just pin the uuid and include it in both TermControl and App
-    // If you update this one, please update TerminalApp\IF7Listener.idl.
-    // If you change this interface, please update the guid.
-    // If you press F7 and get a runtime error, go make sure both copies are the same.
-    [uuid("339e1a87-5315-4da6-96f0-565549b6472b")]
-    interface IF7Listener
-    {
-        Boolean OnF7Pressed();
-    }
-
     runtimeclass CopyToClipboardEventArgs
     {
         String Text { get; };
@@ -30,7 +19,7 @@ namespace Microsoft.Terminal.TerminalControl
         void HandleClipboardData(String data);
     }
 
-    [default_interface] runtimeclass TermControl : Windows.UI.Xaml.Controls.UserControl, IF7Listener
+    [default_interface] runtimeclass TermControl : Windows.UI.Xaml.Controls.UserControl
     {
         TermControl();
         TermControl(Microsoft.Terminal.Settings.IControlSettings settings, Microsoft.Terminal.TerminalConnection.ITerminalConnection connection);
@@ -52,7 +41,7 @@ namespace Microsoft.Terminal.TerminalControl
 
         String Title { get; };
 
-        Boolean CopySelectionToClipboard(Boolean collapseText);
+        Boolean CopySelectionToClipboard(Boolean trimTrailingWhitespace);
         void PasteTextFromClipboard();
         void Close();
         Windows.Foundation.Size CharacterDimensions { get; };

src/cascadia/TerminalControl/TermControl.xaml

@@ -1,82 +0,0 @@
-<UserControl
-    x:Class="Microsoft.Terminal.TerminalControl.TermControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="using:Microsoft.Terminal.TerminalControl"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    HorizontalAlignment="Stretch"
-    VerticalAlignment="Stretch"
-    d:DesignHeight="768"
-    d:DesignWidth="1024"
-    TabNavigation="Cycle"
-    IsTabStop="True"
-    AllowFocusOnInteraction="True"
-    AllowDrop="True"
-    Drop="_DragDropHandler"
-    DragOver="_DragOverHandler"
-    Tapped="_TappedHandler"
-    PointerWheelChanged="_MouseWheelHandler"
-    PreviewKeyDown="_KeyDownHandler"
-    CharacterReceived="_CharacterHandler"
-    GotFocus="_GotFocusHandler"
-    LostFocus="_LostFocusHandler">
-    <!--
-        TODO GH#4031: We've investigated whether we should be using KeyDown or PreviewKeyDown
-        but not necessarily come to a consensus. It's possible that moving input to the SwapChainPanel
-        will solve a bunch of the search input issues we found last time we switched.
-    -->
-
-    <Grid x:Name="RootGrid">
-        <Image x:Name="BackgroundImage"
-               AutomationProperties.AccessibilityView="Raw" />
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <Grid Grid.Column="0">
-                <SwapChainPanel x:Name="SwapChainPanel"
-                                SizeChanged="_SwapChainSizeChanged"
-                                CompositionScaleChanged="_SwapChainScaleChanged"
-                                PointerPressed="_PointerPressedHandler"
-                                PointerMoved="_PointerMovedHandler"
-                                PointerReleased="_PointerReleasedHandler" />
-
-                <!-- Putting this in a grid w/ the SwapChainPanel
-                ensures that it's always aligned w/ the scrollbar -->
-                <local:SearchBoxControl x:Name="SearchBox"
-                                        x:Load="False"
-                                        Visibility="Collapsed"
-                                        HorizontalAlignment="Right"
-                                        VerticalAlignment="Top"
-                                        Search="_Search"
-                                        Closed="_CloseSearchBoxControl" />
-            </Grid>
-
-            <ScrollBar Grid.Column="1"
-                       x:Name="ScrollBar"
-                       Orientation="Vertical"
-                       IndicatorMode="MouseIndicator"
-                       HorizontalAlignment="Right"
-                       VerticalAlignment="Stretch"
-                       Maximum="1"
-                       ViewportSize="10"
-                       IsTabStop="False"
-                       SmallChange="1"
-                       LargeChange="4"
-                       ValueChanged="_ScrollbarChangeHandler"
-                       PointerPressed="_CapturePointer"
-                       PointerReleased="_ReleasePointerCapture" />
-        </Grid>
-
-        <local:TSFInputControl x:Name="TSFInputControl"
-                               CompositionCompleted="_CompositionCompleted"
-                               CurrentCursorPosition="_CurrentCursorPositionHandler"
-                               CurrentFontInfo="_FontInfoHandler" />
-
-    </Grid>
-
-</UserControl>