From d749df70ed2b9decd123248713c3a60a736da57a Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Wed, 17 Mar 2021 15:47:24 -0500 Subject: [PATCH] Rename `Microsoft.Terminal.TerminalControl` to `.Control`; Split into dll & lib (#9472) **BE NOT AFRAID**. I know that there's 107 files in this PR, but almost all of it is just find/replacing `TerminalControl` with `Control`. This is the start of the work to move TermControl into multiple pieces, for #5000. The PR starts this work by: * Splits `TerminalControl` into separate lib and dll projects. We'll want control tests in the future, and for that, we'll need a lib. * Moves `ICoreSettings` back into the `Microsoft.Terminal.Core` namespace. We'll have other types in there soon too. * I could not tell you why this works suddenly. New VS versions? New cppwinrt version? Maybe we're just better at dealing with mdmerge bugs these days. * RENAMES `Microsoft.Terminal.TerminalControl` to `Microsoft.Terminal.Control`. This touches pretty much every file in the sln. Sorry about that (not sorry). An upcoming PR will move much of the logic in TermControl into a new `ControlCore` class that we'll add in `Microsoft.Terminal.Core`. `ControlCore` will then be unittest-able in the `UnitTests_TerminalCore`, which will help prevent regressions like #9455 ## Detailed Description of the Pull Request / Additional comments You're really gonna want to clean the sln first, then merge this into your branch, then rebuild. It's very likely that old winmds will get left behind. If you see something like ``` Error MDM2007 Cannot create type Microsoft.Terminal.TerminalControl.KeyModifiers in read-only metadata file Microsoft.Terminal.TerminalControl. ``` then that's what happened to you. --- OpenConsole.sln | 74 +++++++++++--- build/scripts/Test-WindowsTerminalPackage.ps1 | 2 +- .../LocalTests_SettingsModel/CommandTests.cpp | 2 +- .../DeserializationTests.cpp | 2 +- .../KeyBindingsTests.cpp | 2 +- .../SerializationTests.cpp | 2 +- .../SettingsModel.LocalTests.vcxproj | 2 +- .../TerminalSettingsTests.cpp | 2 +- .../LocalTests_SettingsModel/TestUtils.h | 8 +- .../FilteredCommandTests.cpp | 2 +- .../LocalTests_TerminalApp/SettingsTests.cpp | 2 +- .../TerminalApp.LocalTests.vcxproj | 2 +- .../TestHostApp/TestHostApp.vcxproj | 2 +- .../TerminalApp/AppActionHandlers.cpp | 2 +- src/cascadia/TerminalApp/AppKeyBindings.cpp | 2 +- src/cascadia/TerminalApp/AppKeyBindings.h | 2 +- src/cascadia/TerminalApp/AppKeyBindings.idl | 2 +- src/cascadia/TerminalApp/AppLogic.cpp | 2 +- src/cascadia/TerminalApp/CommandPalette.cpp | 2 +- src/cascadia/TerminalApp/PaletteItem.cpp | 2 +- src/cascadia/TerminalApp/Pane.cpp | 2 +- src/cascadia/TerminalApp/Pane.h | 14 +-- src/cascadia/TerminalApp/SettingsTab.cpp | 2 +- src/cascadia/TerminalApp/TabBase.cpp | 2 +- .../TerminalApp/TerminalAppLib.vcxproj | 12 ++- src/cascadia/TerminalApp/TerminalPage.cpp | 19 ++-- src/cascadia/TerminalApp/TerminalPage.h | 22 ++--- src/cascadia/TerminalApp/TerminalTab.cpp | 4 +- src/cascadia/TerminalApp/TerminalTab.h | 12 +-- .../TerminalApp/dll/TerminalApp.vcxproj | 16 ++- src/cascadia/TerminalApp/pch.h | 3 +- .../TerminalControl/IControlSettings.idl | 6 +- src/cascadia/TerminalControl/IKeyBindings.idl | 2 +- .../TerminalControl/IMouseWheelListener.idl | 2 +- src/cascadia/TerminalControl/KeyChord.cpp | 14 +-- src/cascadia/TerminalControl/KeyChord.h | 12 +-- src/cascadia/TerminalControl/KeyChord.idl | 2 +- .../TerminalControl/SearchBoxControl.cpp | 2 +- .../TerminalControl/SearchBoxControl.h | 6 +- .../TerminalControl/SearchBoxControl.idl | 2 +- .../TerminalControl/SearchBoxControl.xaml | 6 +- .../TerminalControl/TSFInputControl.cpp | 4 +- .../TerminalControl/TSFInputControl.h | 10 +- .../TerminalControl/TSFInputControl.idl | 2 +- .../TerminalControl/TSFInputControl.xaml | 2 +- src/cascadia/TerminalControl/TermControl.cpp | 24 ++--- src/cascadia/TerminalControl/TermControl.h | 25 ++--- src/cascadia/TerminalControl/TermControl.idl | 8 +- src/cascadia/TerminalControl/TermControl.xaml | 4 +- .../TermControlAutomationPeer.cpp | 4 +- .../TermControlAutomationPeer.h | 8 +- .../TermControlAutomationPeer.idl | 2 +- .../TerminalControl.vcxproj.filters | 54 ----------- ...rol.vcxproj => TerminalControlLib.vcxproj} | 92 ++++++------------ .../TerminalControl/XamlUiaTextRange.cpp | 2 +- .../TerminalControl/XamlUiaTextRange.h | 2 +- .../{ => dll}/TerminalControl.def | 0 .../dll/TerminalControl.vcxproj | 97 +++++++++++++++++++ src/cascadia/TerminalControl/dll/pch.cpp | 4 + src/cascadia/TerminalControl/dll/pch.h | 8 ++ src/cascadia/TerminalControl/init.cpp | 2 +- src/cascadia/TerminalCore/ICoreSettings.idl | 2 +- src/cascadia/TerminalCore/Terminal.cpp | 4 +- src/cascadia/TerminalCore/Terminal.hpp | 6 +- .../TerminalCore/lib/terminalcore-lib.vcxproj | 2 +- .../TerminalSettingsEditor/Interaction.cpp | 2 +- .../TerminalSettingsEditor/Interaction.h | 2 +- ...Microsoft.Terminal.Settings.Editor.vcxproj | 14 ++- .../TerminalSettingsEditor/Profiles.cpp | 8 +- .../TerminalSettingsEditor/Profiles.h | 6 +- .../TerminalSettingsEditor/Profiles.idl | 6 +- src/cascadia/TerminalSettingsEditor/pch.h | 2 +- .../TerminalSettingsModel/ActionArgs.cpp | 2 +- .../TerminalSettingsModel/ActionArgs.h | 2 +- .../TerminalSettingsModel/ActionArgs.idl | 2 +- .../CascadiaSettings.cpp | 2 +- .../TerminalSettingsModel/EnumMappings.cpp | 8 +- .../TerminalSettingsModel/EnumMappings.h | 8 +- .../TerminalSettingsModel/EnumMappings.idl | 8 +- .../TerminalSettingsModel/GlobalAppSettings.h | 2 +- .../GlobalAppSettings.idl | 2 +- .../KeyChordSerialization.cpp | 2 +- .../KeyChordSerialization.h | 4 +- .../KeyChordSerialization.idl | 4 +- .../TerminalSettingsModel/KeyMapping.cpp | 2 +- .../TerminalSettingsModel/KeyMapping.h | 22 ++--- .../TerminalSettingsModel/KeyMapping.idl | 10 +- .../KeyMappingSerialization.cpp | 2 +- ...crosoft.Terminal.Settings.ModelLib.vcxproj | 10 +- .../TerminalSettingsModel/Profile.cpp | 2 +- src/cascadia/TerminalSettingsModel/Profile.h | 6 +- .../TerminalSettingsModel/Profile.idl | 6 +- .../TerminalSettings.cpp | 2 +- .../TerminalSettingsModel/TerminalSettings.h | 12 +-- .../TerminalSettings.idl | 8 +- .../TerminalSettingsSerializationHelpers.h | 8 +- .../Microsoft.Terminal.Settings.Model.vcxproj | 13 ++- src/cascadia/TerminalSettingsModel/pch.h | 2 +- .../UnitTests_TerminalCore/MockTermSettings.h | 4 +- .../ScreenSizeLimitsTest.cpp | 2 +- .../UnitTests_TerminalCore/ScrollTest.cpp | 2 +- .../UnitTests_TerminalCore/SelectionTest.cpp | 2 +- .../TerminalApiTest.cpp | 2 +- .../TerminalBufferTests.cpp | 2 +- src/cascadia/WindowsTerminal/AppHost.cpp | 2 +- .../WindowsTerminal/WindowsTerminal.vcxproj | 15 ++- src/cascadia/WindowsTerminal/pch.h | 2 +- .../WindowsTerminalUniversal.vcxproj | 16 ++- src/cascadia/ut_app/JsonTests.cpp | 2 +- 109 files changed, 513 insertions(+), 377 deletions(-) delete mode 100644 src/cascadia/TerminalControl/TerminalControl.vcxproj.filters rename src/cascadia/TerminalControl/{TerminalControl.vcxproj => TerminalControlLib.vcxproj} (64%) rename src/cascadia/TerminalControl/{ => dll}/TerminalControl.def (100%) create mode 100644 src/cascadia/TerminalControl/dll/TerminalControl.vcxproj create mode 100644 src/cascadia/TerminalControl/dll/pch.cpp create mode 100644 src/cascadia/TerminalControl/dll/pch.h diff --git a/OpenConsole.sln b/OpenConsole.sln index 2d59b00123..71bc8ce925 100644 --- a/OpenConsole.sln +++ b/OpenConsole.sln @@ -161,7 +161,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalConnection", "src\c EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalCore", "src\cascadia\TerminalCore\lib\TerminalCore-lib.vcxproj", "{CA5CAD1A-ABCD-429C-B551-8562EC954746}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalControl", "src\cascadia\TerminalControl\TerminalControl.vcxproj", "{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalControlLib", "src\cascadia\TerminalControl\TerminalControlLib.vcxproj", "{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}" ProjectSection(ProjectDependencies) = postProject {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} {CA5CAD1A-ABCD-429C-B551-8562EC954746} = {CA5CAD1A-ABCD-429C-B551-8562EC954746} @@ -169,10 +169,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalControl", "src\casc {48D21369-3D7B-4431-9967-24E81292CF63} = {48D21369-3D7B-4431-9967-24E81292CF63} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalControl", "src\cascadia\TerminalControl\dll\TerminalControl.vcxproj", "{CA5CAD1A-F542-4635-A069-7CAEFB930070}" + ProjectSection(ProjectDependencies) = postProject + {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminal", "src\cascadia\WindowsTerminal\WindowsTerminal.vcxproj", "{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}" ProjectSection(ProjectDependencies) = postProject {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} - {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} + {CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070} {CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} {CA5CAD1A-ABCD-429C-B551-8562EC954746} = {CA5CAD1A-ABCD-429C-B551-8562EC954746} {27B5AAEB-A548-44CF-9777-F8BAA32AF7AE} = {27B5AAEB-A548-44CF-9777-F8BAA32AF7AE} @@ -185,7 +190,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalApp", "src\cascadia {CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076} {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} - {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} + {CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminalShellExt", "src\cascadia\ShellExtension\WindowsTerminalShellExt.vcxproj", "{F2ED628A-DB22-446F-A081-4CC845B51A2B}" @@ -236,7 +241,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAppLib", "src\casca ProjectSection(ProjectDependencies) = postProject {CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076} {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} - {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} + {CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocalTests_TerminalApp", "src\cascadia\LocalTests_TerminalApp\TerminalApp.LocalTests.vcxproj", "{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}" @@ -326,7 +331,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Settings EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Settings.Model.Lib", "src\cascadia\TerminalSettingsModel\Microsoft.Terminal.Settings.ModelLib.vcxproj", "{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}" ProjectSection(ProjectDependencies) = postProject - {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} + {CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Settings.Model", "src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj", "{CA5CAD1A-082C-4476-9F33-94B339494076}" @@ -338,7 +343,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocalTests_SettingsModel", ProjectSection(ProjectDependencies) = postProject {CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076} {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} - {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} + {CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070} {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} EndProjectSection EndProject @@ -364,7 +369,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_Remoting", "src\c EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wpf", "wpf", "{4DAF0299-495E-4CD1-A982-9BAC16A45932}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.Proxy", "src\host\proxy\Host.Proxy.vcxproj", "{E437B604-3E98-4F40-A927-E173E818EA4B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenConsoleProxy", "src\host\proxy\Host.Proxy.vcxproj", "{E437B604-3E98-4F40-A927-E173E818EA4B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Window", "Window", "{2D17E75D-2DDC-42C4-AD70-704D95A937AE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Settings", "Settings", "{77875138-BB08-49F9-8BB1-409C2150E0E1}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Control", "Control", "{9921CA0A-320C-4460-8623-3A3196E7F4CB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -1518,6 +1529,33 @@ Global {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}.Release|x64.Build.0 = Release|x64 {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}.Release|x86.ActiveCfg = Release|Win32 {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}.Release|x86.Build.0 = Release|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.AuditMode|Any CPU.ActiveCfg = Debug|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.AuditMode|ARM.ActiveCfg = AuditMode|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.AuditMode|ARM64.ActiveCfg = Release|ARM64 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.AuditMode|DotNet_x64Test.ActiveCfg = Debug|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.AuditMode|DotNet_x86Test.ActiveCfg = Debug|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.AuditMode|x64.ActiveCfg = Release|x64 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.AuditMode|x86.ActiveCfg = Release|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Debug|ARM.ActiveCfg = Debug|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Debug|ARM64.Build.0 = Debug|ARM64 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Debug|x64.ActiveCfg = Debug|x64 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Debug|x64.Build.0 = Debug|x64 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Debug|x86.ActiveCfg = Debug|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Debug|x86.Build.0 = Debug|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Release|Any CPU.ActiveCfg = Release|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Release|ARM.ActiveCfg = Release|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Release|ARM64.ActiveCfg = Release|ARM64 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Release|ARM64.Build.0 = Release|ARM64 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Release|DotNet_x64Test.ActiveCfg = Release|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Release|DotNet_x86Test.ActiveCfg = Release|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Release|x64.ActiveCfg = Release|x64 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Release|x64.Build.0 = Release|x64 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Release|x86.ActiveCfg = Release|Win32 + {CA5CAD1A-F542-4635-A069-7CAEFB930070}.Release|x86.Build.0 = Release|Win32 {CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}.AuditMode|Any CPU.ActiveCfg = Debug|x64 {CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}.AuditMode|ARM.ActiveCfg = AuditMode|Win32 {CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}.AuditMode|ARM64.ActiveCfg = Release|ARM64 @@ -2617,11 +2655,12 @@ Global {0CF235BD-2DA0-407E-90EE-C467E8BBC714} = {1E4A062E-293B-4817-B20D-BF16B979E350} {48D21369-3D7B-4431-9967-24E81292CF62} = {05500DEF-2294-41E3-AF9A-24E580B82836} {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {59840756-302F-44DF-AA47-441A9D673202} - {CA5CAD1A-ABCD-429C-B551-8562EC954746} = {59840756-302F-44DF-AA47-441A9D673202} - {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {59840756-302F-44DF-AA47-441A9D673202} - {CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B} = {59840756-302F-44DF-AA47-441A9D673202} + {CA5CAD1A-ABCD-429C-B551-8562EC954746} = {9921CA0A-320C-4460-8623-3A3196E7F4CB} + {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {9921CA0A-320C-4460-8623-3A3196E7F4CB} + {CA5CAD1A-F542-4635-A069-7CAEFB930070} = {9921CA0A-320C-4460-8623-3A3196E7F4CB} + {CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B} = {2D17E75D-2DDC-42C4-AD70-704D95A937AE} {CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {59840756-302F-44DF-AA47-441A9D673202} - {F2ED628A-DB22-446F-A081-4CC845B51A2B} = {59840756-302F-44DF-AA47-441A9D673202} + {F2ED628A-DB22-446F-A081-4CC845B51A2B} = {2D17E75D-2DDC-42C4-AD70-704D95A937AE} {2C2BEEF4-9333-4D05-B12A-1905CBF112F9} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E} {EF3E32A7-5FF6-42B4-B6E2-96CD7D033F00} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB} {16376381-CE22-42BE-B667-C6B35007008D} = {81C352DB-1818-45B7-A284-18E259F1CC87} @@ -2652,17 +2691,20 @@ Global {6BAE5851-50D5-4934-8D5E-30361A8A40F3} = {81C352DB-1818-45B7-A284-18E259F1CC87} {1588FD7C-241E-4E7D-9113-43735F3E6BAD} = {4DAF0299-495E-4CD1-A982-9BAC16A45932} {506FD703-BAA7-4F6E-9361-64F550EC8FCA} = {59840756-302F-44DF-AA47-441A9D673202} - {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {59840756-302F-44DF-AA47-441A9D673202} - {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {59840756-302F-44DF-AA47-441A9D673202} - {CA5CAD1A-082C-4476-9F33-94B339494076} = {59840756-302F-44DF-AA47-441A9D673202} + {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {77875138-BB08-49F9-8BB1-409C2150E0E1} + {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {77875138-BB08-49F9-8BB1-409C2150E0E1} + {CA5CAD1A-082C-4476-9F33-94B339494076} = {77875138-BB08-49F9-8BB1-409C2150E0E1} {CA5CAD1A-9B68-456A-B13E-C8218070DC42} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E} {21B7EA5E-1EF8-49B6-AC07-11714AF0E37D} = {A10C4720-DCA4-4640-9749-67F4314F527C} {F75E29D0-D288-478B-8D83-2C190F321A3F} = {A10C4720-DCA4-4640-9749-67F4314F527C} - {43CE4CE5-0010-4B99-9569-672670D26E26} = {59840756-302F-44DF-AA47-441A9D673202} - {27B5AAEB-A548-44CF-9777-F8BAA32AF7AE} = {59840756-302F-44DF-AA47-441A9D673202} + {43CE4CE5-0010-4B99-9569-672670D26E26} = {2D17E75D-2DDC-42C4-AD70-704D95A937AE} + {27B5AAEB-A548-44CF-9777-F8BAA32AF7AE} = {2D17E75D-2DDC-42C4-AD70-704D95A937AE} {68A10CD3-AA64-465B-AF5F-ED4E9700543C} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E} {4DAF0299-495E-4CD1-A982-9BAC16A45932} = {59840756-302F-44DF-AA47-441A9D673202} {E437B604-3E98-4F40-A927-E173E818EA4B} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB} + {2D17E75D-2DDC-42C4-AD70-704D95A937AE} = {59840756-302F-44DF-AA47-441A9D673202} + {77875138-BB08-49F9-8BB1-409C2150E0E1} = {59840756-302F-44DF-AA47-441A9D673202} + {9921CA0A-320C-4460-8623-3A3196E7F4CB} = {59840756-302F-44DF-AA47-441A9D673202} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3140B1B7-C8EE-43D1-A772-D82A7061A271} diff --git a/build/scripts/Test-WindowsTerminalPackage.ps1 b/build/scripts/Test-WindowsTerminalPackage.ps1 index 2f2b5cbc34..f8bb00c801 100644 --- a/build/scripts/Test-WindowsTerminalPackage.ps1 +++ b/build/scripts/Test-WindowsTerminalPackage.ps1 @@ -58,7 +58,7 @@ Try { ### Check the activatable class entries for a few DLLs we need. $inProcServers = $Manifest.Package.Extensions.Extension.InProcessServer.Path - $RequiredInProcServers = ("TerminalApp.dll", "TerminalControl.dll", "TerminalConnection.dll") + $RequiredInProcServers = ("TerminalApp.dll", "Microsoft.Terminal.Control.dll", "Microsoft.Terminal.Remoting.dll", "Microsoft.Terminal.Settings.Editor.dll", "Microsoft.Terminal.Settings.Model.dll", "TerminalConnection.dll") Write-Verbose "InProc Servers: $inProcServers" diff --git a/src/cascadia/LocalTests_SettingsModel/CommandTests.cpp b/src/cascadia/LocalTests_SettingsModel/CommandTests.cpp index 110c0a5b93..44526b3638 100644 --- a/src/cascadia/LocalTests_SettingsModel/CommandTests.cpp +++ b/src/cascadia/LocalTests_SettingsModel/CommandTests.cpp @@ -9,7 +9,7 @@ using namespace Microsoft::Console; using namespace winrt::Microsoft::Terminal::Settings::Model; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; using namespace winrt::Windows::Foundation::Collections; using namespace WEX::Logging; using namespace WEX::TestExecution; diff --git a/src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp b/src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp index 640f47e6b7..c2c81832b7 100644 --- a/src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp +++ b/src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp @@ -15,7 +15,7 @@ using namespace WEX::Logging; using namespace WEX::TestExecution; using namespace WEX::Common; using namespace winrt::Microsoft::Terminal::Settings::Model; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; namespace SettingsModelLocalTests { diff --git a/src/cascadia/LocalTests_SettingsModel/KeyBindingsTests.cpp b/src/cascadia/LocalTests_SettingsModel/KeyBindingsTests.cpp index 04c2084bc2..506c6fde61 100644 --- a/src/cascadia/LocalTests_SettingsModel/KeyBindingsTests.cpp +++ b/src/cascadia/LocalTests_SettingsModel/KeyBindingsTests.cpp @@ -11,7 +11,7 @@ using namespace Microsoft::Console; using namespace winrt::Microsoft::Terminal::Settings::Model; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; using namespace WEX::Logging; using namespace WEX::TestExecution; using namespace WEX::Common; diff --git a/src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp b/src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp index 4f00235463..022db74009 100644 --- a/src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp +++ b/src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp @@ -15,7 +15,7 @@ using namespace WEX::Logging; using namespace WEX::TestExecution; using namespace WEX::Common; using namespace winrt::Microsoft::Terminal::Settings::Model; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; namespace SettingsModelLocalTests { diff --git a/src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj b/src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj index 3f3fdf5964..7576770b44 100644 --- a/src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj +++ b/src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj @@ -58,7 +58,7 @@ - + diff --git a/src/cascadia/LocalTests_SettingsModel/TerminalSettingsTests.cpp b/src/cascadia/LocalTests_SettingsModel/TerminalSettingsTests.cpp index 22e7d6b9e4..fd6d9f6109 100644 --- a/src/cascadia/LocalTests_SettingsModel/TerminalSettingsTests.cpp +++ b/src/cascadia/LocalTests_SettingsModel/TerminalSettingsTests.cpp @@ -12,7 +12,7 @@ using namespace WEX::Logging; using namespace WEX::TestExecution; using namespace WEX::Common; using namespace winrt::Microsoft::Terminal::Settings::Model; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; namespace SettingsModelLocalTests { diff --git a/src/cascadia/LocalTests_SettingsModel/TestUtils.h b/src/cascadia/LocalTests_SettingsModel/TestUtils.h index e211d50c43..12c8dd4f9d 100644 --- a/src/cascadia/LocalTests_SettingsModel/TestUtils.h +++ b/src/cascadia/LocalTests_SettingsModel/TestUtils.h @@ -24,18 +24,18 @@ public: // Return Value: // - The ActionAndArgs bound to the given key, or nullptr if nothing is bound to it. static const winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs GetActionAndArgs(const winrt::Microsoft::Terminal::Settings::Model::KeyMapping& keymap, - const winrt::Microsoft::Terminal::TerminalControl::KeyChord& kc) + const winrt::Microsoft::Terminal::Control::KeyChord& kc) { std::wstring buffer{ L"" }; - if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::TerminalControl::KeyModifiers::Ctrl)) + if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::Control::KeyModifiers::Ctrl)) { buffer += L"Ctrl+"; } - if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::TerminalControl::KeyModifiers::Shift)) + if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::Control::KeyModifiers::Shift)) { buffer += L"Shift+"; } - if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::TerminalControl::KeyModifiers::Alt)) + if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::Control::KeyModifiers::Alt)) { buffer += L"Alt+"; } diff --git a/src/cascadia/LocalTests_TerminalApp/FilteredCommandTests.cpp b/src/cascadia/LocalTests_TerminalApp/FilteredCommandTests.cpp index 95bcbe4475..e6c274457a 100644 --- a/src/cascadia/LocalTests_TerminalApp/FilteredCommandTests.cpp +++ b/src/cascadia/LocalTests_TerminalApp/FilteredCommandTests.cpp @@ -11,7 +11,7 @@ using namespace WEX::Logging; using namespace WEX::TestExecution; using namespace WEX::Common; using namespace winrt::Microsoft::Terminal::Settings::Model; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; namespace TerminalAppLocalTests { diff --git a/src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp b/src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp index 9b6444bdb5..2d6273ad89 100644 --- a/src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp +++ b/src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp @@ -12,7 +12,7 @@ using namespace WEX::TestExecution; using namespace WEX::Common; using namespace winrt::TerminalApp; using namespace winrt::Microsoft::Terminal::Settings::Model; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; namespace TerminalAppLocalTests { diff --git a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj index 8363792372..66edaa8cc4 100644 --- a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj +++ b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj @@ -59,7 +59,7 @@ - + diff --git a/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj b/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj index 384356df6f..d8e127175f 100644 --- a/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj +++ b/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj @@ -97,7 +97,7 @@ - + {ca5cad1a-44bd-4ac7-ac72-f16e576fdd12} diff --git a/src/cascadia/TerminalApp/AppActionHandlers.cpp b/src/cascadia/TerminalApp/AppActionHandlers.cpp index 1734b4b8bb..c45ef8596a 100644 --- a/src/cascadia/TerminalApp/AppActionHandlers.cpp +++ b/src/cascadia/TerminalApp/AppActionHandlers.cpp @@ -17,7 +17,7 @@ using namespace winrt::Windows::Foundation::Collections; using namespace winrt::Windows::System; using namespace winrt::Microsoft::Terminal; using namespace winrt::Microsoft::Terminal::Settings::Model; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; using namespace winrt::Microsoft::Terminal::TerminalConnection; using namespace ::TerminalApp; diff --git a/src/cascadia/TerminalApp/AppKeyBindings.cpp b/src/cascadia/TerminalApp/AppKeyBindings.cpp index d694098744..4559e7624c 100644 --- a/src/cascadia/TerminalApp/AppKeyBindings.cpp +++ b/src/cascadia/TerminalApp/AppKeyBindings.cpp @@ -8,7 +8,7 @@ using namespace winrt::Microsoft::Terminal; using namespace winrt::TerminalApp; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; namespace winrt::TerminalApp::implementation { diff --git a/src/cascadia/TerminalApp/AppKeyBindings.h b/src/cascadia/TerminalApp/AppKeyBindings.h index 5d790a0310..301367eb58 100644 --- a/src/cascadia/TerminalApp/AppKeyBindings.h +++ b/src/cascadia/TerminalApp/AppKeyBindings.h @@ -19,7 +19,7 @@ namespace winrt::TerminalApp::implementation { AppKeyBindings() = default; - bool TryKeyChord(winrt::Microsoft::Terminal::TerminalControl::KeyChord const& kc); + bool TryKeyChord(winrt::Microsoft::Terminal::Control::KeyChord const& kc); void SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch); void SetKeyMapping(const Microsoft::Terminal::Settings::Model::KeyMapping& keymap); diff --git a/src/cascadia/TerminalApp/AppKeyBindings.idl b/src/cascadia/TerminalApp/AppKeyBindings.idl index b4b979670f..1bd93de0d9 100644 --- a/src/cascadia/TerminalApp/AppKeyBindings.idl +++ b/src/cascadia/TerminalApp/AppKeyBindings.idl @@ -4,7 +4,7 @@ import "ShortcutActionDispatch.idl"; namespace TerminalApp { - [default_interface] runtimeclass AppKeyBindings : Microsoft.Terminal.TerminalControl.IKeyBindings + [default_interface] runtimeclass AppKeyBindings : Microsoft.Terminal.Control.IKeyBindings { AppKeyBindings(); diff --git a/src/cascadia/TerminalApp/AppLogic.cpp b/src/cascadia/TerminalApp/AppLogic.cpp index c774f7f105..96921ecc67 100644 --- a/src/cascadia/TerminalApp/AppLogic.cpp +++ b/src/cascadia/TerminalApp/AppLogic.cpp @@ -17,7 +17,7 @@ using namespace winrt::Windows::UI::Xaml::Controls; using namespace winrt::Windows::UI::Core; using namespace winrt::Windows::System; using namespace winrt::Microsoft::Terminal; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; using namespace winrt::Microsoft::Terminal::Settings::Model; using namespace ::TerminalApp; diff --git a/src/cascadia/TerminalApp/CommandPalette.cpp b/src/cascadia/TerminalApp/CommandPalette.cpp index d306ce1ce6..fbf4a4e246 100644 --- a/src/cascadia/TerminalApp/CommandPalette.cpp +++ b/src/cascadia/TerminalApp/CommandPalette.cpp @@ -253,7 +253,7 @@ namespace winrt::TerminalApp::implementation // a really widely used keyboard navigation key. if (_currentMode == CommandPaletteMode::TabSwitchMode && _keymap) { - winrt::Microsoft::Terminal::TerminalControl::KeyChord kc{ ctrlDown, altDown, shiftDown, static_cast(key) }; + winrt::Microsoft::Terminal::Control::KeyChord kc{ ctrlDown, altDown, shiftDown, static_cast(key) }; const auto action = _keymap.TryLookup(kc); if (action) { diff --git a/src/cascadia/TerminalApp/PaletteItem.cpp b/src/cascadia/TerminalApp/PaletteItem.cpp index 499fce1d51..697898dbcb 100644 --- a/src/cascadia/TerminalApp/PaletteItem.cpp +++ b/src/cascadia/TerminalApp/PaletteItem.cpp @@ -9,7 +9,7 @@ using namespace winrt; using namespace winrt::Windows::UI::Xaml; using namespace winrt::Windows::UI::Core; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; using namespace winrt::Microsoft::Terminal::Settings::Model; using namespace winrt::Windows::System; diff --git a/src/cascadia/TerminalApp/Pane.cpp b/src/cascadia/TerminalApp/Pane.cpp index 810ad8f7e9..0c9d23b525 100644 --- a/src/cascadia/TerminalApp/Pane.cpp +++ b/src/cascadia/TerminalApp/Pane.cpp @@ -14,7 +14,7 @@ using namespace winrt::Windows::UI::Xaml; using namespace winrt::Windows::UI::Core; using namespace winrt::Windows::UI::Xaml::Media; using namespace winrt::Microsoft::Terminal::Settings::Model; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; using namespace winrt::Microsoft::Terminal::TerminalConnection; using namespace winrt::TerminalApp; using namespace TerminalApp; diff --git a/src/cascadia/TerminalApp/Pane.h b/src/cascadia/TerminalApp/Pane.h index 443cc87542..7a1cc69673 100644 --- a/src/cascadia/TerminalApp/Pane.h +++ b/src/cascadia/TerminalApp/Pane.h @@ -19,7 +19,7 @@ // - Mike Griese (zadjii-msft) 16-May-2019 #pragma once -#include +#include #include #include "../../cascadia/inc/cppwinrt_utils.h" @@ -37,11 +37,11 @@ class Pane : public std::enable_shared_from_this { public: Pane(const GUID& profile, - const winrt::Microsoft::Terminal::TerminalControl::TermControl& control, + const winrt::Microsoft::Terminal::Control::TermControl& control, const bool lastFocused = false); std::shared_ptr GetActivePane(); - winrt::Microsoft::Terminal::TerminalControl::TermControl GetTerminalControl(); + winrt::Microsoft::Terminal::Control::TermControl GetTerminalControl(); std::optional GetFocusedProfile(); winrt::Windows::UI::Xaml::Controls::Grid GetRootElement(); @@ -61,7 +61,7 @@ public: std::pair, std::shared_ptr> Split(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType, const float splitSize, const GUID& profile, - const winrt::Microsoft::Terminal::TerminalControl::TermControl& control); + const winrt::Microsoft::Terminal::Control::TermControl& control); float CalcSnappedDimension(const bool widthOrHeight, const float dimension) const; std::optional PreCalculateAutoSplit(const std::shared_ptr target, const winrt::Windows::Foundation::Size parentSize) const; @@ -95,7 +95,7 @@ private: winrt::Windows::UI::Xaml::Controls::Grid _root{}; winrt::Windows::UI::Xaml::Controls::Border _border{}; - winrt::Microsoft::Terminal::TerminalControl::TermControl _control{ nullptr }; + winrt::Microsoft::Terminal::Control::TermControl _control{ nullptr }; static winrt::Windows::UI::Xaml::Media::SolidColorBrush s_focusedBorderBrush; static winrt::Windows::UI::Xaml::Media::SolidColorBrush s_unfocusedBorderBrush; @@ -131,7 +131,7 @@ private: std::pair, std::shared_ptr> _Split(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType, const float splitSize, const GUID& profile, - const winrt::Microsoft::Terminal::TerminalControl::TermControl& control); + const winrt::Microsoft::Terminal::Control::TermControl& control); void _CreateRowColDefinitions(); void _ApplySplitDefinitions(); @@ -145,7 +145,7 @@ private: winrt::fire_and_forget _CloseChildRoutine(const bool closeFirst); void _FocusFirstChild(); - void _ControlConnectionStateChangedHandler(const winrt::Microsoft::Terminal::TerminalControl::TermControl& sender, const winrt::Windows::Foundation::IInspectable& /*args*/); + void _ControlConnectionStateChangedHandler(const winrt::Microsoft::Terminal::Control::TermControl& sender, const winrt::Windows::Foundation::IInspectable& /*args*/); void _ControlWarningBellHandler(winrt::Windows::Foundation::IInspectable const& sender, winrt::Windows::Foundation::IInspectable const& e); void _ControlGotFocusHandler(winrt::Windows::Foundation::IInspectable const& sender, diff --git a/src/cascadia/TerminalApp/SettingsTab.cpp b/src/cascadia/TerminalApp/SettingsTab.cpp index 3aa39c240e..df2cf7a869 100644 --- a/src/cascadia/TerminalApp/SettingsTab.cpp +++ b/src/cascadia/TerminalApp/SettingsTab.cpp @@ -10,7 +10,7 @@ using namespace winrt; using namespace winrt::Windows::UI::Xaml; using namespace winrt::Windows::UI::Core; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; using namespace winrt::Microsoft::Terminal::Settings::Model; using namespace winrt::Microsoft::Terminal::Settings::Editor; using namespace winrt::Windows::System; diff --git a/src/cascadia/TerminalApp/TabBase.cpp b/src/cascadia/TerminalApp/TabBase.cpp index a26f523e1d..b8d8a4dd2e 100644 --- a/src/cascadia/TerminalApp/TabBase.cpp +++ b/src/cascadia/TerminalApp/TabBase.cpp @@ -9,7 +9,7 @@ using namespace winrt; using namespace winrt::Windows::UI::Xaml; using namespace winrt::Windows::UI::Core; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; using namespace winrt::Microsoft::Terminal::Settings::Model; using namespace winrt::Windows::System; diff --git a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj index 700bc64b5a..a37fe1de6f 100644 --- a/src/cascadia/TerminalApp/TerminalAppLib.vcxproj +++ b/src/cascadia/TerminalApp/TerminalAppLib.vcxproj @@ -321,8 +321,8 @@ false false - - $(OpenConsoleCommonOutDir)TerminalControl\Microsoft.Terminal.TerminalControl.winmd + + $(OpenConsoleCommonOutDir)Microsoft.Terminal.Control\Microsoft.Terminal.Control.winmd true false false @@ -339,6 +339,12 @@ false false + + $(OpenConsoleCommonOutDir)TerminalCore\Microsoft.Terminal.Core.winmd + true + false + false + @@ -386,4 +392,4 @@ - \ No newline at end of file + diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp index f7568d92ae..857fcc78aa 100644 --- a/src/cascadia/TerminalApp/TerminalPage.cpp +++ b/src/cascadia/TerminalApp/TerminalPage.cpp @@ -10,7 +10,6 @@ #include "TerminalPage.g.cpp" #include -#include #include "TabRowControl.h" #include "ColorHelper.h" @@ -26,7 +25,7 @@ using namespace winrt::Windows::System; using namespace winrt::Windows::ApplicationModel::DataTransfer; using namespace winrt::Windows::UI::Text; using namespace winrt::Microsoft::Terminal; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; using namespace winrt::Microsoft::Terminal::TerminalConnection; using namespace winrt::Microsoft::Terminal::Settings::Model; using namespace ::TerminalApp; @@ -1093,7 +1092,7 @@ namespace winrt::TerminalApp::implementation auto const altDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Menu), CoreVirtualKeyStates::Down); auto const shiftDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Shift), CoreVirtualKeyStates::Down); - winrt::Microsoft::Terminal::TerminalControl::KeyChord kc{ ctrlDown, altDown, shiftDown, static_cast(key) }; + winrt::Microsoft::Terminal::Control::KeyChord kc{ ctrlDown, altDown, shiftDown, static_cast(key) }; const auto actionAndArgs = _settings.KeyMap().TryLookup(kc); if (actionAndArgs) { @@ -1121,7 +1120,7 @@ namespace winrt::TerminalApp::implementation auto const altDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Menu), CoreVirtualKeyStates::Down); auto const shiftDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Shift), CoreVirtualKeyStates::Down); - winrt::Microsoft::Terminal::TerminalControl::KeyChord kc{ ctrlDown, altDown, shiftDown, static_cast(key) }; + winrt::Microsoft::Terminal::Control::KeyChord kc{ ctrlDown, altDown, shiftDown, static_cast(key) }; const auto actionAndArgs = _settings.KeyMap().TryLookup(kc); if (actionAndArgs && (actionAndArgs.Action() == ShortcutAction::CloseTab || actionAndArgs.Action() == ShortcutAction::NextTab || actionAndArgs.Action() == ShortcutAction::PrevTab || actionAndArgs.Action() == ShortcutAction::ClosePane)) { @@ -2218,7 +2217,7 @@ namespace winrt::TerminalApp::implementation CATCH_LOG(); } - void TerminalPage::_OpenHyperlinkHandler(const IInspectable /*sender*/, const Microsoft::Terminal::TerminalControl::OpenHyperlinkEventArgs eventArgs) + void TerminalPage::_OpenHyperlinkHandler(const IInspectable /*sender*/, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs) { try { @@ -2291,7 +2290,7 @@ namespace winrt::TerminalApp::implementation return false; } - void TerminalPage::_ControlNoticeRaisedHandler(const IInspectable /*sender*/, const Microsoft::Terminal::TerminalControl::NoticeEventArgs eventArgs) + void TerminalPage::_ControlNoticeRaisedHandler(const IInspectable /*sender*/, const Microsoft::Terminal::Control::NoticeEventArgs eventArgs) { winrt::hstring message = eventArgs.Message(); @@ -2299,16 +2298,16 @@ namespace winrt::TerminalApp::implementation switch (eventArgs.Level()) { - case TerminalControl::NoticeLevel::Debug: + case NoticeLevel::Debug: title = RS_(L"NoticeDebug"); //\xebe8 break; - case TerminalControl::NoticeLevel::Info: + case NoticeLevel::Info: title = RS_(L"NoticeInfo"); // \xe946 break; - case TerminalControl::NoticeLevel::Warning: + case NoticeLevel::Warning: title = RS_(L"NoticeWarning"); //\xe7ba break; - case TerminalControl::NoticeLevel::Error: + case NoticeLevel::Error: title = RS_(L"NoticeError"); //\xe783 break; } diff --git a/src/cascadia/TerminalApp/TerminalPage.h b/src/cascadia/TerminalApp/TerminalPage.h index a3acab96d8..09485baa95 100644 --- a/src/cascadia/TerminalApp/TerminalPage.h +++ b/src/cascadia/TerminalApp/TerminalPage.h @@ -7,7 +7,7 @@ #include "TerminalTab.h" #include "AppKeyBindings.h" -#include +#include #include "AppCommandlineArgs.h" @@ -183,13 +183,13 @@ namespace winrt::TerminalApp::implementation winrt::Windows::Foundation::IAsyncAction _RemoveTab(winrt::TerminalApp::TabBase tab); winrt::fire_and_forget _RemoveTabs(const std::vector tabs); - void _RegisterTerminalEvents(Microsoft::Terminal::TerminalControl::TermControl term, TerminalTab& hostingTab); + void _RegisterTerminalEvents(Microsoft::Terminal::Control::TermControl term, TerminalTab& hostingTab); void _SelectNextTab(const bool bMoveRight); bool _SelectTab(const uint32_t tabIndex); void _MoveFocus(const Microsoft::Terminal::Settings::Model::FocusDirection& direction); - winrt::Microsoft::Terminal::TerminalControl::TermControl _GetActiveControl(); + winrt::Microsoft::Terminal::Control::TermControl _GetActiveControl(); std::optional _GetFocusedTabIndex() const noexcept; TerminalApp::TabBase _GetFocusedTab() const noexcept; winrt::com_ptr _GetFocusedTabImpl() const noexcept; @@ -212,23 +212,23 @@ namespace winrt::TerminalApp::implementation void _ScrollPage(ScrollDirection scrollDirection); void _ScrollToBufferEdge(ScrollDirection scrollDirection); - void _SetAcceleratorForMenuItem(Windows::UI::Xaml::Controls::MenuFlyoutItem& menuItem, const winrt::Microsoft::Terminal::TerminalControl::KeyChord& keyChord); + void _SetAcceleratorForMenuItem(Windows::UI::Xaml::Controls::MenuFlyoutItem& menuItem, const winrt::Microsoft::Terminal::Control::KeyChord& keyChord); - winrt::fire_and_forget _CopyToClipboardHandler(const IInspectable sender, const winrt::Microsoft::Terminal::TerminalControl::CopyToClipboardEventArgs copiedData); + winrt::fire_and_forget _CopyToClipboardHandler(const IInspectable sender, const winrt::Microsoft::Terminal::Control::CopyToClipboardEventArgs copiedData); winrt::fire_and_forget _PasteFromClipboardHandler(const IInspectable sender, - const Microsoft::Terminal::TerminalControl::PasteFromClipboardEventArgs eventArgs); + const Microsoft::Terminal::Control::PasteFromClipboardEventArgs eventArgs); - void _OpenHyperlinkHandler(const IInspectable sender, const Microsoft::Terminal::TerminalControl::OpenHyperlinkEventArgs eventArgs); + void _OpenHyperlinkHandler(const IInspectable sender, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs); bool _IsUriSupported(const winrt::Windows::Foundation::Uri& parsedUri); void _ShowCouldNotOpenDialog(winrt::hstring reason, winrt::hstring uri); - bool _CopyText(const bool singleLine, const Windows::Foundation::IReference& formats); + bool _CopyText(const bool singleLine, const Windows::Foundation::IReference& formats); void _SetTaskbarProgressHandler(const IInspectable sender, const IInspectable eventArgs); void _PasteText(); - void _ControlNoticeRaisedHandler(const IInspectable sender, const Microsoft::Terminal::TerminalControl::NoticeEventArgs eventArgs); + void _ControlNoticeRaisedHandler(const IInspectable sender, const Microsoft::Terminal::Control::NoticeEventArgs eventArgs); void _ShowControlNoticeDialog(const winrt::hstring& title, const winrt::hstring& message); fire_and_forget _LaunchSettings(const Microsoft::Terminal::Settings::Model::SettingsTarget target); @@ -247,8 +247,8 @@ namespace winrt::TerminalApp::implementation void _Find(); - winrt::Microsoft::Terminal::TerminalControl::TermControl _InitControl(const winrt::Microsoft::Terminal::Settings::Model::TerminalSettings& settings, - const winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection& connection); + winrt::Microsoft::Terminal::Control::TermControl _InitControl(const winrt::Microsoft::Terminal::Settings::Model::TerminalSettings& settings, + const winrt::Microsoft::Terminal::TerminalConnection::ITerminalConnection& connection); winrt::fire_and_forget _RefreshUIForSettingsReload(); diff --git a/src/cascadia/TerminalApp/TerminalTab.cpp b/src/cascadia/TerminalApp/TerminalTab.cpp index ad7d3ee61b..95f3399750 100644 --- a/src/cascadia/TerminalApp/TerminalTab.cpp +++ b/src/cascadia/TerminalApp/TerminalTab.cpp @@ -13,7 +13,7 @@ using namespace winrt; using namespace winrt::Windows::UI::Xaml; using namespace winrt::Windows::UI::Core; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; using namespace winrt::Microsoft::Terminal::Settings::Model; using namespace winrt::Windows::System; @@ -622,7 +622,7 @@ namespace winrt::TerminalApp::implementation { if (tab->_focusState != FocusState::Unfocused) { - if (const auto termControl{ sender.try_as() }) + if (const auto termControl{ sender.try_as() }) { termControl.Focus(FocusState::Pointer); } diff --git a/src/cascadia/TerminalApp/TerminalTab.h b/src/cascadia/TerminalApp/TerminalTab.h index 5185e87049..e349bf36ad 100644 --- a/src/cascadia/TerminalApp/TerminalTab.h +++ b/src/cascadia/TerminalApp/TerminalTab.h @@ -21,12 +21,12 @@ namespace winrt::TerminalApp::implementation struct TerminalTab : TerminalTabT { public: - TerminalTab(const GUID& profile, const winrt::Microsoft::Terminal::TerminalControl::TermControl& control); + TerminalTab(const GUID& profile, const winrt::Microsoft::Terminal::Control::TermControl& control); // Called after construction to perform the necessary setup, which relies on weak_ptr - void Initialize(const winrt::Microsoft::Terminal::TerminalControl::TermControl& control); + void Initialize(const winrt::Microsoft::Terminal::Control::TermControl& control); - winrt::Microsoft::Terminal::TerminalControl::TermControl GetActiveTerminalControl() const; + winrt::Microsoft::Terminal::Control::TermControl GetActiveTerminalControl() const; std::optional GetFocusedProfile() const noexcept; void Focus(winrt::Windows::UI::Xaml::FocusState focusState) override; @@ -36,7 +36,7 @@ namespace winrt::TerminalApp::implementation void SplitPane(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType, const float splitSize, const GUID& profile, - winrt::Microsoft::Terminal::TerminalControl::TermControl& control); + winrt::Microsoft::Terminal::Control::TermControl& control); winrt::fire_and_forget UpdateIcon(const winrt::hstring iconPath); winrt::fire_and_forget HideIcon(const bool hide); @@ -129,9 +129,9 @@ namespace winrt::TerminalApp::implementation void _RefreshVisualState(); - void _BindEventHandlers(const winrt::Microsoft::Terminal::TerminalControl::TermControl& control) noexcept; + void _BindEventHandlers(const winrt::Microsoft::Terminal::Control::TermControl& control) noexcept; - void _AttachEventHandlersToControl(const winrt::Microsoft::Terminal::TerminalControl::TermControl& control); + void _AttachEventHandlersToControl(const winrt::Microsoft::Terminal::Control::TermControl& control); void _AttachEventHandlersToPane(std::shared_ptr pane); void _UpdateActivePane(std::shared_ptr pane); diff --git a/src/cascadia/TerminalApp/dll/TerminalApp.vcxproj b/src/cascadia/TerminalApp/dll/TerminalApp.vcxproj index 05d0b9a19c..1aa555c17c 100644 --- a/src/cascadia/TerminalApp/dll/TerminalApp.vcxproj +++ b/src/cascadia/TerminalApp/dll/TerminalApp.vcxproj @@ -63,7 +63,7 @@ somehow. So make sure to only include top-level dependencies here (don't include Settings and Connection, since Control will include them for us) --> - + + + $(OpenConsoleCommonOutDir)TerminalCore\Microsoft.Terminal.Core.winmd + true + false + false + + + + diff --git a/src/cascadia/TerminalApp/pch.h b/src/cascadia/TerminalApp/pch.h index ccebea3541..5e23b3df6c 100644 --- a/src/cascadia/TerminalApp/pch.h +++ b/src/cascadia/TerminalApp/pch.h @@ -69,7 +69,8 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider); #include #include -#include +#include +#include #include #include #include diff --git a/src/cascadia/TerminalControl/IControlSettings.idl b/src/cascadia/TerminalControl/IControlSettings.idl index 0c80d68b1e..e906328045 100644 --- a/src/cascadia/TerminalControl/IControlSettings.idl +++ b/src/cascadia/TerminalControl/IControlSettings.idl @@ -3,7 +3,7 @@ import "IKeyBindings.idl"; -namespace Microsoft.Terminal.TerminalControl +namespace Microsoft.Terminal.Control { enum ScrollbarState { @@ -23,7 +23,7 @@ namespace Microsoft.Terminal.TerminalControl // TermControl's behavior. In these settings there is both the entirety // of the Core ITerminalSettings interface, and any additional settings // for specifically the control. - interface IControlSettings requires ICoreSettings + interface IControlSettings requires Microsoft.Terminal.Core.ICoreSettings { String ProfileName; @@ -36,7 +36,7 @@ namespace Microsoft.Terminal.TerminalControl Windows.UI.Text.FontWeight FontWeight; String Padding; - Microsoft.Terminal.TerminalControl.IKeyBindings KeyBindings; + Microsoft.Terminal.Control.IKeyBindings KeyBindings; Boolean CopyOnSelect; Boolean FocusFollowMouse; diff --git a/src/cascadia/TerminalControl/IKeyBindings.idl b/src/cascadia/TerminalControl/IKeyBindings.idl index 6d3992c5d0..2b39015594 100644 --- a/src/cascadia/TerminalControl/IKeyBindings.idl +++ b/src/cascadia/TerminalControl/IKeyBindings.idl @@ -3,7 +3,7 @@ import "KeyChord.idl"; -namespace Microsoft.Terminal.TerminalControl +namespace Microsoft.Terminal.Control { // [default_interface] interface IKeyBindings diff --git a/src/cascadia/TerminalControl/IMouseWheelListener.idl b/src/cascadia/TerminalControl/IMouseWheelListener.idl index 8ba8284b5d..16e7059b17 100644 --- a/src/cascadia/TerminalControl/IMouseWheelListener.idl +++ b/src/cascadia/TerminalControl/IMouseWheelListener.idl @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.Terminal.TerminalControl +namespace Microsoft.Terminal.Control { // This interface is a hack for GH#979. Controls should implement this diff --git a/src/cascadia/TerminalControl/KeyChord.cpp b/src/cascadia/TerminalControl/KeyChord.cpp index c265b06131..4c068890e3 100644 --- a/src/cascadia/TerminalControl/KeyChord.cpp +++ b/src/cascadia/TerminalControl/KeyChord.cpp @@ -6,7 +6,7 @@ #include "KeyChord.g.cpp" -namespace winrt::Microsoft::Terminal::TerminalControl::implementation +namespace winrt::Microsoft::Terminal::Control::implementation { KeyChord::KeyChord() noexcept : _modifiers{ 0 }, @@ -15,25 +15,25 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation } KeyChord::KeyChord(bool ctrl, bool alt, bool shift, int32_t vkey) noexcept : - _modifiers{ (ctrl ? TerminalControl::KeyModifiers::Ctrl : TerminalControl::KeyModifiers::None) | - (alt ? TerminalControl::KeyModifiers::Alt : TerminalControl::KeyModifiers::None) | - (shift ? TerminalControl::KeyModifiers::Shift : TerminalControl::KeyModifiers::None) }, + _modifiers{ (ctrl ? Control::KeyModifiers::Ctrl : Control::KeyModifiers::None) | + (alt ? Control::KeyModifiers::Alt : Control::KeyModifiers::None) | + (shift ? Control::KeyModifiers::Shift : Control::KeyModifiers::None) }, _vkey{ vkey } { } - KeyChord::KeyChord(TerminalControl::KeyModifiers const& modifiers, int32_t vkey) noexcept : + KeyChord::KeyChord(Control::KeyModifiers const& modifiers, int32_t vkey) noexcept : _modifiers{ modifiers }, _vkey{ vkey } { } - TerminalControl::KeyModifiers KeyChord::Modifiers() noexcept + Control::KeyModifiers KeyChord::Modifiers() noexcept { return _modifiers; } - void KeyChord::Modifiers(TerminalControl::KeyModifiers const& value) noexcept + void KeyChord::Modifiers(Control::KeyModifiers const& value) noexcept { _modifiers = value; } diff --git a/src/cascadia/TerminalControl/KeyChord.h b/src/cascadia/TerminalControl/KeyChord.h index 910eb6ca15..9324a81132 100644 --- a/src/cascadia/TerminalControl/KeyChord.h +++ b/src/cascadia/TerminalControl/KeyChord.h @@ -5,26 +5,26 @@ #include "KeyChord.g.h" -namespace winrt::Microsoft::Terminal::TerminalControl::implementation +namespace winrt::Microsoft::Terminal::Control::implementation { struct KeyChord : KeyChordT { KeyChord() noexcept; - KeyChord(TerminalControl::KeyModifiers const& modifiers, int32_t vkey) noexcept; + KeyChord(Control::KeyModifiers const& modifiers, int32_t vkey) noexcept; KeyChord(bool ctrl, bool alt, bool shift, int32_t vkey) noexcept; - TerminalControl::KeyModifiers Modifiers() noexcept; - void Modifiers(TerminalControl::KeyModifiers const& value) noexcept; + Control::KeyModifiers Modifiers() noexcept; + void Modifiers(Control::KeyModifiers const& value) noexcept; int32_t Vkey() noexcept; void Vkey(int32_t value) noexcept; private: - TerminalControl::KeyModifiers _modifiers; + Control::KeyModifiers _modifiers; int32_t _vkey; }; } -namespace winrt::Microsoft::Terminal::TerminalControl::factory_implementation +namespace winrt::Microsoft::Terminal::Control::factory_implementation { struct KeyChord : KeyChordT { diff --git a/src/cascadia/TerminalControl/KeyChord.idl b/src/cascadia/TerminalControl/KeyChord.idl index 4952688a60..65107d8d9d 100644 --- a/src/cascadia/TerminalControl/KeyChord.idl +++ b/src/cascadia/TerminalControl/KeyChord.idl @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.Terminal.TerminalControl +namespace Microsoft.Terminal.Control { [flags] enum KeyModifiers diff --git a/src/cascadia/TerminalControl/SearchBoxControl.cpp b/src/cascadia/TerminalControl/SearchBoxControl.cpp index 57026c4032..4de008da47 100644 --- a/src/cascadia/TerminalControl/SearchBoxControl.cpp +++ b/src/cascadia/TerminalControl/SearchBoxControl.cpp @@ -9,7 +9,7 @@ using namespace winrt; using namespace winrt::Windows::UI::Xaml; using namespace winrt::Windows::UI::Core; -namespace winrt::Microsoft::Terminal::TerminalControl::implementation +namespace winrt::Microsoft::Terminal::Control::implementation { // Constructor SearchBoxControl::SearchBoxControl() diff --git a/src/cascadia/TerminalControl/SearchBoxControl.h b/src/cascadia/TerminalControl/SearchBoxControl.h index cdf4ee6383..429e6fea52 100644 --- a/src/cascadia/TerminalControl/SearchBoxControl.h +++ b/src/cascadia/TerminalControl/SearchBoxControl.h @@ -20,7 +20,7 @@ Author(s): #include "SearchBoxControl.g.h" -namespace winrt::Microsoft::Terminal::TerminalControl::implementation +namespace winrt::Microsoft::Terminal::Control::implementation { struct SearchBoxControl : SearchBoxControlT { @@ -37,7 +37,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation void CloseClick(winrt::Windows::Foundation::IInspectable const& /*sender*/, winrt::Windows::UI::Xaml::RoutedEventArgs const& e); WINRT_CALLBACK(Search, SearchHandler); - TYPED_EVENT(Closed, TerminalControl::SearchBoxControl, Windows::UI::Xaml::RoutedEventArgs); + TYPED_EVENT(Closed, Control::SearchBoxControl, Windows::UI::Xaml::RoutedEventArgs); private: std::unordered_set _focusableElements; @@ -49,7 +49,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation }; } -namespace winrt::Microsoft::Terminal::TerminalControl::factory_implementation +namespace winrt::Microsoft::Terminal::Control::factory_implementation { struct SearchBoxControl : SearchBoxControlT { diff --git a/src/cascadia/TerminalControl/SearchBoxControl.idl b/src/cascadia/TerminalControl/SearchBoxControl.idl index 78011841c2..a6bd0a486d 100644 --- a/src/cascadia/TerminalControl/SearchBoxControl.idl +++ b/src/cascadia/TerminalControl/SearchBoxControl.idl @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.Terminal.TerminalControl +namespace Microsoft.Terminal.Control { delegate void SearchHandler(String query, Boolean goForward, Boolean isCaseSensitive); diff --git a/src/cascadia/TerminalControl/SearchBoxControl.xaml b/src/cascadia/TerminalControl/SearchBoxControl.xaml index f64ae36ff6..d14ce193ba 100644 --- a/src/cascadia/TerminalControl/SearchBoxControl.xaml +++ b/src/cascadia/TerminalControl/SearchBoxControl.xaml @@ -1,9 +1,9 @@  - + diff --git a/src/cascadia/TerminalControl/TSFInputControl.cpp b/src/cascadia/TerminalControl/TSFInputControl.cpp index 23bd9bcbec..154ccbb7b4 100644 --- a/src/cascadia/TerminalControl/TSFInputControl.cpp +++ b/src/cascadia/TerminalControl/TSFInputControl.cpp @@ -14,7 +14,7 @@ using namespace winrt::Windows::UI::Text; using namespace winrt::Windows::UI::Text::Core; using namespace winrt::Windows::UI::Xaml; -namespace winrt::Microsoft::Terminal::TerminalControl::implementation +namespace winrt::Microsoft::Terminal::Control::implementation { TSFInputControl::TSFInputControl() : _editContext{ nullptr }, @@ -469,5 +469,5 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation { } - DEFINE_EVENT(TSFInputControl, CompositionCompleted, _compositionCompletedHandlers, TerminalControl::CompositionCompletedEventArgs); + DEFINE_EVENT(TSFInputControl, CompositionCompleted, _compositionCompletedHandlers, Control::CompositionCompletedEventArgs); } diff --git a/src/cascadia/TerminalControl/TSFInputControl.h b/src/cascadia/TerminalControl/TSFInputControl.h index 6344204a57..9e96e6a9ad 100644 --- a/src/cascadia/TerminalControl/TSFInputControl.h +++ b/src/cascadia/TerminalControl/TSFInputControl.h @@ -7,7 +7,7 @@ #include "FontInfoEventArgs.g.h" #include "cppwinrt_utils.h" -namespace winrt::Microsoft::Terminal::TerminalControl::implementation +namespace winrt::Microsoft::Terminal::Control::implementation { struct CursorPositionEventArgs : public CursorPositionEventArgsT @@ -44,9 +44,9 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation void Close(); // -------------------------------- WinRT Events --------------------------------- - TYPED_EVENT(CurrentCursorPosition, TerminalControl::TSFInputControl, TerminalControl::CursorPositionEventArgs); - TYPED_EVENT(CurrentFontInfo, TerminalControl::TSFInputControl, TerminalControl::FontInfoEventArgs); - DECLARE_EVENT(CompositionCompleted, _compositionCompletedHandlers, TerminalControl::CompositionCompletedEventArgs); + TYPED_EVENT(CurrentCursorPosition, Control::TSFInputControl, Control::CursorPositionEventArgs); + TYPED_EVENT(CurrentFontInfo, Control::TSFInputControl, Control::FontInfoEventArgs); + DECLARE_EVENT(CompositionCompleted, _compositionCompletedHandlers, Control::CompositionCompletedEventArgs); private: void _layoutRequestedHandler(winrt::Windows::UI::Text::Core::CoreTextEditContext sender, winrt::Windows::UI::Text::Core::CoreTextLayoutRequestedEventArgs const& args); @@ -87,7 +87,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation winrt::Windows::Foundation::Rect _currentWindowBounds; }; } -namespace winrt::Microsoft::Terminal::TerminalControl::factory_implementation +namespace winrt::Microsoft::Terminal::Control::factory_implementation { struct TSFInputControl : TSFInputControlT { diff --git a/src/cascadia/TerminalControl/TSFInputControl.idl b/src/cascadia/TerminalControl/TSFInputControl.idl index fda21c7ed1..6a6f6814f2 100644 --- a/src/cascadia/TerminalControl/TSFInputControl.idl +++ b/src/cascadia/TerminalControl/TSFInputControl.idl @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.Terminal.TerminalControl +namespace Microsoft.Terminal.Control { delegate void CompositionCompletedEventArgs(String text); diff --git a/src/cascadia/TerminalControl/TSFInputControl.xaml b/src/cascadia/TerminalControl/TSFInputControl.xaml index dab81c6178..2633bbd126 100644 --- a/src/cascadia/TerminalControl/TSFInputControl.xaml +++ b/src/cascadia/TerminalControl/TSFInputControl.xaml @@ -1,5 +1,5 @@ () }) + if (auto searchBox{ loadedSearchBox.try_as<::winrt::Microsoft::Terminal::Control::SearchBoxControl>() }) { // get at its private implementation _searchBox.copy_from(winrt::get_self(searchBox)); @@ -619,7 +619,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation { // create a custom automation peer with this code pattern: // (https://docs.microsoft.com/en-us/windows/uwp/design/accessibility/custom-automation-peers) - auto autoPeer = winrt::make_self(this); + auto autoPeer = winrt::make_self(this); _uiaEngine = std::make_unique<::Microsoft::Console::Render::UiaEngine>(autoPeer.get()); _renderer->AddRenderEngine(_uiaEngine.get()); @@ -3392,14 +3392,14 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation // -------------------------------- WinRT Events --------------------------------- // Winrt events need a method for adding a callback to the event and removing the callback. // These macros will define them both for you. - DEFINE_EVENT(TermControl, TitleChanged, _titleChangedHandlers, TerminalControl::TitleChangedEventArgs); - DEFINE_EVENT(TermControl, FontSizeChanged, _fontSizeChangedHandlers, TerminalControl::FontSizeChangedEventArgs); - DEFINE_EVENT(TermControl, ScrollPositionChanged, _scrollPositionChangedHandlers, TerminalControl::ScrollPositionChangedEventArgs); + DEFINE_EVENT(TermControl, TitleChanged, _titleChangedHandlers, Control::TitleChangedEventArgs); + DEFINE_EVENT(TermControl, FontSizeChanged, _fontSizeChangedHandlers, Control::FontSizeChangedEventArgs); + DEFINE_EVENT(TermControl, ScrollPositionChanged, _scrollPositionChangedHandlers, Control::ScrollPositionChangedEventArgs); - DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(TermControl, PasteFromClipboard, _clipboardPasteHandlers, TerminalControl::TermControl, TerminalControl::PasteFromClipboardEventArgs); - DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(TermControl, CopyToClipboard, _clipboardCopyHandlers, TerminalControl::TermControl, TerminalControl::CopyToClipboardEventArgs); - DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(TermControl, OpenHyperlink, _openHyperlinkHandlers, TerminalControl::TermControl, TerminalControl::OpenHyperlinkEventArgs); - DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(TermControl, SetTaskbarProgress, _setTaskbarProgressHandlers, TerminalControl::TermControl, IInspectable); - DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(TermControl, RaiseNotice, _raiseNoticeHandlers, TerminalControl::TermControl, TerminalControl::NoticeEventArgs); + DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(TermControl, PasteFromClipboard, _clipboardPasteHandlers, Control::TermControl, Control::PasteFromClipboardEventArgs); + DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(TermControl, CopyToClipboard, _clipboardCopyHandlers, Control::TermControl, Control::CopyToClipboardEventArgs); + DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(TermControl, OpenHyperlink, _openHyperlinkHandlers, Control::TermControl, Control::OpenHyperlinkEventArgs); + DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(TermControl, SetTaskbarProgress, _setTaskbarProgressHandlers, Control::TermControl, IInspectable); + DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(TermControl, RaiseNotice, _raiseNoticeHandlers, Control::TermControl, Control::NoticeEventArgs); // clang-format on } diff --git a/src/cascadia/TerminalControl/TermControl.h b/src/cascadia/TerminalControl/TermControl.h index 0cd9b463b6..2b00f44425 100644 --- a/src/cascadia/TerminalControl/TermControl.h +++ b/src/cascadia/TerminalControl/TermControl.h @@ -9,6 +9,7 @@ #include "OpenHyperlinkEventArgs.g.h" #include "NoticeEventArgs.g.h" #include +#include #include "../../renderer/base/Renderer.hpp" #include "../../renderer/dx/DxRenderer.hpp" #include "../../renderer/uia/UiaRenderer.hpp" @@ -23,7 +24,7 @@ namespace Microsoft::Console::VirtualTerminal struct MouseButtonState; } -namespace winrt::Microsoft::Terminal::TerminalControl::implementation +namespace winrt::Microsoft::Terminal::Control::implementation { struct CopyToClipboardEventArgs : public CopyToClipboardEventArgsT @@ -171,19 +172,19 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation // clang-format off // -------------------------------- WinRT Events --------------------------------- - DECLARE_EVENT(TitleChanged, _titleChangedHandlers, TerminalControl::TitleChangedEventArgs); - DECLARE_EVENT(FontSizeChanged, _fontSizeChangedHandlers, TerminalControl::FontSizeChangedEventArgs); - DECLARE_EVENT(ScrollPositionChanged, _scrollPositionChangedHandlers, TerminalControl::ScrollPositionChangedEventArgs); + DECLARE_EVENT(TitleChanged, _titleChangedHandlers, Control::TitleChangedEventArgs); + DECLARE_EVENT(FontSizeChanged, _fontSizeChangedHandlers, Control::FontSizeChangedEventArgs); + DECLARE_EVENT(ScrollPositionChanged, _scrollPositionChangedHandlers, Control::ScrollPositionChangedEventArgs); - DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(PasteFromClipboard, _clipboardPasteHandlers, TerminalControl::TermControl, TerminalControl::PasteFromClipboardEventArgs); - DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(CopyToClipboard, _clipboardCopyHandlers, TerminalControl::TermControl, TerminalControl::CopyToClipboardEventArgs); - DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(OpenHyperlink, _openHyperlinkHandlers, TerminalControl::TermControl, TerminalControl::OpenHyperlinkEventArgs); - DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(SetTaskbarProgress, _setTaskbarProgressHandlers, TerminalControl::TermControl, IInspectable); - DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(RaiseNotice, _raiseNoticeHandlers, TerminalControl::TermControl, TerminalControl::NoticeEventArgs); + DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(PasteFromClipboard, _clipboardPasteHandlers, Control::TermControl, Control::PasteFromClipboardEventArgs); + DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(CopyToClipboard, _clipboardCopyHandlers, Control::TermControl, Control::CopyToClipboardEventArgs); + DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(OpenHyperlink, _openHyperlinkHandlers, Control::TermControl, Control::OpenHyperlinkEventArgs); + DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(SetTaskbarProgress, _setTaskbarProgressHandlers, Control::TermControl, IInspectable); + DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(RaiseNotice, _raiseNoticeHandlers, Control::TermControl, Control::NoticeEventArgs); TYPED_EVENT(WarningBell, IInspectable, IInspectable); - TYPED_EVENT(ConnectionStateChanged, TerminalControl::TermControl, IInspectable); - TYPED_EVENT(Initialized, TerminalControl::TermControl, Windows::UI::Xaml::RoutedEventArgs); + TYPED_EVENT(ConnectionStateChanged, Control::TermControl, IInspectable); + TYPED_EVENT(Initialized, Control::TermControl, Windows::UI::Xaml::RoutedEventArgs); TYPED_EVENT(TabColorChanged, IInspectable, IInspectable); TYPED_EVENT(HidePointerCursor, IInspectable, IInspectable); TYPED_EVENT(RestorePointerCursor, IInspectable, IInspectable); @@ -355,7 +356,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation }; } -namespace winrt::Microsoft::Terminal::TerminalControl::factory_implementation +namespace winrt::Microsoft::Terminal::Control::factory_implementation { struct TermControl : TermControlT { diff --git a/src/cascadia/TerminalControl/TermControl.idl b/src/cascadia/TerminalControl/TermControl.idl index 4470c0555d..cfaa2d0642 100644 --- a/src/cascadia/TerminalControl/TermControl.idl +++ b/src/cascadia/TerminalControl/TermControl.idl @@ -4,7 +4,7 @@ import "IMouseWheelListener.idl"; import "IControlSettings.idl"; -namespace Microsoft.Terminal.TerminalControl +namespace Microsoft.Terminal.Control { delegate void TitleChangedEventArgs(String newTitle); delegate void FontSizeChangedEventArgs(Int32 width, Int32 height, Boolean isInitialChange); @@ -61,13 +61,13 @@ namespace Microsoft.Terminal.TerminalControl [default_interface] runtimeclass TermControl : Windows.UI.Xaml.Controls.UserControl, IDirectKeyListener, IMouseWheelListener { - TermControl(Microsoft.Terminal.TerminalControl.IControlSettings settings, Microsoft.Terminal.TerminalConnection.ITerminalConnection connection); + TermControl(Microsoft.Terminal.Control.IControlSettings settings, Microsoft.Terminal.TerminalConnection.ITerminalConnection connection); - static Windows.Foundation.Size GetProposedDimensions(Microsoft.Terminal.TerminalControl.IControlSettings settings, UInt32 dpi); + static Windows.Foundation.Size GetProposedDimensions(Microsoft.Terminal.Control.IControlSettings settings, UInt32 dpi); void UpdateSettings(); - Microsoft.Terminal.TerminalControl.IControlSettings Settings { get; }; + Microsoft.Terminal.Control.IControlSettings Settings { get; }; event TitleChangedEventArgs TitleChanged; event FontSizeChangedEventArgs FontSizeChanged; diff --git a/src/cascadia/TerminalControl/TermControl.xaml b/src/cascadia/TerminalControl/TermControl.xaml index c3d34d0f24..ac642b037f 100644 --- a/src/cascadia/TerminalControl/TermControl.xaml +++ b/src/cascadia/TerminalControl/TermControl.xaml @@ -1,11 +1,11 @@  (*owner), // pass owner to FrameworkElementAutomationPeer _termControl{ owner } { diff --git a/src/cascadia/TerminalControl/TermControlAutomationPeer.h b/src/cascadia/TerminalControl/TermControlAutomationPeer.h index 56e12e56b4..46a9007364 100644 --- a/src/cascadia/TerminalControl/TermControlAutomationPeer.h +++ b/src/cascadia/TerminalControl/TermControlAutomationPeer.h @@ -26,12 +26,12 @@ Author(s): #include "TermControl.h" #include "TermControlAutomationPeer.g.h" -#include +#include #include "../types/TermControlUiaProvider.hpp" #include "../types/IUiaEventDispatcher.h" #include "../types/IControlAccessibilityInfo.h" -namespace winrt::Microsoft::Terminal::TerminalControl::implementation +namespace winrt::Microsoft::Terminal::Control::implementation { struct TermControlAutomationPeer : public TermControlAutomationPeerT, @@ -39,7 +39,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation ::Microsoft::Console::Types::IControlAccessibilityInfo { public: - TermControlAutomationPeer(Microsoft::Terminal::TerminalControl::implementation::TermControl* owner); + TermControlAutomationPeer(Microsoft::Terminal::Control::implementation::TermControl* owner); #pragma region FrameworkElementAutomationPeer hstring GetClassNameCore() const; @@ -81,7 +81,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation private: ::Microsoft::WRL::ComPtr<::Microsoft::Terminal::TermControlUiaProvider> _uiaProvider; - winrt::Microsoft::Terminal::TerminalControl::implementation::TermControl* _termControl; + winrt::Microsoft::Terminal::Control::implementation::TermControl* _termControl; winrt::com_array WrapArrayOfTextRangeProviders(SAFEARRAY* textRanges); }; } diff --git a/src/cascadia/TerminalControl/TermControlAutomationPeer.idl b/src/cascadia/TerminalControl/TermControlAutomationPeer.idl index 18ada03e7b..0d777b09a5 100644 --- a/src/cascadia/TerminalControl/TermControlAutomationPeer.idl +++ b/src/cascadia/TerminalControl/TermControlAutomationPeer.idl @@ -3,7 +3,7 @@ import "TermControl.idl"; -namespace Microsoft.Terminal.TerminalControl +namespace Microsoft.Terminal.Control { [default_interface] runtimeclass TermControlAutomationPeer : Windows.UI.Xaml.Automation.Peers.FrameworkElementAutomationPeer, diff --git a/src/cascadia/TerminalControl/TerminalControl.vcxproj.filters b/src/cascadia/TerminalControl/TerminalControl.vcxproj.filters deleted file mode 100644 index d9eaaf778d..0000000000 --- a/src/cascadia/TerminalControl/TerminalControl.vcxproj.filters +++ /dev/null @@ -1,54 +0,0 @@ - - - - - accd3aa8-1ba0-4223-9bbe-0c431709210b - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms - - - {926ab91d-31b4-48c3-b9a4-e681349f27f0} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Resources - - - \ No newline at end of file diff --git a/src/cascadia/TerminalControl/TerminalControl.vcxproj b/src/cascadia/TerminalControl/TerminalControlLib.vcxproj similarity index 64% rename from src/cascadia/TerminalControl/TerminalControl.vcxproj rename to src/cascadia/TerminalControl/TerminalControlLib.vcxproj index 4d07df1f53..a665378e52 100644 --- a/src/cascadia/TerminalControl/TerminalControl.vcxproj +++ b/src/cascadia/TerminalControl/TerminalControlLib.vcxproj @@ -2,17 +2,17 @@ {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} - TerminalControl - Microsoft.Terminal.TerminalControl - - - DynamicLibrary + Win32Proj + Microsoft.Terminal.Control.Lib + Microsoft.Terminal.Control + Microsoft.Terminal.ControlLib + StaticLibrary Console - true + 3 nested + + + @@ -43,6 +46,7 @@ + Create @@ -67,6 +71,7 @@ + @@ -83,13 +88,23 @@ TSFInputControl.xaml + - - + + Designer + + + Designer + + + Designer + + + @@ -110,61 +125,18 @@ false - - - Designer - - - Designer - - - Designer - - - + - - dwrite.lib;dxgi.lib;d2d1.lib;d3d11.lib;shcore.lib;winmm.lib;pathcch.lib;propsys.lib;uiautomationcore.lib;Shlwapi.lib;ntdll.lib;user32.lib;kernel32.lib;%(AdditionalDependencies) - + pch.h $(OpenConsoleDir)src\cascadia\inc;$(OpenConsoleDir)src\types\inc;%(AdditionalIncludeDirectories) + + false + - + + - - - $(MarkupCompilePass1DependsOn);OpenConsoleStripDuplicateWinmdFromReferencesBeforePass1 - $(MarkupCompilePass2DependsOn);OpenConsoleStripDuplicateWinmdFromReferencesBeforePass2 - - - - - - - - - - - - - - - - - - - - + diff --git a/src/cascadia/TerminalControl/XamlUiaTextRange.cpp b/src/cascadia/TerminalControl/XamlUiaTextRange.cpp index 8490177f9a..7fb8d3b3d7 100644 --- a/src/cascadia/TerminalControl/XamlUiaTextRange.cpp +++ b/src/cascadia/TerminalControl/XamlUiaTextRange.cpp @@ -27,7 +27,7 @@ namespace XamlAutomation using winrt::Windows::UI::Xaml::Automation::Text::TextUnit; } -namespace winrt::Microsoft::Terminal::TerminalControl::implementation +namespace winrt::Microsoft::Terminal::Control::implementation { XamlAutomation::ITextRangeProvider XamlUiaTextRange::Clone() const { diff --git a/src/cascadia/TerminalControl/XamlUiaTextRange.h b/src/cascadia/TerminalControl/XamlUiaTextRange.h index e2eb5af9e7..99242c59bc 100644 --- a/src/cascadia/TerminalControl/XamlUiaTextRange.h +++ b/src/cascadia/TerminalControl/XamlUiaTextRange.h @@ -24,7 +24,7 @@ Author(s): #include #include "../types/TermControlUiaTextRange.hpp" -namespace winrt::Microsoft::Terminal::TerminalControl::implementation +namespace winrt::Microsoft::Terminal::Control::implementation { class XamlUiaTextRange : public winrt::implements diff --git a/src/cascadia/TerminalControl/TerminalControl.def b/src/cascadia/TerminalControl/dll/TerminalControl.def similarity index 100% rename from src/cascadia/TerminalControl/TerminalControl.def rename to src/cascadia/TerminalControl/dll/TerminalControl.def diff --git a/src/cascadia/TerminalControl/dll/TerminalControl.vcxproj b/src/cascadia/TerminalControl/dll/TerminalControl.vcxproj new file mode 100644 index 0000000000..7ac145ce41 --- /dev/null +++ b/src/cascadia/TerminalControl/dll/TerminalControl.vcxproj @@ -0,0 +1,97 @@ + + + + {CA5CAD1A-F542-4635-A069-7CAEFB930070} + Microsoft.Terminal.Control + Microsoft.Terminal.Control + + + DynamicLibrary + Console + + true + + + 3 + + + + + + + + + + + + + + + + + Create + + + + + + + + + + + + + + + + true + true + + + + + + + $(OpenConsoleCommonOutDir)TerminalCore\Microsoft.Terminal.Core.winmd + true + false + false + + + + $(OpenConsoleCommonOutDir)TerminalConnection\Microsoft.Terminal.TerminalConnection.winmd + true + false + false + + + + + + dwrite.lib;dxgi.lib;d2d1.lib;d3d11.lib;shcore.lib;winmm.lib;pathcch.lib;propsys.lib;uiautomationcore.lib;Shlwapi.lib;ntdll.lib;user32.lib;kernel32.lib;%(AdditionalDependencies) + + /INCLUDE:_DllMain@12 + /INCLUDE:DllMain + + + + false + + + + + diff --git a/src/cascadia/TerminalControl/dll/pch.cpp b/src/cascadia/TerminalControl/dll/pch.cpp new file mode 100644 index 0000000000..3c27d44d57 --- /dev/null +++ b/src/cascadia/TerminalControl/dll/pch.cpp @@ -0,0 +1,4 @@ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT license. + +#include "pch.h" diff --git a/src/cascadia/TerminalControl/dll/pch.h b/src/cascadia/TerminalControl/dll/pch.h new file mode 100644 index 0000000000..b90061aecb --- /dev/null +++ b/src/cascadia/TerminalControl/dll/pch.h @@ -0,0 +1,8 @@ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT license. +// +// pch.h +// Header for platform projection include files +// + +#pragma once diff --git a/src/cascadia/TerminalControl/init.cpp b/src/cascadia/TerminalControl/init.cpp index 4ff87caba5..4c95c5a0b7 100644 --- a/src/cascadia/TerminalControl/init.cpp +++ b/src/cascadia/TerminalControl/init.cpp @@ -33,4 +33,4 @@ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD reason, LPVOID /*reserved*/) return TRUE; } -UTILS_DEFINE_LIBRARY_RESOURCE_SCOPE(L"Microsoft.Terminal.TerminalControl/Resources"); +UTILS_DEFINE_LIBRARY_RESOURCE_SCOPE(L"Microsoft.Terminal.Control/Resources"); diff --git a/src/cascadia/TerminalCore/ICoreSettings.idl b/src/cascadia/TerminalCore/ICoreSettings.idl index ebba05f486..b3caf8c917 100644 --- a/src/cascadia/TerminalCore/ICoreSettings.idl +++ b/src/cascadia/TerminalCore/ICoreSettings.idl @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.Terminal.TerminalControl +namespace Microsoft.Terminal.Core { enum CursorStyle { diff --git a/src/cascadia/TerminalCore/Terminal.cpp b/src/cascadia/TerminalCore/Terminal.cpp index 942def662c..3d0a0b8109 100644 --- a/src/cascadia/TerminalCore/Terminal.cpp +++ b/src/cascadia/TerminalCore/Terminal.cpp @@ -11,9 +11,9 @@ #include "../../types/inc/utils.hpp" #include "../../types/inc/colorTable.hpp" -#include +#include -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Core; using namespace Microsoft::Terminal::Core; using namespace Microsoft::Console; using namespace Microsoft::Console::Render; diff --git a/src/cascadia/TerminalCore/Terminal.hpp b/src/cascadia/TerminalCore/Terminal.hpp index fac17b2297..732e545e55 100644 --- a/src/cascadia/TerminalCore/Terminal.hpp +++ b/src/cascadia/TerminalCore/Terminal.hpp @@ -20,7 +20,7 @@ // You have to forward decl the ICoreSettings here, instead of including the header. // If you include the header, there will be compilation errors with other // headers that include Terminal.hpp -namespace winrt::Microsoft::Terminal::TerminalControl +namespace winrt::Microsoft::Terminal::Core { struct ICoreSettings; } @@ -59,10 +59,10 @@ public: SHORT scrollbackLines, Microsoft::Console::Render::IRenderTarget& renderTarget); - void CreateFromSettings(winrt::Microsoft::Terminal::TerminalControl::ICoreSettings settings, + void CreateFromSettings(winrt::Microsoft::Terminal::Core::ICoreSettings settings, Microsoft::Console::Render::IRenderTarget& renderTarget); - void UpdateSettings(winrt::Microsoft::Terminal::TerminalControl::ICoreSettings settings); + void UpdateSettings(winrt::Microsoft::Terminal::Core::ICoreSettings settings); // Write goes through the parser void Write(std::wstring_view stringView); diff --git a/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj b/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj index 44bb357f6b..33520d4c74 100644 --- a/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj +++ b/src/cascadia/TerminalCore/lib/terminalcore-lib.vcxproj @@ -7,7 +7,7 @@ TerminalCore StaticLibrary 10.0.17763.0 - Microsoft.Terminal.TerminalControl + Microsoft.Terminal.Core true diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.cpp b/src/cascadia/TerminalSettingsEditor/Interaction.cpp index ef0f910606..a37efd6f64 100644 --- a/src/cascadia/TerminalSettingsEditor/Interaction.cpp +++ b/src/cascadia/TerminalSettingsEditor/Interaction.cpp @@ -17,7 +17,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation InitializeComponent(); INITIALIZE_BINDABLE_ENUM_SETTING(TabSwitcherMode, TabSwitcherMode, TabSwitcherMode, L"Globals_TabSwitcherMode", L"Content"); - INITIALIZE_BINDABLE_ENUM_SETTING(CopyFormat, CopyFormat, winrt::Microsoft::Terminal::TerminalControl::CopyFormat, L"Globals_CopyFormat", L"Content"); + INITIALIZE_BINDABLE_ENUM_SETTING(CopyFormat, CopyFormat, winrt::Microsoft::Terminal::Control::CopyFormat, L"Globals_CopyFormat", L"Content"); } void Interaction::OnNavigatedTo(const NavigationEventArgs& e) diff --git a/src/cascadia/TerminalSettingsEditor/Interaction.h b/src/cascadia/TerminalSettingsEditor/Interaction.h index 0c6d965b7f..ac93655de2 100644 --- a/src/cascadia/TerminalSettingsEditor/Interaction.h +++ b/src/cascadia/TerminalSettingsEditor/Interaction.h @@ -27,7 +27,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation WINRT_PROPERTY(Editor::InteractionPageNavigationState, State, nullptr); GETSET_BINDABLE_ENUM_SETTING(TabSwitcherMode, Model::TabSwitcherMode, State().Globals, TabSwitcherMode); - GETSET_BINDABLE_ENUM_SETTING(CopyFormat, winrt::Microsoft::Terminal::TerminalControl::CopyFormat, State().Globals, CopyFormatting); + GETSET_BINDABLE_ENUM_SETTING(CopyFormat, winrt::Microsoft::Terminal::Control::CopyFormat, State().Globals, CopyFormatting); }; } diff --git a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj index b8c6b360e1..98acfdb106 100644 --- a/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj +++ b/src/cascadia/TerminalSettingsEditor/Microsoft.Terminal.Settings.Editor.vcxproj @@ -22,7 +22,7 @@ true - - $(OpenConsoleCommonOutDir)TerminalControl\Microsoft.Terminal.TerminalControl.winmd + + $(OpenConsoleCommonOutDir)Microsoft.Terminal.Control\Microsoft.Terminal.Control.winmd + true + false + false + + + $(OpenConsoleCommonOutDir)TerminalCore\Microsoft.Terminal.Core.winmd true false false diff --git a/src/cascadia/TerminalSettingsEditor/Profiles.cpp b/src/cascadia/TerminalSettingsEditor/Profiles.cpp index 9794761fc5..a28d580c4a 100644 --- a/src/cascadia/TerminalSettingsEditor/Profiles.cpp +++ b/src/cascadia/TerminalSettingsEditor/Profiles.cpp @@ -377,12 +377,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation { InitializeComponent(); - INITIALIZE_BINDABLE_ENUM_SETTING(CursorShape, CursorStyle, winrt::Microsoft::Terminal::TerminalControl::CursorStyle, L"Profile_CursorShape", L"Content"); + INITIALIZE_BINDABLE_ENUM_SETTING(CursorShape, CursorStyle, winrt::Microsoft::Terminal::Core::CursorStyle, L"Profile_CursorShape", L"Content"); INITIALIZE_BINDABLE_ENUM_SETTING_REVERSE_ORDER(BackgroundImageStretchMode, BackgroundImageStretchMode, winrt::Windows::UI::Xaml::Media::Stretch, L"Profile_BackgroundImageStretchMode", L"Content"); - INITIALIZE_BINDABLE_ENUM_SETTING(AntiAliasingMode, TextAntialiasingMode, winrt::Microsoft::Terminal::TerminalControl::TextAntialiasingMode, L"Profile_AntialiasingMode", L"Content"); + INITIALIZE_BINDABLE_ENUM_SETTING(AntiAliasingMode, TextAntialiasingMode, winrt::Microsoft::Terminal::Control::TextAntialiasingMode, L"Profile_AntialiasingMode", L"Content"); INITIALIZE_BINDABLE_ENUM_SETTING_REVERSE_ORDER(CloseOnExitMode, CloseOnExitMode, winrt::Microsoft::Terminal::Settings::Model::CloseOnExitMode, L"Profile_CloseOnExit", L"Content"); INITIALIZE_BINDABLE_ENUM_SETTING_REVERSE_ORDER(BellStyle, BellStyle, winrt::Microsoft::Terminal::Settings::Model::BellStyle, L"Profile_BellStyle", L"Content"); - INITIALIZE_BINDABLE_ENUM_SETTING(ScrollState, ScrollbarState, winrt::Microsoft::Terminal::TerminalControl::ScrollbarState, L"Profile_ScrollbarVisibility", L"Content"); + INITIALIZE_BINDABLE_ENUM_SETTING(ScrollState, ScrollbarState, winrt::Microsoft::Terminal::Control::ScrollbarState, L"Profile_ScrollbarVisibility", L"Content"); // manually add Custom FontWeight option. Don't add it to the Map INITIALIZE_BINDABLE_ENUM_SETTING(FontWeight, FontWeight, uint16_t, L"Profile_FontWeight", L"Content"); @@ -716,7 +716,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation bool Profiles::IsVintageCursor() const { - return _State.Profile().CursorShape() == TerminalControl::CursorStyle::Vintage; + return _State.Profile().CursorShape() == Core::CursorStyle::Vintage; } void Profiles::Pivot_SelectionChanged(Windows::Foundation::IInspectable const& /*sender*/, diff --git a/src/cascadia/TerminalSettingsEditor/Profiles.h b/src/cascadia/TerminalSettingsEditor/Profiles.h index b3b7d3d1cb..4973a1911c 100644 --- a/src/cascadia/TerminalSettingsEditor/Profiles.h +++ b/src/cascadia/TerminalSettingsEditor/Profiles.h @@ -191,12 +191,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation WINRT_PROPERTY(Editor::ProfilePageNavigationState, State, nullptr); WINRT_PROPERTY(Windows::Foundation::Collections::IObservableVector, ColorSchemeList, nullptr); - GETSET_BINDABLE_ENUM_SETTING(CursorShape, Microsoft::Terminal::TerminalControl::CursorStyle, State().Profile, CursorShape); + GETSET_BINDABLE_ENUM_SETTING(CursorShape, Microsoft::Terminal::Core::CursorStyle, State().Profile, CursorShape); GETSET_BINDABLE_ENUM_SETTING(BackgroundImageStretchMode, Windows::UI::Xaml::Media::Stretch, State().Profile, BackgroundImageStretchMode); - GETSET_BINDABLE_ENUM_SETTING(AntiAliasingMode, Microsoft::Terminal::TerminalControl::TextAntialiasingMode, State().Profile, AntialiasingMode); + GETSET_BINDABLE_ENUM_SETTING(AntiAliasingMode, Microsoft::Terminal::Control::TextAntialiasingMode, State().Profile, AntialiasingMode); GETSET_BINDABLE_ENUM_SETTING(CloseOnExitMode, Microsoft::Terminal::Settings::Model::CloseOnExitMode, State().Profile, CloseOnExit); GETSET_BINDABLE_ENUM_SETTING(BellStyle, Microsoft::Terminal::Settings::Model::BellStyle, State().Profile, BellStyle); - GETSET_BINDABLE_ENUM_SETTING(ScrollState, Microsoft::Terminal::TerminalControl::ScrollbarState, State().Profile, ScrollState); + GETSET_BINDABLE_ENUM_SETTING(ScrollState, Microsoft::Terminal::Control::ScrollbarState, State().Profile, ScrollState); private: void _UpdateBIAlignmentControl(const int32_t val); diff --git a/src/cascadia/TerminalSettingsEditor/Profiles.idl b/src/cascadia/TerminalSettingsEditor/Profiles.idl index 0ad48b04d1..a3c94ef2f1 100644 --- a/src/cascadia/TerminalSettingsEditor/Profiles.idl +++ b/src/cascadia/TerminalSettingsEditor/Profiles.idl @@ -44,7 +44,7 @@ namespace Microsoft.Terminal.Settings.Editor OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, SuppressApplicationTitle); OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, UseAcrylic); OBSERVABLE_PROJECTED_PROFILE_SETTING(Double, AcrylicOpacity); - OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.TerminalControl.ScrollbarState, ScrollState); + OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Control.ScrollbarState, ScrollState); OBSERVABLE_PROJECTED_PROFILE_SETTING(String, FontFace); OBSERVABLE_PROJECTED_PROFILE_SETTING(Int32, FontSize); OBSERVABLE_PROJECTED_PROFILE_SETTING(Windows.UI.Text.FontWeight, FontWeight); @@ -55,7 +55,7 @@ namespace Microsoft.Terminal.Settings.Editor OBSERVABLE_PROJECTED_PROFILE_SETTING(Double, BackgroundImageOpacity); OBSERVABLE_PROJECTED_PROFILE_SETTING(Windows.UI.Xaml.Media.Stretch, BackgroundImageStretchMode); OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Settings.Model.ConvergedAlignment, BackgroundImageAlignment); - OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.TerminalControl.TextAntialiasingMode, AntialiasingMode); + OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Control.TextAntialiasingMode, AntialiasingMode); OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, RetroTerminalEffect); OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, ForceFullRepaintRendering); OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, SoftwareRendering); @@ -67,7 +67,7 @@ namespace Microsoft.Terminal.Settings.Editor OBSERVABLE_PROJECTED_PROFILE_SETTING(Int32, HistorySize); OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, SnapOnInput); OBSERVABLE_PROJECTED_PROFILE_SETTING(Boolean, AltGrAliasing); - OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.TerminalControl.CursorStyle, CursorShape); + OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Core.CursorStyle, CursorShape); OBSERVABLE_PROJECTED_PROFILE_SETTING(UInt32, CursorHeight); OBSERVABLE_PROJECTED_PROFILE_SETTING(Microsoft.Terminal.Settings.Model.BellStyle, BellStyle); } diff --git a/src/cascadia/TerminalSettingsEditor/pch.h b/src/cascadia/TerminalSettingsEditor/pch.h index d30001bcba..c75842a182 100644 --- a/src/cascadia/TerminalSettingsEditor/pch.h +++ b/src/cascadia/TerminalSettingsEditor/pch.h @@ -50,7 +50,7 @@ #include #include -#include +#include #include #include "shobjidl_core.h" diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.cpp b/src/cascadia/TerminalSettingsModel/ActionArgs.cpp index 2c7174eca2..5c0ce7f52e 100644 --- a/src/cascadia/TerminalSettingsModel/ActionArgs.cpp +++ b/src/cascadia/TerminalSettingsModel/ActionArgs.cpp @@ -29,7 +29,7 @@ #include -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; namespace winrt::Microsoft::Terminal::Settings::Model::implementation { diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.h b/src/cascadia/TerminalSettingsModel/ActionArgs.h index 1169110195..cea20a7763 100644 --- a/src/cascadia/TerminalSettingsModel/ActionArgs.h +++ b/src/cascadia/TerminalSettingsModel/ActionArgs.h @@ -122,7 +122,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation { CopyTextArgs() = default; WINRT_PROPERTY(bool, SingleLine, false); - WINRT_PROPERTY(Windows::Foundation::IReference, CopyFormatting, nullptr); + WINRT_PROPERTY(Windows::Foundation::IReference, CopyFormatting, nullptr); static constexpr std::string_view SingleLineKey{ "singleLine" }; static constexpr std::string_view CopyFormattingKey{ "copyFormatting" }; diff --git a/src/cascadia/TerminalSettingsModel/ActionArgs.idl b/src/cascadia/TerminalSettingsModel/ActionArgs.idl index d62e04c837..0d2109fa29 100644 --- a/src/cascadia/TerminalSettingsModel/ActionArgs.idl +++ b/src/cascadia/TerminalSettingsModel/ActionArgs.idl @@ -107,7 +107,7 @@ namespace Microsoft.Terminal.Settings.Model [default_interface] runtimeclass CopyTextArgs : IActionArgs { Boolean SingleLine { get; }; - Windows.Foundation.IReference CopyFormatting { get; }; + Windows.Foundation.IReference CopyFormatting { get; }; }; [default_interface] runtimeclass NewTabArgs : IActionArgs diff --git a/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp b/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp index 52c4024a2a..0e300c0743 100644 --- a/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp +++ b/src/cascadia/TerminalSettingsModel/CascadiaSettings.cpp @@ -19,7 +19,7 @@ #include "CascadiaSettings.g.cpp" using namespace ::Microsoft::Terminal::Settings::Model; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; using namespace winrt::Microsoft::Terminal::Settings::Model::implementation; using namespace winrt::Windows::Foundation::Collections; using namespace Microsoft::Console; diff --git a/src/cascadia/TerminalSettingsModel/EnumMappings.cpp b/src/cascadia/TerminalSettingsModel/EnumMappings.cpp index f28e2a44c5..14dd008cf6 100644 --- a/src/cascadia/TerminalSettingsModel/EnumMappings.cpp +++ b/src/cascadia/TerminalSettingsModel/EnumMappings.cpp @@ -34,15 +34,15 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation DEFINE_ENUM_MAP(winrt::Microsoft::UI::Xaml::Controls::TabViewWidthMode, TabViewWidthMode); DEFINE_ENUM_MAP(Model::LaunchMode, LaunchMode); DEFINE_ENUM_MAP(Model::TabSwitcherMode, TabSwitcherMode); - DEFINE_ENUM_MAP(Microsoft::Terminal::TerminalControl::CopyFormat, CopyFormat); + DEFINE_ENUM_MAP(Microsoft::Terminal::Control::CopyFormat, CopyFormat); DEFINE_ENUM_MAP(Model::WindowingMode, WindowingMode); // Profile Settings DEFINE_ENUM_MAP(Model::CloseOnExitMode, CloseOnExitMode); - DEFINE_ENUM_MAP(Microsoft::Terminal::TerminalControl::ScrollbarState, ScrollbarState); + DEFINE_ENUM_MAP(Microsoft::Terminal::Control::ScrollbarState, ScrollbarState); DEFINE_ENUM_MAP(Windows::UI::Xaml::Media::Stretch, BackgroundImageStretchMode); - DEFINE_ENUM_MAP(Microsoft::Terminal::TerminalControl::TextAntialiasingMode, TextAntialiasingMode); - DEFINE_ENUM_MAP(Microsoft::Terminal::TerminalControl::CursorStyle, CursorStyle); + DEFINE_ENUM_MAP(Microsoft::Terminal::Control::TextAntialiasingMode, TextAntialiasingMode); + DEFINE_ENUM_MAP(Microsoft::Terminal::Core::CursorStyle, CursorStyle); DEFINE_ENUM_MAP(Model::BellStyle, BellStyle); // FontWeight is special because the JsonUtils::ConversionTrait for it diff --git a/src/cascadia/TerminalSettingsModel/EnumMappings.h b/src/cascadia/TerminalSettingsModel/EnumMappings.h index 69aba3f901..de54adf392 100644 --- a/src/cascadia/TerminalSettingsModel/EnumMappings.h +++ b/src/cascadia/TerminalSettingsModel/EnumMappings.h @@ -30,15 +30,15 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation static winrt::Windows::Foundation::Collections::IMap TabViewWidthMode(); static winrt::Windows::Foundation::Collections::IMap LaunchMode(); static winrt::Windows::Foundation::Collections::IMap TabSwitcherMode(); - static winrt::Windows::Foundation::Collections::IMap CopyFormat(); + static winrt::Windows::Foundation::Collections::IMap CopyFormat(); static winrt::Windows::Foundation::Collections::IMap WindowingMode(); // Profile Settings static winrt::Windows::Foundation::Collections::IMap CloseOnExitMode(); - static winrt::Windows::Foundation::Collections::IMap ScrollbarState(); + static winrt::Windows::Foundation::Collections::IMap ScrollbarState(); static winrt::Windows::Foundation::Collections::IMap BackgroundImageStretchMode(); - static winrt::Windows::Foundation::Collections::IMap TextAntialiasingMode(); - static winrt::Windows::Foundation::Collections::IMap CursorStyle(); + static winrt::Windows::Foundation::Collections::IMap TextAntialiasingMode(); + static winrt::Windows::Foundation::Collections::IMap CursorStyle(); static winrt::Windows::Foundation::Collections::IMap BellStyle(); static winrt::Windows::Foundation::Collections::IMap FontWeight(); }; diff --git a/src/cascadia/TerminalSettingsModel/EnumMappings.idl b/src/cascadia/TerminalSettingsModel/EnumMappings.idl index d9ff512a7b..257962c59c 100644 --- a/src/cascadia/TerminalSettingsModel/EnumMappings.idl +++ b/src/cascadia/TerminalSettingsModel/EnumMappings.idl @@ -12,15 +12,15 @@ namespace Microsoft.Terminal.Settings.Model static Windows.Foundation.Collections.IMap TabViewWidthMode { get; }; static Windows.Foundation.Collections.IMap LaunchMode { get; }; static Windows.Foundation.Collections.IMap TabSwitcherMode { get; }; - static Windows.Foundation.Collections.IMap CopyFormat { get; }; + static Windows.Foundation.Collections.IMap CopyFormat { get; }; static Windows.Foundation.Collections.IMap WindowingMode { get; }; // Profile Settings static Windows.Foundation.Collections.IMap CloseOnExitMode { get; }; - static Windows.Foundation.Collections.IMap ScrollbarState { get; }; + static Windows.Foundation.Collections.IMap ScrollbarState { get; }; static Windows.Foundation.Collections.IMap BackgroundImageStretchMode { get; }; - static Windows.Foundation.Collections.IMap TextAntialiasingMode { get; }; - static Windows.Foundation.Collections.IMap CursorStyle { get; }; + static Windows.Foundation.Collections.IMap TextAntialiasingMode { get; }; + static Windows.Foundation.Collections.IMap CursorStyle { get; }; static Windows.Foundation.Collections.IMap BellStyle { get; }; static Windows.Foundation.Collections.IMap FontWeight { get; }; } diff --git a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.h b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.h index bf417f0331..5f5f2456c9 100644 --- a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.h +++ b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.h @@ -73,7 +73,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation INHERITABLE_SETTING(Model::GlobalAppSettings, hstring, WordDelimiters, DEFAULT_WORD_DELIMITERS); INHERITABLE_SETTING(Model::GlobalAppSettings, bool, CopyOnSelect, false); INHERITABLE_SETTING(Model::GlobalAppSettings, bool, InputServiceWarning, true); - INHERITABLE_SETTING(Model::GlobalAppSettings, winrt::Microsoft::Terminal::TerminalControl::CopyFormat, CopyFormatting, 0); + INHERITABLE_SETTING(Model::GlobalAppSettings, winrt::Microsoft::Terminal::Control::CopyFormat, CopyFormatting, 0); INHERITABLE_SETTING(Model::GlobalAppSettings, bool, WarnAboutLargePaste, true); INHERITABLE_SETTING(Model::GlobalAppSettings, bool, WarnAboutMultiLinePaste, true); INHERITABLE_SETTING(Model::GlobalAppSettings, Model::LaunchPosition, InitialPosition, nullptr, nullptr); diff --git a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl index 786add2a6f..12a58a9cae 100644 --- a/src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl +++ b/src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl @@ -57,7 +57,7 @@ namespace Microsoft.Terminal.Settings.Model INHERITABLE_SETTING(String, WordDelimiters); INHERITABLE_SETTING(Boolean, CopyOnSelect); INHERITABLE_SETTING(Boolean, InputServiceWarning); - INHERITABLE_SETTING(Microsoft.Terminal.TerminalControl.CopyFormat, CopyFormatting); + INHERITABLE_SETTING(Microsoft.Terminal.Control.CopyFormat, CopyFormatting); INHERITABLE_SETTING(Boolean, WarnAboutLargePaste); INHERITABLE_SETTING(Boolean, WarnAboutMultiLinePaste); INHERITABLE_SETTING(LaunchPosition, InitialPosition); diff --git a/src/cascadia/TerminalSettingsModel/KeyChordSerialization.cpp b/src/cascadia/TerminalSettingsModel/KeyChordSerialization.cpp index b57fdc5207..8c0fd63223 100644 --- a/src/cascadia/TerminalSettingsModel/KeyChordSerialization.cpp +++ b/src/cascadia/TerminalSettingsModel/KeyChordSerialization.cpp @@ -5,7 +5,7 @@ #include "KeyChordSerialization.h" #include "KeyChordSerialization.g.cpp" -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; using namespace winrt::Microsoft::Terminal::Settings::Model::implementation; static constexpr std::wstring_view CTRL_KEY{ L"ctrl" }; diff --git a/src/cascadia/TerminalSettingsModel/KeyChordSerialization.h b/src/cascadia/TerminalSettingsModel/KeyChordSerialization.h index 53304420ba..5b795f8904 100644 --- a/src/cascadia/TerminalSettingsModel/KeyChordSerialization.h +++ b/src/cascadia/TerminalSettingsModel/KeyChordSerialization.h @@ -12,8 +12,8 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation { KeyChordSerialization() = default; - static winrt::Microsoft::Terminal::TerminalControl::KeyChord FromString(const winrt::hstring& str); - static winrt::hstring ToString(const winrt::Microsoft::Terminal::TerminalControl::KeyChord& chord); + static winrt::Microsoft::Terminal::Control::KeyChord FromString(const winrt::hstring& str); + static winrt::hstring ToString(const winrt::Microsoft::Terminal::Control::KeyChord& chord); }; } diff --git a/src/cascadia/TerminalSettingsModel/KeyChordSerialization.idl b/src/cascadia/TerminalSettingsModel/KeyChordSerialization.idl index 966d10f23e..6cb37fca7b 100644 --- a/src/cascadia/TerminalSettingsModel/KeyChordSerialization.idl +++ b/src/cascadia/TerminalSettingsModel/KeyChordSerialization.idl @@ -5,7 +5,7 @@ namespace Microsoft.Terminal.Settings.Model { static runtimeclass KeyChordSerialization { - static Microsoft.Terminal.TerminalControl.KeyChord FromString(String str); - static String ToString(Microsoft.Terminal.TerminalControl.KeyChord chord); + static Microsoft.Terminal.Control.KeyChord FromString(String str); + static String ToString(Microsoft.Terminal.Control.KeyChord chord); } } diff --git a/src/cascadia/TerminalSettingsModel/KeyMapping.cpp b/src/cascadia/TerminalSettingsModel/KeyMapping.cpp index c889a091b5..a5dd04891c 100644 --- a/src/cascadia/TerminalSettingsModel/KeyMapping.cpp +++ b/src/cascadia/TerminalSettingsModel/KeyMapping.cpp @@ -9,7 +9,7 @@ #include "KeyMapping.g.cpp" using namespace winrt::Microsoft::Terminal::Settings::Model; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; namespace winrt::Microsoft::Terminal::Settings::Model::implementation { diff --git a/src/cascadia/TerminalSettingsModel/KeyMapping.h b/src/cascadia/TerminalSettingsModel/KeyMapping.h index 178e8812ab..ce5c811e38 100644 --- a/src/cascadia/TerminalSettingsModel/KeyMapping.h +++ b/src/cascadia/TerminalSettingsModel/KeyMapping.h @@ -31,10 +31,10 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation { struct KeyChordHash { - std::size_t operator()(const TerminalControl::KeyChord& key) const + std::size_t operator()(const Control::KeyChord& key) const { std::hash keyHash; - std::hash modifiersHash; + std::hash modifiersHash; std::size_t hashedKey = keyHash(key.Vkey()); std::size_t hashedMods = modifiersHash(key.Modifiers()); return hashedKey ^ hashedMods; @@ -43,7 +43,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation struct KeyChordEquality { - bool operator()(const TerminalControl::KeyChord& lhs, const TerminalControl::KeyChord& rhs) const + bool operator()(const Control::KeyChord& lhs, const Control::KeyChord& rhs) const { return lhs.Modifiers() == rhs.Modifiers() && lhs.Vkey() == rhs.Vkey(); } @@ -54,24 +54,24 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation KeyMapping() = default; com_ptr Copy() const; - Model::ActionAndArgs TryLookup(TerminalControl::KeyChord const& chord) const; + Model::ActionAndArgs TryLookup(Control::KeyChord const& chord) const; uint64_t Size() const; void SetKeyBinding(Model::ActionAndArgs const& actionAndArgs, - TerminalControl::KeyChord const& chord); - void ClearKeyBinding(TerminalControl::KeyChord const& chord); - TerminalControl::KeyChord GetKeyBindingForAction(Model::ShortcutAction const& action); - TerminalControl::KeyChord GetKeyBindingForActionWithArgs(Model::ActionAndArgs const& actionAndArgs); + Control::KeyChord const& chord); + void ClearKeyBinding(Control::KeyChord const& chord); + Control::KeyChord GetKeyBindingForAction(Model::ShortcutAction const& action); + Control::KeyChord GetKeyBindingForActionWithArgs(Model::ActionAndArgs const& actionAndArgs); - static Windows::System::VirtualKeyModifiers ConvertVKModifiers(TerminalControl::KeyModifiers modifiers); + static Windows::System::VirtualKeyModifiers ConvertVKModifiers(Control::KeyModifiers modifiers); // Defined in KeyMappingSerialization.cpp std::vector LayerJson(const Json::Value& json); Json::Value ToJson(); private: - std::unordered_map _keyShortcuts; - std::vector> _keyShortcutsByInsertionOrder; + std::unordered_map _keyShortcuts; + std::vector> _keyShortcutsByInsertionOrder; friend class SettingsModelLocalTests::DeserializationTests; friend class SettingsModelLocalTests::KeyBindingsTests; diff --git a/src/cascadia/TerminalSettingsModel/KeyMapping.idl b/src/cascadia/TerminalSettingsModel/KeyMapping.idl index a51a601afe..41fb1e4e3b 100644 --- a/src/cascadia/TerminalSettingsModel/KeyMapping.idl +++ b/src/cascadia/TerminalSettingsModel/KeyMapping.idl @@ -67,13 +67,13 @@ namespace Microsoft.Terminal.Settings.Model [default_interface] runtimeclass KeyMapping { - ActionAndArgs TryLookup(Microsoft.Terminal.TerminalControl.KeyChord chord); + ActionAndArgs TryLookup(Microsoft.Terminal.Control.KeyChord chord); UInt64 Size(); - void SetKeyBinding(ActionAndArgs actionAndArgs, Microsoft.Terminal.TerminalControl.KeyChord chord); - void ClearKeyBinding(Microsoft.Terminal.TerminalControl.KeyChord chord); + void SetKeyBinding(ActionAndArgs actionAndArgs, Microsoft.Terminal.Control.KeyChord chord); + void ClearKeyBinding(Microsoft.Terminal.Control.KeyChord chord); - Microsoft.Terminal.TerminalControl.KeyChord GetKeyBindingForAction(ShortcutAction action); - Microsoft.Terminal.TerminalControl.KeyChord GetKeyBindingForActionWithArgs(ActionAndArgs actionAndArgs); + Microsoft.Terminal.Control.KeyChord GetKeyBindingForAction(ShortcutAction action); + Microsoft.Terminal.Control.KeyChord GetKeyBindingForActionWithArgs(ActionAndArgs actionAndArgs); } } diff --git a/src/cascadia/TerminalSettingsModel/KeyMappingSerialization.cpp b/src/cascadia/TerminalSettingsModel/KeyMappingSerialization.cpp index 665c938f59..24d6a4bee1 100644 --- a/src/cascadia/TerminalSettingsModel/KeyMappingSerialization.cpp +++ b/src/cascadia/TerminalSettingsModel/KeyMappingSerialization.cpp @@ -12,7 +12,7 @@ #include "KeyChordSerialization.h" #include "JsonUtils.h" -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; using namespace winrt::Microsoft::Terminal::Settings::Model; static constexpr std::string_view KeysKey{ "keys" }; diff --git a/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj b/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj index 744d493026..2722af8929 100644 --- a/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj +++ b/src/cascadia/TerminalSettingsModel/Microsoft.Terminal.Settings.ModelLib.vcxproj @@ -173,8 +173,14 @@ false false - - $(OpenConsoleCommonOutDir)TerminalControl\Microsoft.Terminal.TerminalControl.winmd + + $(OpenConsoleCommonOutDir)Microsoft.Terminal.Control\Microsoft.Terminal.Control.winmd + true + false + false + + + $(OpenConsoleCommonOutDir)TerminalCore\Microsoft.Terminal.Core.winmd true false false diff --git a/src/cascadia/TerminalSettingsModel/Profile.cpp b/src/cascadia/TerminalSettingsModel/Profile.cpp index a539399bd7..624d134c39 100644 --- a/src/cascadia/TerminalSettingsModel/Profile.cpp +++ b/src/cascadia/TerminalSettingsModel/Profile.cpp @@ -14,7 +14,7 @@ using namespace Microsoft::Terminal::Settings::Model; using namespace winrt::Microsoft::Terminal::Settings::Model::implementation; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; using namespace winrt::Windows::UI; using namespace winrt::Windows::UI::Xaml; using namespace winrt::Windows::Foundation; diff --git a/src/cascadia/TerminalSettingsModel/Profile.h b/src/cascadia/TerminalSettingsModel/Profile.h index 10cc5f164c..3b7efbc67c 100644 --- a/src/cascadia/TerminalSettingsModel/Profile.h +++ b/src/cascadia/TerminalSettingsModel/Profile.h @@ -85,7 +85,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation INHERITABLE_SETTING(Model::Profile, bool, UseAcrylic, false); INHERITABLE_SETTING(Model::Profile, double, AcrylicOpacity, 0.5); - INHERITABLE_SETTING(Model::Profile, Microsoft::Terminal::TerminalControl::ScrollbarState, ScrollState, Microsoft::Terminal::TerminalControl::ScrollbarState::Visible); + INHERITABLE_SETTING(Model::Profile, Microsoft::Terminal::Control::ScrollbarState, ScrollState, Microsoft::Terminal::Control::ScrollbarState::Visible); INHERITABLE_SETTING(Model::Profile, hstring, FontFace, DEFAULT_FONT_FACE); INHERITABLE_SETTING(Model::Profile, int32_t, FontSize, DEFAULT_FONT_SIZE); @@ -100,7 +100,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation INHERITABLE_SETTING(Model::Profile, Windows::UI::Xaml::Media::Stretch, BackgroundImageStretchMode, Windows::UI::Xaml::Media::Stretch::UniformToFill); INHERITABLE_SETTING(Model::Profile, ConvergedAlignment, BackgroundImageAlignment, ConvergedAlignment::Horizontal_Center | ConvergedAlignment::Vertical_Center); - INHERITABLE_SETTING(Model::Profile, Microsoft::Terminal::TerminalControl::TextAntialiasingMode, AntialiasingMode, Microsoft::Terminal::TerminalControl::TextAntialiasingMode::Grayscale); + INHERITABLE_SETTING(Model::Profile, Microsoft::Terminal::Control::TextAntialiasingMode, AntialiasingMode, Microsoft::Terminal::Control::TextAntialiasingMode::Grayscale); INHERITABLE_SETTING(Model::Profile, bool, RetroTerminalEffect, false); INHERITABLE_SETTING(Model::Profile, hstring, PixelShaderPath, L""); INHERITABLE_SETTING(Model::Profile, bool, ForceFullRepaintRendering, false); @@ -117,7 +117,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation INHERITABLE_SETTING(Model::Profile, bool, SnapOnInput, true); INHERITABLE_SETTING(Model::Profile, bool, AltGrAliasing, true); - INHERITABLE_SETTING(Model::Profile, Microsoft::Terminal::TerminalControl::CursorStyle, CursorShape, Microsoft::Terminal::TerminalControl::CursorStyle::Bar); + INHERITABLE_SETTING(Model::Profile, Microsoft::Terminal::Core::CursorStyle, CursorShape, Microsoft::Terminal::Core::CursorStyle::Bar); INHERITABLE_SETTING(Model::Profile, uint32_t, CursorHeight, DEFAULT_CURSOR_HEIGHT); INHERITABLE_SETTING(Model::Profile, Model::BellStyle, BellStyle, BellStyle::Audible); diff --git a/src/cascadia/TerminalSettingsModel/Profile.idl b/src/cascadia/TerminalSettingsModel/Profile.idl index af2e135f37..a122dcb4a0 100644 --- a/src/cascadia/TerminalSettingsModel/Profile.idl +++ b/src/cascadia/TerminalSettingsModel/Profile.idl @@ -70,7 +70,7 @@ namespace Microsoft.Terminal.Settings.Model INHERITABLE_PROFILE_SETTING(Boolean, SuppressApplicationTitle); INHERITABLE_PROFILE_SETTING(Boolean, UseAcrylic); INHERITABLE_PROFILE_SETTING(Double, AcrylicOpacity); - INHERITABLE_PROFILE_SETTING(Microsoft.Terminal.TerminalControl.ScrollbarState, ScrollState); + INHERITABLE_PROFILE_SETTING(Microsoft.Terminal.Control.ScrollbarState, ScrollState); INHERITABLE_PROFILE_SETTING(String, FontFace); INHERITABLE_PROFILE_SETTING(Int32, FontSize); INHERITABLE_PROFILE_SETTING(Windows.UI.Text.FontWeight, FontWeight); @@ -86,7 +86,7 @@ namespace Microsoft.Terminal.Settings.Model INHERITABLE_PROFILE_SETTING(Double, BackgroundImageOpacity); INHERITABLE_PROFILE_SETTING(Windows.UI.Xaml.Media.Stretch, BackgroundImageStretchMode); INHERITABLE_PROFILE_SETTING(ConvergedAlignment, BackgroundImageAlignment); - INHERITABLE_PROFILE_SETTING(Microsoft.Terminal.TerminalControl.TextAntialiasingMode, AntialiasingMode); + INHERITABLE_PROFILE_SETTING(Microsoft.Terminal.Control.TextAntialiasingMode, AntialiasingMode); INHERITABLE_PROFILE_SETTING(Boolean, RetroTerminalEffect); INHERITABLE_PROFILE_SETTING(String, PixelShaderPath); INHERITABLE_PROFILE_SETTING(Boolean, ForceFullRepaintRendering); @@ -99,7 +99,7 @@ namespace Microsoft.Terminal.Settings.Model INHERITABLE_PROFILE_SETTING(Int32, HistorySize); INHERITABLE_PROFILE_SETTING(Boolean, SnapOnInput); INHERITABLE_PROFILE_SETTING(Boolean, AltGrAliasing); - INHERITABLE_PROFILE_SETTING(Microsoft.Terminal.TerminalControl.CursorStyle, CursorShape); + INHERITABLE_PROFILE_SETTING(Microsoft.Terminal.Core.CursorStyle, CursorShape); INHERITABLE_PROFILE_SETTING(UInt32, CursorHeight); INHERITABLE_PROFILE_SETTING(BellStyle, BellStyle); } diff --git a/src/cascadia/TerminalSettingsModel/TerminalSettings.cpp b/src/cascadia/TerminalSettingsModel/TerminalSettings.cpp index 5867c115a6..f59d9cb835 100644 --- a/src/cascadia/TerminalSettingsModel/TerminalSettings.cpp +++ b/src/cascadia/TerminalSettingsModel/TerminalSettings.cpp @@ -7,7 +7,7 @@ #include "TerminalSettings.g.cpp" -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; using namespace Microsoft::Console::Utils; namespace winrt::Microsoft::Terminal::Settings::Model::implementation diff --git a/src/cascadia/TerminalSettingsModel/TerminalSettings.h b/src/cascadia/TerminalSettingsModel/TerminalSettings.h index 531c0ca181..1f8f44714e 100644 --- a/src/cascadia/TerminalSettingsModel/TerminalSettings.h +++ b/src/cascadia/TerminalSettingsModel/TerminalSettings.h @@ -34,11 +34,11 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation static Model::TerminalSettings CreateWithProfileByID(const Model::CascadiaSettings& appSettings, guid profileGuid, - const TerminalControl::IKeyBindings& keybindings); + const Control::IKeyBindings& keybindings); static Model::TerminalSettings CreateWithNewTerminalArgs(const Model::CascadiaSettings& appSettings, const Model::NewTerminalArgs& newTerminalArgs, - const TerminalControl::IKeyBindings& keybindings); + const Control::IKeyBindings& keybindings); static Model::TerminalSettings CreateWithParent(const Model::TerminalSettings& parent); void SetParent(const Model::TerminalSettings& parent); @@ -64,7 +64,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation INHERITABLE_SETTING(Model::TerminalSettings, bool, SnapOnInput, true); INHERITABLE_SETTING(Model::TerminalSettings, bool, AltGrAliasing, true); INHERITABLE_SETTING(Model::TerminalSettings, uint32_t, CursorColor, DEFAULT_CURSOR_COLOR); - INHERITABLE_SETTING(Model::TerminalSettings, Microsoft::Terminal::TerminalControl::CursorStyle, CursorShape, TerminalControl::CursorStyle::Vintage); + INHERITABLE_SETTING(Model::TerminalSettings, Microsoft::Terminal::Core::CursorStyle, CursorShape, Core::CursorStyle::Vintage); INHERITABLE_SETTING(Model::TerminalSettings, uint32_t, CursorHeight, DEFAULT_CURSOR_HEIGHT); INHERITABLE_SETTING(Model::TerminalSettings, hstring, WordDelimiters, DEFAULT_WORD_DELIMITERS); INHERITABLE_SETTING(Model::TerminalSettings, bool, CopyOnSelect, false); @@ -101,7 +101,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation INHERITABLE_SETTING(Model::TerminalSettings, winrt::Windows::UI::Xaml::HorizontalAlignment, BackgroundImageHorizontalAlignment, winrt::Windows::UI::Xaml::HorizontalAlignment::Center); INHERITABLE_SETTING(Model::TerminalSettings, winrt::Windows::UI::Xaml::VerticalAlignment, BackgroundImageVerticalAlignment, winrt::Windows::UI::Xaml::VerticalAlignment::Center); - INHERITABLE_SETTING(Model::TerminalSettings, Microsoft::Terminal::TerminalControl::IKeyBindings, KeyBindings, nullptr); + INHERITABLE_SETTING(Model::TerminalSettings, Microsoft::Terminal::Control::IKeyBindings, KeyBindings, nullptr); INHERITABLE_SETTING(Model::TerminalSettings, hstring, Commandline); INHERITABLE_SETTING(Model::TerminalSettings, hstring, StartingDirectory); @@ -109,9 +109,9 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation INHERITABLE_SETTING(Model::TerminalSettings, bool, SuppressApplicationTitle); INHERITABLE_SETTING(Model::TerminalSettings, hstring, EnvironmentVariables); - INHERITABLE_SETTING(Model::TerminalSettings, Microsoft::Terminal::TerminalControl::ScrollbarState, ScrollState, Microsoft::Terminal::TerminalControl::ScrollbarState::Visible); + INHERITABLE_SETTING(Model::TerminalSettings, Microsoft::Terminal::Control::ScrollbarState, ScrollState, Microsoft::Terminal::Control::ScrollbarState::Visible); - INHERITABLE_SETTING(Model::TerminalSettings, Microsoft::Terminal::TerminalControl::TextAntialiasingMode, AntialiasingMode, Microsoft::Terminal::TerminalControl::TextAntialiasingMode::Grayscale); + INHERITABLE_SETTING(Model::TerminalSettings, Microsoft::Terminal::Control::TextAntialiasingMode, AntialiasingMode, Microsoft::Terminal::Control::TextAntialiasingMode::Grayscale); INHERITABLE_SETTING(Model::TerminalSettings, bool, RetroTerminalEffect, false); INHERITABLE_SETTING(Model::TerminalSettings, bool, ForceFullRepaintRendering, false); diff --git a/src/cascadia/TerminalSettingsModel/TerminalSettings.idl b/src/cascadia/TerminalSettingsModel/TerminalSettings.idl index e936259f0e..2a8583b58e 100644 --- a/src/cascadia/TerminalSettingsModel/TerminalSettings.idl +++ b/src/cascadia/TerminalSettingsModel/TerminalSettings.idl @@ -14,13 +14,13 @@ namespace Microsoft.Terminal.Settings.Model // The TerminalControl will pull settings it requires from this object, // and pass along the Core properties to the terminal core. [default_interface] - runtimeclass TerminalSettings : Microsoft.Terminal.TerminalControl.ICoreSettings, - Microsoft.Terminal.TerminalControl.IControlSettings + runtimeclass TerminalSettings : Microsoft.Terminal.Core.ICoreSettings, + Microsoft.Terminal.Control.IControlSettings { TerminalSettings(); - static TerminalSettings CreateWithProfileByID(CascadiaSettings appSettings, Guid profileGuid, Microsoft.Terminal.TerminalControl.IKeyBindings keybindings); - static TerminalSettings CreateWithNewTerminalArgs(CascadiaSettings appSettings, NewTerminalArgs newTerminalArgs, Microsoft.Terminal.TerminalControl.IKeyBindings keybindings); + static TerminalSettings CreateWithProfileByID(CascadiaSettings appSettings, Guid profileGuid, Microsoft.Terminal.Control.IKeyBindings keybindings); + static TerminalSettings CreateWithNewTerminalArgs(CascadiaSettings appSettings, NewTerminalArgs newTerminalArgs, Microsoft.Terminal.Control.IKeyBindings keybindings); static TerminalSettings CreateWithParent(TerminalSettings parent); void SetParent(TerminalSettings parent); diff --git a/src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h b/src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h index 416a284330..bdda3eef5a 100644 --- a/src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h +++ b/src/cascadia/TerminalSettingsModel/TerminalSettingsSerializationHelpers.h @@ -18,7 +18,7 @@ Abstract: #include "JsonUtils.h" #include "SettingsTypes.h" -JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::TerminalControl::CursorStyle) +JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Core::CursorStyle) { static constexpr std::array mappings = { pair_type{ "bar", ValueType::Bar }, @@ -40,7 +40,7 @@ JSON_ENUM_MAPPER(::winrt::Windows::UI::Xaml::Media::Stretch) }; }; -JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::TerminalControl::ScrollbarState) +JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Control::ScrollbarState) { static constexpr std::array mappings = { pair_type{ "visible", ValueType::Visible }, @@ -93,7 +93,7 @@ JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Settings::Model::ConvergedAlignme }; }; -JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::TerminalControl::TextAntialiasingMode) +JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Control::TextAntialiasingMode) { static constexpr std::array mappings = { pair_type{ "grayscale", ValueType::Grayscale }, @@ -235,7 +235,7 @@ JSON_ENUM_MAPPER(winrt::Microsoft::Terminal::Settings::Model::ExpandCommandType) }; }; -JSON_FLAG_MAPPER(::winrt::Microsoft::Terminal::TerminalControl::CopyFormat) +JSON_FLAG_MAPPER(::winrt::Microsoft::Terminal::Control::CopyFormat) { JSON_MAPPINGS(4) = { pair_type{ "none", AllClear }, diff --git a/src/cascadia/TerminalSettingsModel/dll/Microsoft.Terminal.Settings.Model.vcxproj b/src/cascadia/TerminalSettingsModel/dll/Microsoft.Terminal.Settings.Model.vcxproj index cea7de13f6..9b8ed046cc 100644 --- a/src/cascadia/TerminalSettingsModel/dll/Microsoft.Terminal.Settings.Model.vcxproj +++ b/src/cascadia/TerminalSettingsModel/dll/Microsoft.Terminal.Settings.Model.vcxproj @@ -60,7 +60,7 @@ false - + - - $(OpenConsoleCommonOutDir)TerminalControl\Microsoft.Terminal.TerminalControl.winmd + + $(OpenConsoleCommonOutDir)Microsoft.Terminal.Control\Microsoft.Terminal.Control.winmd + true + false + false + + + + $(OpenConsoleCommonOutDir)TerminalCore\Microsoft.Terminal.Core.winmd true false false diff --git a/src/cascadia/TerminalSettingsModel/pch.h b/src/cascadia/TerminalSettingsModel/pch.h index 3c2a685e41..8bedb61ba6 100644 --- a/src/cascadia/TerminalSettingsModel/pch.h +++ b/src/cascadia/TerminalSettingsModel/pch.h @@ -54,7 +54,7 @@ TRACELOGGING_DECLARE_PROVIDER(g_hSettingsModelProvider); #include -#include +#include #include // Manually include til after we include Windows.Foundation to give it winrt superpowers diff --git a/src/cascadia/UnitTests_TerminalCore/MockTermSettings.h b/src/cascadia/UnitTests_TerminalCore/MockTermSettings.h index 39a3e6f166..8f93cfa050 100644 --- a/src/cascadia/UnitTests_TerminalCore/MockTermSettings.h +++ b/src/cascadia/UnitTests_TerminalCore/MockTermSettings.h @@ -5,10 +5,10 @@ #include "DefaultSettings.h" -#include +#include #include "../inc/cppwinrt_utils.h" -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Core; namespace TerminalCoreUnitTests { diff --git a/src/cascadia/UnitTests_TerminalCore/ScreenSizeLimitsTest.cpp b/src/cascadia/UnitTests_TerminalCore/ScreenSizeLimitsTest.cpp index 11a6d1021b..e8cc6cdce6 100644 --- a/src/cascadia/UnitTests_TerminalCore/ScreenSizeLimitsTest.cpp +++ b/src/cascadia/UnitTests_TerminalCore/ScreenSizeLimitsTest.cpp @@ -9,7 +9,7 @@ #include "../renderer/inc/DummyRenderTarget.hpp" #include "consoletaeftemplates.hpp" -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Core; using namespace Microsoft::Terminal::Core; using namespace WEX::Logging; using namespace WEX::TestExecution; diff --git a/src/cascadia/UnitTests_TerminalCore/ScrollTest.cpp b/src/cascadia/UnitTests_TerminalCore/ScrollTest.cpp index 5e0aa4e86e..ee5e92948f 100644 --- a/src/cascadia/UnitTests_TerminalCore/ScrollTest.cpp +++ b/src/cascadia/UnitTests_TerminalCore/ScrollTest.cpp @@ -16,7 +16,7 @@ #include "consoletaeftemplates.hpp" #include "TestUtils.h" -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Core; using namespace Microsoft::Terminal::Core; using namespace ::Microsoft::Console::Types; diff --git a/src/cascadia/UnitTests_TerminalCore/SelectionTest.cpp b/src/cascadia/UnitTests_TerminalCore/SelectionTest.cpp index 325cb07397..d5e5a8f03d 100644 --- a/src/cascadia/UnitTests_TerminalCore/SelectionTest.cpp +++ b/src/cascadia/UnitTests_TerminalCore/SelectionTest.cpp @@ -17,7 +17,7 @@ using namespace WEX::Logging; using namespace WEX::TestExecution; using namespace Microsoft::Terminal::Core; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Core; namespace TerminalCoreUnitTests { diff --git a/src/cascadia/UnitTests_TerminalCore/TerminalApiTest.cpp b/src/cascadia/UnitTests_TerminalCore/TerminalApiTest.cpp index 935a468fef..ecbffd826c 100644 --- a/src/cascadia/UnitTests_TerminalCore/TerminalApiTest.cpp +++ b/src/cascadia/UnitTests_TerminalCore/TerminalApiTest.cpp @@ -9,7 +9,7 @@ #include "../renderer/inc/DummyRenderTarget.hpp" #include "consoletaeftemplates.hpp" -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Core; using namespace Microsoft::Terminal::Core; using namespace WEX::Logging; diff --git a/src/cascadia/UnitTests_TerminalCore/TerminalBufferTests.cpp b/src/cascadia/UnitTests_TerminalCore/TerminalBufferTests.cpp index 470f602591..974eb813d7 100644 --- a/src/cascadia/UnitTests_TerminalCore/TerminalBufferTests.cpp +++ b/src/cascadia/UnitTests_TerminalCore/TerminalBufferTests.cpp @@ -10,7 +10,7 @@ #include "consoletaeftemplates.hpp" #include "TestUtils.h" -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Core; using namespace Microsoft::Terminal::Core; using namespace WEX::Common; diff --git a/src/cascadia/WindowsTerminal/AppHost.cpp b/src/cascadia/WindowsTerminal/AppHost.cpp index 6a1ba75980..93283c70ce 100644 --- a/src/cascadia/WindowsTerminal/AppHost.cpp +++ b/src/cascadia/WindowsTerminal/AppHost.cpp @@ -502,7 +502,7 @@ void AppHost::_WindowMouseWheeled(const til::point coord, const int32_t delta) for (const auto& e : elems) { // If that element has implemented IMouseWheelListener, call OnMouseWheel on that element. - if (auto control{ e.try_as() }) + if (auto control{ e.try_as() }) { try { diff --git a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj index aa45f987ab..e5206c4db2 100644 --- a/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj +++ b/src/cascadia/WindowsTerminal/WindowsTerminal.vcxproj @@ -72,7 +72,7 @@ - + @@ -83,6 +83,19 @@ + + + + $(OpenConsoleCommonOutDir)TerminalCore\Microsoft.Terminal.Core.winmd + true + false + false + + + + + $(OpenConsoleCommonOutDir)TerminalCore\Microsoft.Terminal.Core.winmd + true + false + false + + + diff --git a/src/cascadia/ut_app/JsonTests.cpp b/src/cascadia/ut_app/JsonTests.cpp index 9111893b5a..f9bc61f6b0 100644 --- a/src/cascadia/ut_app/JsonTests.cpp +++ b/src/cascadia/ut_app/JsonTests.cpp @@ -14,7 +14,7 @@ using namespace WEX::Logging; using namespace WEX::TestExecution; using namespace WEX::Common; using namespace winrt::Microsoft::Terminal::Settings::Model; -using namespace winrt::Microsoft::Terminal::TerminalControl; +using namespace winrt::Microsoft::Terminal::Control; namespace TerminalAppUnitTests {