7f3bc3cb04
## Summary of the Pull Request This forces the `TermControl` to only use `ControlCore` and `ControlInteractivity` via their WinRT projections. We want this, because WinRT projections can be used across process boundaries. In the future, `ControlCore` and `ControlInteractivity` are going to be living in a different process entirely from `TermControl`. By enforcing this boundary now, we can make sure that they will work seamlessly in the future. ## References * Tear-out: #1256 * Megathread: #5000 * Project: https://github.com/microsoft/terminal/projects/5 ## PR Checklist * [x] Closes https://github.com/microsoft/terminal/projects/5#card-50760270 * [x] I work here * [x] Tests added/passed * [n/a] Requires documentation to be updated ## Detailed Description of the Pull Request / Additional comments Most all this was just converting pure c++ types to winrt types when possible. I've added a couple helper projections with `til` converters, which made most of this really easy. The "`MouseButtonState` needs to be composed of `Int32`s instead of `bool`s" is MENTAL. I have no idea why this is, but when I had the control OOP in the sample, that would crash when trying to de-marshal the bools. BODGY. The biggest changes are in the way the UIA stuff is hooked up. The UiaEngine needs to be attached directly to the `Renderer`, and it can't be easily projected, so it needs to live next to the `ControlCore`. But the `TermControlAutomationPeer` needed the `UiaEngine` to help implement some interfaces. Now, there's a new layer we've introduced. `InteractivityAutomationPeer` does the `ITextProvider`, `IControlAccessibilityInfo` and the `IUiaEventDispatcher` thing. `TermControlAutomationPeer` now has a `InteractivityAutomationPeer` stashed inside itself, so that it can ask the interactivity layer to do the real work. We still need the `TermControlAutomationPeer` though, to be able to attach to the real UI tree. ## Validation Steps Performed The terminal behaves basically the same as before. Most importantly, I whipped out Accessibility Insights, and the Terminal looks the same as before.
179 lines
7.9 KiB
XML
179 lines
7.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
<PropertyGroup Label="Globals">
|
|
<ProjectGuid>{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}</ProjectGuid>
|
|
<Keyword>Win32Proj</Keyword>
|
|
<ProjectName>Microsoft.Terminal.Control.Lib</ProjectName>
|
|
<RootNamespace>Microsoft.Terminal.Control</RootNamespace>
|
|
<TargetName>Microsoft.Terminal.ControlLib</TargetName>
|
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
|
<SubSystem>Console</SubSystem>
|
|
<OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
|
|
|
|
<!-- C++/WinRT sets the depth to 1 if there is a XAML file in the project
|
|
Unfortunately for us, we need it to be 3. When the namespace merging
|
|
depth is 1, Microsoft.Terminal.Control becomes "Microsoft",
|
|
and our WinMD file becomes "Microsoft". Because WinRT is very
|
|
namespace-driven, this winmd is considered to contain the entire
|
|
Microsoft namespace. This is, obviously, not great. None of our other
|
|
projects compile properly when they depend on this "Microsoft.winmd."
|
|
-->
|
|
<CppWinRTNamespaceMergeDepth>3</CppWinRTNamespaceMergeDepth>
|
|
<XamlComponentResourceLocation>nested</XamlComponentResourceLocation>
|
|
|
|
</PropertyGroup>
|
|
<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
|
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
|
|
|
<!-- ========================= Headers ======================== -->
|
|
<ItemGroup>
|
|
<ClInclude Include="pch.h" />
|
|
<ClInclude Include="ControlCore.h">
|
|
<DependentUpon>ControlCore.idl</DependentUpon>
|
|
</ClInclude>
|
|
<ClInclude Include="ControlInteractivity.h">
|
|
<DependentUpon>ControlInteractivity.idl</DependentUpon>
|
|
</ClInclude>
|
|
<ClInclude Include="KeyChord.h">
|
|
<DependentUpon>KeyChord.idl</DependentUpon>
|
|
</ClInclude>
|
|
<ClInclude Include="EventArgs.h">
|
|
<DependentUpon>EventArgs.idl</DependentUpon>
|
|
</ClInclude>
|
|
<ClInclude Include="SearchBoxControl.h">
|
|
<DependentUpon>SearchBoxControl.xaml</DependentUpon>
|
|
</ClInclude>
|
|
<ClInclude Include="XamlLights.h">
|
|
<DependentUpon>XamlLights.idl</DependentUpon>
|
|
</ClInclude>
|
|
<ClInclude Include="TermControl.h">
|
|
<DependentUpon>TermControl.xaml</DependentUpon>
|
|
</ClInclude>
|
|
<ClInclude Include="TermControlAutomationPeer.h">
|
|
<DependentUpon>TermControlAutomationPeer.idl</DependentUpon>
|
|
</ClInclude>
|
|
<ClInclude Include="InteractivityAutomationPeer.h">
|
|
<DependentUpon>InteractivityAutomationPeer.idl</DependentUpon>
|
|
</ClInclude>
|
|
<ClInclude Include="TSFInputControl.h">
|
|
<DependentUpon>TSFInputControl.xaml</DependentUpon>
|
|
</ClInclude>
|
|
<ClInclude Include="XamlUiaTextRange.h" />
|
|
</ItemGroup>
|
|
<!-- ========================= Cpp Files ======================== -->
|
|
<ItemGroup>
|
|
<ClCompile Include="pch.cpp">
|
|
<PrecompiledHeader>Create</PrecompiledHeader>
|
|
</ClCompile>
|
|
<ClCompile Include="ControlCore.cpp">
|
|
<DependentUpon>ControlCore.idl</DependentUpon>
|
|
</ClCompile>
|
|
<ClCompile Include="ControlInteractivity.cpp">
|
|
<DependentUpon>ControlInteractivity.idl</DependentUpon>
|
|
</ClCompile>
|
|
<ClCompile Include="EventArgs.cpp">
|
|
<DependentUpon>EventArgs.idl</DependentUpon>
|
|
</ClCompile>
|
|
<ClCompile Include="init.cpp" />
|
|
<ClCompile Include="KeyChord.cpp">
|
|
<DependentUpon>KeyChord.idl</DependentUpon>
|
|
</ClCompile>
|
|
<ClCompile Include="SearchBoxControl.cpp">
|
|
<DependentUpon>SearchBoxControl.xaml</DependentUpon>
|
|
</ClCompile>
|
|
<ClCompile Include="XamlLights.cpp">
|
|
<DependentUpon>XamlLights.idl</DependentUpon>
|
|
</ClCompile>
|
|
<ClCompile Include="TermControl.cpp">
|
|
<DependentUpon>TermControl.xaml</DependentUpon>
|
|
</ClCompile>
|
|
<ClCompile Include="TSFInputControl.cpp">
|
|
<DependentUpon>TSFInputControl.xaml</DependentUpon>
|
|
</ClCompile>
|
|
<ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
|
|
<ClCompile Include="TermControlAutomationPeer.cpp">
|
|
<DependentUpon>TermControlAutomationPeer.idl</DependentUpon>
|
|
</ClCompile>
|
|
<ClCompile Include="InteractivityAutomationPeer.cpp">
|
|
<DependentUpon>InteractivityAutomationPeer.idl</DependentUpon>
|
|
</ClCompile>
|
|
<ClCompile Include="XamlUiaTextRange.cpp" />
|
|
</ItemGroup>
|
|
<!-- ========================= idl Files ======================== -->
|
|
<ItemGroup>
|
|
<Midl Include="ControlCore.idl" />
|
|
<Midl Include="ControlInteractivity.idl" />
|
|
<Midl Include="ICoreState.idl" />
|
|
<Midl Include="IDirectKeyListener.idl" />
|
|
<Midl Include="KeyChord.idl" />
|
|
<Midl Include="EventArgs.idl" />
|
|
<Midl Include="IKeyBindings.idl" />
|
|
<Midl Include="IControlSettings.idl" />
|
|
<Midl Include="IControlAppearance.idl" />
|
|
<Midl Include="SearchBoxControl.idl">
|
|
<DependentUpon>SearchBoxControl.xaml</DependentUpon>
|
|
</Midl>
|
|
<Midl Include="XamlLights.idl" />
|
|
<Midl Include="TermControl.idl">
|
|
<DependentUpon>TermControl.xaml</DependentUpon>
|
|
</Midl>
|
|
<Midl Include="TermControlAutomationPeer.idl" />
|
|
<Midl Include="InteractivityAutomationPeer.idl" />
|
|
<Midl Include="IMouseWheelListener.idl" />
|
|
<Midl Include="TSFInputControl.idl">
|
|
<DependentUpon>TSFInputControl.xaml</DependentUpon>
|
|
</Midl>
|
|
</ItemGroup>
|
|
<!-- ========================= XAML Files ======================== -->
|
|
<ItemGroup>
|
|
<Page Include="SearchBoxControl.xaml">
|
|
<SubType>Designer</SubType>
|
|
</Page>
|
|
<Page Include="TermControl.xaml">
|
|
<SubType>Designer</SubType>
|
|
</Page>
|
|
<Page Include="TSFInputControl.xaml">
|
|
<SubType>Designer</SubType>
|
|
</Page>
|
|
</ItemGroup>
|
|
<!-- ========================= Misc Files ======================== -->
|
|
<ItemGroup>
|
|
<PRIResource Include="Resources\en-US\Resources.resw" />
|
|
<OCResourceDirectory Include="Resources" />
|
|
<None Include="packages.config" />
|
|
</ItemGroup>
|
|
<!-- ========================= Project References ======================== -->
|
|
<ItemGroup>
|
|
<ProjectReference Include="..\..\types\lib\types.vcxproj" />
|
|
<ProjectReference Include="..\..\buffer\out\lib\bufferout.vcxproj" />
|
|
<ProjectReference Include="$(OpenConsoleDir)src\renderer\base\lib\base.vcxproj" />
|
|
<ProjectReference Include="..\..\renderer\dx\lib\dx.vcxproj" />
|
|
<ProjectReference Include="..\..\renderer\uia\lib\uia.vcxproj" />
|
|
<ProjectReference Include="..\..\terminal\parser\lib\parser.vcxproj" />
|
|
<ProjectReference Include="$(OpenConsoleDir)src\terminal\input\lib\terminalinput.vcxproj" />
|
|
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalCore\lib\TerminalCore-lib.vcxproj" />
|
|
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj">
|
|
<Private>false</Private>
|
|
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
|
|
</ProjectReference>
|
|
<ProjectReference Include="$(OpenConsoleDir)src\cascadia\WinRTUtils\WinRTUtils.vcxproj">
|
|
<Project>{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}</Project>
|
|
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
|
</ProjectReference>
|
|
</ItemGroup>
|
|
<!-- ====================== Compiler & Linker Flags ===================== -->
|
|
<ItemDefinitionGroup>
|
|
<ClCompile>
|
|
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
|
<AdditionalIncludeDirectories>$(OpenConsoleDir)src\cascadia\inc;$(OpenConsoleDir)src\types\inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
</ClCompile>
|
|
<Reference>
|
|
<Private>false</Private>
|
|
</Reference>
|
|
</ItemDefinitionGroup>
|
|
<!-- ========================= Globals ======================== -->
|
|
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
|
|
|
|
<Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
|
|
</Project>
|