Merge remote-tracking branch 'origin/main' into dev/migrie/oop/ragnarok
This commit is contained in:
Mike Griese
commit
4a700cd1cc
|
|
@ -125,7 +125,7 @@ Team members will be happy to help review specs and guide them to completion.
|
|||
|
||||
### Help Wanted
|
||||
|
||||
Once the team have approved an issue/spec, development can proceed. If no developers are immediately available, the spec can be parked ready for a developer to get started. Parked specs' issues will be labeled "Help Wanted". To find a list of development opportunities waiting for developer involvement, visit the Issues and filter on [the Help-Wanted label](https://github.com/microsoft/terminal/labels/Help%20Wanted).
|
||||
Once the team has approved an issue/spec, development can proceed. If no developers are immediately available, the spec can be parked ready for a developer to get started. Parked specs' issues will be labeled "Help Wanted". To find a list of development opportunities waiting for developer involvement, visit the Issues and filter on [the Help-Wanted label](https://github.com/microsoft/terminal/labels/Help%20Wanted).
|
||||
|
||||
---
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
|
||||
<XesBaseYearForStoreVersion>2021</XesBaseYearForStoreVersion>
|
||||
<VersionMajor>1</VersionMajor>
|
||||
<VersionMinor>12</VersionMinor>
|
||||
<VersionMinor>13</VersionMinor>
|
||||
<VersionInfoProductName>Windows Terminal</VersionInfoProductName>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
Introducing exceptions to an existing non-exception-based codebase can be perilous. The console was originally written
|
||||
in C at a time when C++ was relatively unused in the Windows operating system. As part of our project to modernize the
|
||||
Windows console, we converted to use C++, but still had an aversion to using exception-based error handling in
|
||||
our code for fear that it introduce unexpected failures. However, the STL and other libraries like it are so useful that
|
||||
our code for fear that it might introduce unexpected failures. However, the STL and other libraries like it are so useful that
|
||||
sometimes it's significantly simpler to use them. Given that, we have a set of rules that we follow when considering
|
||||
exception use.
|
||||
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@ I think there might be a bit of a misunderstanding here - there are two differen
|
|||
* shell applications, like `cmd.exe`, `powershell`, `zsh`, etc. These are text-only applications that emit streams of characters. They don't care at all about how they're eventually rendered to the user. These are also sometimes referred to as "commandline client" applications.
|
||||
* terminal applications, like the Windows Terminal, gnome-terminal, xterm, iterm2, hyper. These are graphical applications that can be used to render the output of commandline clients.
|
||||
|
||||
On Windows, if you just run `cmd.exe` directly, the OS will create an instance of `conhost.exe` as the _terminal_ for `cmd.exe`. The same thing happens for `powershell.exe`, the system will creates a new conhost window for any client that's not already connected to a terminal of some sort. This has lead to an enormous amount of confusion for people thinking that a conhost window is actually a "`cmd` window". `cmd` can't have a window, it's just a commandline application. Its window is always some other terminal.
|
||||
On Windows, if you just run `cmd.exe` directly, the OS will create an instance of `conhost.exe` as the _terminal_ for `cmd.exe`. The same thing happens for `powershell.exe`, the system will create a new conhost window for any client that's not already connected to a terminal of some sort. This has lead to an enormous amount of confusion for people thinking that a conhost window is actually a "`cmd` window". `cmd` can't have a window, it's just a commandline application. Its window is always some other terminal.
|
||||
|
||||
Any terminal can run any commandline client application. So you can use the Windows Terminal to run whatever shell you want. I use mine for both `cmd` and `powershell`, and also WSL:
|
||||
|
||||
|
|
|
|||
|
|
@ -459,7 +459,7 @@
|
|||
},
|
||||
"suppressApplicationTitle": {
|
||||
"type": "boolean",
|
||||
"default": "false",
|
||||
"default": false,
|
||||
"description": "When set to true, tabTitle overrides the default title of the tab and any title change messages from the application will be suppressed. When set to false, tabTitle behaves as normal"
|
||||
},
|
||||
"colorScheme": {
|
||||
|
|
@ -506,7 +506,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "adjustFontSize"
|
||||
"const": "adjustFontSize"
|
||||
},
|
||||
"delta": {
|
||||
"type": "integer",
|
||||
|
|
@ -530,7 +530,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "copy"
|
||||
"const": "copy"
|
||||
},
|
||||
"singleLine": {
|
||||
"type": "boolean",
|
||||
|
|
@ -566,7 +566,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "newTab"
|
||||
"const": "newTab"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -582,7 +582,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "switchToTab"
|
||||
"const": "switchToTab"
|
||||
},
|
||||
"index": {
|
||||
"type": "integer",
|
||||
|
|
@ -606,7 +606,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "movePane"
|
||||
"const": "movePane"
|
||||
},
|
||||
"index": {
|
||||
"type": "integer",
|
||||
|
|
@ -630,7 +630,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "moveFocus"
|
||||
"const": "moveFocus"
|
||||
},
|
||||
"direction": {
|
||||
"$ref": "#/$defs/FocusDirection",
|
||||
|
|
@ -654,7 +654,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "swapPane"
|
||||
"const": "swapPane"
|
||||
},
|
||||
"direction": {
|
||||
"$ref": "#/$defs/FocusDirection",
|
||||
|
|
@ -678,7 +678,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "resizePane"
|
||||
"const": "resizePane"
|
||||
},
|
||||
"direction": {
|
||||
"$ref": "#/$defs/ResizeDirection",
|
||||
|
|
@ -702,7 +702,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "sendInput"
|
||||
"const": "sendInput"
|
||||
},
|
||||
"input": {
|
||||
"type": "string",
|
||||
|
|
@ -729,7 +729,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "splitPane"
|
||||
"const": "splitPane"
|
||||
},
|
||||
"split": {
|
||||
"$ref": "#/$defs/SplitDirection",
|
||||
|
|
@ -761,7 +761,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "openSettings"
|
||||
"const": "openSettings"
|
||||
},
|
||||
"target": {
|
||||
"type": "string",
|
||||
|
|
@ -788,7 +788,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "setTabColor"
|
||||
"const": "setTabColor"
|
||||
},
|
||||
"color": {
|
||||
"$ref": "#/$defs/Color",
|
||||
|
|
@ -809,7 +809,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "setColorScheme"
|
||||
"const": "setColorScheme"
|
||||
},
|
||||
"colorScheme": {
|
||||
"type": "string",
|
||||
|
|
@ -833,7 +833,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "wt"
|
||||
"const": "wt"
|
||||
},
|
||||
"commandline": {
|
||||
"type": "string",
|
||||
|
|
@ -857,7 +857,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "closeOtherTabs"
|
||||
"const": "closeOtherTabs"
|
||||
},
|
||||
"index": {
|
||||
"oneOf": [
|
||||
|
|
@ -885,7 +885,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "closeTabsAfter"
|
||||
"const": "closeTabsAfter"
|
||||
},
|
||||
"index": {
|
||||
"oneOf": [
|
||||
|
|
@ -913,7 +913,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "closeTab"
|
||||
"const": "closeTab"
|
||||
},
|
||||
"index": {
|
||||
"oneOf": [
|
||||
|
|
@ -941,7 +941,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "scrollUp"
|
||||
"const": "scrollUp"
|
||||
},
|
||||
"rowsToScroll": {
|
||||
"type": [
|
||||
|
|
@ -965,7 +965,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "scrollDown"
|
||||
"const": "scrollDown"
|
||||
},
|
||||
"rowsToScroll": {
|
||||
"type": [
|
||||
|
|
@ -989,7 +989,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "moveTab"
|
||||
"const": "moveTab"
|
||||
},
|
||||
"direction": {
|
||||
"$ref": "#/$defs/MoveTabDirection",
|
||||
|
|
@ -1012,7 +1012,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "multipleActions"
|
||||
"const": "multipleActions"
|
||||
},
|
||||
"actions": {
|
||||
"$ref": "#/$defs/ShortcutAction",
|
||||
|
|
@ -1037,7 +1037,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "commandPalette"
|
||||
"const": "commandPalette"
|
||||
},
|
||||
"launchMode": {
|
||||
"$ref": "#/$defs/CommandPaletteLaunchMode",
|
||||
|
|
@ -1058,7 +1058,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "findMatch"
|
||||
"const": "findMatch"
|
||||
},
|
||||
"direction": {
|
||||
"$ref": "#/$defs/FindMatchDirection",
|
||||
|
|
@ -1085,7 +1085,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "newWindow"
|
||||
"const": "newWindow"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1101,7 +1101,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "prevTab"
|
||||
"const": "prevTab"
|
||||
},
|
||||
"tabSwitcherMode": {
|
||||
"$ref": "#/$defs/SwitchToAdjacentTabArgs",
|
||||
|
|
@ -1122,7 +1122,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "nextTab"
|
||||
"const": "nextTab"
|
||||
},
|
||||
"tabSwitcherMode": {
|
||||
"$ref": "#/$defs/SwitchToAdjacentTabArgs",
|
||||
|
|
@ -1143,7 +1143,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "renameTab"
|
||||
"const": "renameTab"
|
||||
},
|
||||
"title": {
|
||||
"type": "string",
|
||||
|
|
@ -1164,7 +1164,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "renameWindow"
|
||||
"const": "renameWindow"
|
||||
},
|
||||
"name": {
|
||||
"type": "string",
|
||||
|
|
@ -1185,7 +1185,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "focusPane"
|
||||
"const": "focusPane"
|
||||
},
|
||||
"id": {
|
||||
"type": "integer",
|
||||
|
|
@ -1207,7 +1207,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "globalSummon"
|
||||
"const": "globalSummon"
|
||||
},
|
||||
"desktop": {
|
||||
"type": "string",
|
||||
|
|
@ -1258,7 +1258,7 @@
|
|||
"properties": {
|
||||
"action": {
|
||||
"type": "string",
|
||||
"pattern": "quakeMode"
|
||||
"const": "quakeMode"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1333,6 +1333,12 @@
|
|||
{
|
||||
"$ref": "#/$defs/MoveTabAction"
|
||||
},
|
||||
{
|
||||
"$ref": "#/$defs/MultipleActionsAction"
|
||||
},
|
||||
{
|
||||
"$ref": "#/$defs/CommandPaletteAction"
|
||||
},
|
||||
{
|
||||
"$ref": "#/$defs/FindMatchAction"
|
||||
},
|
||||
|
|
@ -1575,22 +1581,22 @@
|
|||
"deprecated": true
|
||||
},
|
||||
"minimizeToNotificationArea": {
|
||||
"default": "false",
|
||||
"default": false,
|
||||
"description": "When set to true, minimizing a Terminal window will no longer appear in the taskbar. Instead, a Terminal icon will appear in the notification area through which the user can access their windows.",
|
||||
"type": "boolean"
|
||||
},
|
||||
"alwaysShowNotificationIcon": {
|
||||
"default": "false",
|
||||
"default": false,
|
||||
"description": "When set to true, the Terminal's notification icon will always be shown in the notification area.",
|
||||
"type": "boolean"
|
||||
},
|
||||
"showAdminShield": {
|
||||
"default": "true",
|
||||
"default": true,
|
||||
"description": "When set to true, the Terminal's tab row will display a shield icon when the Terminal is running with administrator privileges",
|
||||
"type": "boolean"
|
||||
},
|
||||
"useAcrylicInTabRow": {
|
||||
"default": "false",
|
||||
"default": false,
|
||||
"description": "When set to true, the tab row will have an acrylic background with 50% opacity.",
|
||||
"type": "boolean"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ Below is the schedule for when milestones will be included in release builds of
|
|||
| 2021-05-31 | [1.9] in Windows Terminal Preview<br>[1.8] in Windows Terminal | [Windows Terminal Preview 1.9 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-9-release/) |
|
||||
| 2021-07-14 | [1.10] in Windows Terminal Preview<br>[1.9] in Windows Terminal | [Windows Terminal Preview 1.10 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-10-release/) |
|
||||
| 2021-08-31 | [1.11] in Windows Terminal Preview<br>[1.10] in Windows Terminal | [Windows Terminal Preview 1.11 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-11-release/) |
|
||||
| 2021-10-31 | 1.12 in Windows Terminal Preview<br>1.11 in Windows Terminal | |
|
||||
| 2021-10-20 | [1.12] in Windows Terminal Preview<br>[1.11] in Windows Terminal | [Windows Terminal Preview 1.12 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-12-release/) |
|
||||
| 2021-11-30 | 2.0 RC in Windows Terminal Preview<br>2.0 RC in Windows Terminal | |
|
||||
| 2021-12-31 | [2.0] in Windows Terminal Preview<br>[2.0] in Windows Terminal | |
|
||||
|
||||
|
|
@ -91,6 +91,8 @@ Feature Notes:
|
|||
[1.9]: https://github.com/microsoft/terminal/milestone/34
|
||||
[1.10]: https://github.com/microsoft/terminal/milestone/35
|
||||
[1.11]: https://github.com/microsoft/terminal/milestone/36
|
||||
[1.12]: https://github.com/microsoft/terminal/milestone/38
|
||||
[1.13]: https://github.com/microsoft/terminal/milestone/39
|
||||
[2.0]: https://github.com/microsoft/terminal/milestone/22
|
||||
[#1564]: https://github.com/microsoft/terminal/issues/1564
|
||||
[#6720]: https://github.com/microsoft/terminal/pull/6720
|
||||
|
|
|
|||
|
|
@ -13,6 +13,15 @@
|
|||
<EventProvider Id="EventProvider_TerminalRemoting" Name="d6f04aad-629f-539a-77c1-73f5c3e4aa7b" />
|
||||
<EventProvider Id="EventProvider_TerminalDirectX" Name="c93e739e-ae50-5a14-78e7-f171e947535d" />
|
||||
<EventProvider Id="EventProvider_TerminalUIA" Name="e7ebce59-2161-572d-b263-2f16a6afb9e5"/>
|
||||
<!-- Console providers here -->
|
||||
<EventProvider Id="EventProvider-Microsoft.Windows.Console.Launcher" Name="770aa552-671a-5e97-579b-151709ec0dbd"/>
|
||||
<EventProvider Id="EventProvider-Microsoft.Windows.Console.Host" Name="fe1ff234-1f09-50a8-d38d-c44fab43e818"/>
|
||||
<EventProvider Id="EventProvider-Microsoft.Windows.Console.Server" Name="1A541C01-589A-496E-85A7-A9E02170166D"/>
|
||||
<EventProvider Id="EventProvider-Microsoft.Windows.Console.VirtualTerminal.Parser" Name="c9ba2a84-d3ca-5e19-2bd6-776a0910cb9d"/>
|
||||
<EventProvider Id="EventProvider-Microsoft.Windows.Console.Render.VtEngine" Name="c9ba2a95-d3ca-5e19-2bd6-776a0910cb9d"/>
|
||||
<EventProvider Id="EventProvider-Microsoft.Windows.Console.UIA" Name="e7ebce59-2161-572d-b263-2f16a6afb9e5"/>
|
||||
|
||||
<!-- Profile for General Terminal logging -->
|
||||
<Profile Id="Terminal.Verbose.File" Name="Terminal" Description="Terminal" LoggingMode="File" DetailLevel="Verbose">
|
||||
<Collectors>
|
||||
<EventCollectorId Value="EventCollector_Terminal">
|
||||
|
|
@ -32,5 +41,27 @@
|
|||
<Profile Id="Terminal.Light.File" Name="Terminal" Description="Terminal" Base="Terminal.Verbose.File" LoggingMode="File" DetailLevel="Light" />
|
||||
<Profile Id="Terminal.Verbose.Memory" Name="Terminal" Description="Terminal" Base="Terminal.Verbose.File" LoggingMode="Memory" DetailLevel="Verbose" />
|
||||
<Profile Id="Terminal.Light.Memory" Name="Terminal" Description="Terminal" Base="Terminal.Verbose.File" LoggingMode="Memory" DetailLevel="Light" />
|
||||
|
||||
<!-- Profile for DefTerm logging. Includes some conhost logging. -->
|
||||
<Profile Id="DefTerm.Verbose.File" Name="DefTerm" Description="DefTerm" LoggingMode="File" DetailLevel="Verbose">
|
||||
<Collectors>
|
||||
<EventCollectorId Value="EventCollector_Terminal">
|
||||
<EventProviders>
|
||||
<EventProviderId Value="EventProvider_TerminalControl" />
|
||||
<EventProviderId Value="EventProvider_TerminalConnection" />
|
||||
<EventProviderId Value="EventProvider_TerminalSettingsModel" />
|
||||
<EventProviderId Value="EventProvider_TerminalApp" />
|
||||
<EventProviderId Value="EventProvider_TerminalWin32Host" />
|
||||
<EventProviderId Value="EventProvider_TerminalRemoting" />
|
||||
<EventProviderId Value="EventProvider-Microsoft.Windows.Console.Launcher" />
|
||||
<EventProviderId Value="EventProvider-Microsoft.Windows.Console.Host" />
|
||||
<EventProviderId Value="EventProvider-Microsoft.Windows.Console.Server" />
|
||||
</EventProviders>
|
||||
</EventCollectorId>
|
||||
</Collectors>
|
||||
</Profile>
|
||||
<Profile Id="DefTerm.Light.File" Name="DefTerm" Description="DefTerm" Base="DefTerm.Verbose.File" LoggingMode="File" DetailLevel="Light" />
|
||||
<Profile Id="DefTerm.Verbose.Memory" Name="DefTerm" Description="DefTerm" Base="DefTerm.Verbose.File" LoggingMode="Memory" DetailLevel="Verbose" />
|
||||
<Profile Id="DefTerm.Light.Memory" Name="DefTerm" Description="DefTerm" Base="DefTerm.Verbose.File" LoggingMode="Memory" DetailLevel="Light" />
|
||||
</Profiles>
|
||||
</WindowsPerformanceRecorder>
|
||||
</WindowsPerformanceRecorder>
|
||||
|
|
|
|||
|
|
@ -372,6 +372,16 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
|
|||
// window is expecting it to be on the first layout.
|
||||
else
|
||||
{
|
||||
#pragma warning(suppress : 26477 26485 26494 26482 26446) // We don't control TraceLoggingWrite
|
||||
TraceLoggingWrite(
|
||||
g_hTerminalConnectionProvider,
|
||||
"ConPtyConnectedToDefterm",
|
||||
TraceLoggingDescription("Event emitted when ConPTY connection is started, for a defterm session"),
|
||||
TraceLoggingGuid(_guid, "SessionGuid", "The WT_SESSION's GUID"),
|
||||
TraceLoggingWideString(_clientName.c_str(), "Client", "The attached client process"),
|
||||
TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
|
||||
TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
|
||||
|
||||
THROW_IF_FAILED(ConptyResizePseudoConsole(_hPC.get(), dimensions));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -615,6 +615,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
|
|||
// not, but DX doesn't use that info at all.
|
||||
// The Codepage is additionally not actually used by the DX engine at all.
|
||||
_actualFont = { fontFace, 0, fontWeight.Weight, { 0, fontHeight }, CP_UTF8, false };
|
||||
_actualFontFaceName = { fontFace };
|
||||
_desiredFont = { _actualFont };
|
||||
|
||||
// Update the terminal core with its new Core settings
|
||||
|
|
@ -766,6 +767,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
|
|||
const auto fontFace = _settings->FontFace();
|
||||
const auto fontWeight = _settings->FontWeight();
|
||||
_actualFont = { fontFace, 0, fontWeight.Weight, { 0, newSize }, CP_UTF8, false };
|
||||
_actualFontFaceName = { fontFace };
|
||||
_desiredFont = { _actualFont };
|
||||
|
||||
auto lock = _terminal->LockForWriting();
|
||||
|
|
@ -1044,7 +1046,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
|
|||
|
||||
winrt::Windows::Foundation::Size ControlCore::FontSize() const noexcept
|
||||
{
|
||||
const auto fontSize = GetFont().GetSize();
|
||||
const auto fontSize = _actualFont.GetSize();
|
||||
return {
|
||||
::base::saturated_cast<float>(fontSize.X),
|
||||
::base::saturated_cast<float>(fontSize.Y)
|
||||
|
|
@ -1052,17 +1054,20 @@ namespace winrt::Microsoft::Terminal::Control::implementation
|
|||
}
|
||||
winrt::hstring ControlCore::FontFaceName() const noexcept
|
||||
{
|
||||
return winrt::hstring{ GetFont().GetFaceName() };
|
||||
// This getter used to return _actualFont.GetFaceName(), however GetFaceName() returns a STL
|
||||
// string and we need to return a WinRT string. This would require an additional allocation.
|
||||
// This method is called 10/s by TSFInputControl at the time of writing.
|
||||
return _actualFontFaceName;
|
||||
}
|
||||
|
||||
uint16_t ControlCore::FontWeight() const noexcept
|
||||
{
|
||||
return static_cast<uint16_t>(GetFont().GetWeight());
|
||||
return static_cast<uint16_t>(_actualFont.GetWeight());
|
||||
}
|
||||
|
||||
til::size ControlCore::FontSizeInDips() const
|
||||
{
|
||||
const til::size fontSize{ GetFont().GetSize() };
|
||||
const til::size fontSize{ _actualFont.GetSize() };
|
||||
return fontSize.scale(til::math::rounding, 1.0f / ::base::saturated_cast<float>(_compositionScale));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -226,6 +226,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
|
|||
|
||||
FontInfoDesired _desiredFont;
|
||||
FontInfo _actualFont;
|
||||
winrt::hstring _actualFontFaceName;
|
||||
|
||||
// storage location for the leading surrogate of a utf-16 surrogate pair
|
||||
std::optional<wchar_t> _leadingSurrogate{ std::nullopt };
|
||||
|
|
|
|||
|
|
@ -297,37 +297,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
|
|||
return;
|
||||
}
|
||||
|
||||
if (!newAppearance.BackgroundImage().empty())
|
||||
{
|
||||
Windows::Foundation::Uri imageUri{ newAppearance.BackgroundImage() };
|
||||
|
||||
// Check if the image brush is already pointing to the image
|
||||
// in the modified settings; if it isn't (or isn't there),
|
||||
// set a new image source for the brush
|
||||
auto imageSource = BackgroundImage().Source().try_as<Media::Imaging::BitmapImage>();
|
||||
|
||||
if (imageSource == nullptr ||
|
||||
imageSource.UriSource() == nullptr ||
|
||||
imageSource.UriSource().RawUri() != imageUri.RawUri())
|
||||
{
|
||||
// Note that BitmapImage handles the image load asynchronously,
|
||||
// which is especially important since the image
|
||||
// may well be both large and somewhere out on the
|
||||
// internet.
|
||||
Media::Imaging::BitmapImage image(imageUri);
|
||||
BackgroundImage().Source(image);
|
||||
}
|
||||
|
||||
// Apply stretch, opacity and alignment settings
|
||||
BackgroundImage().Stretch(newAppearance.BackgroundImageStretchMode());
|
||||
BackgroundImage().Opacity(newAppearance.BackgroundImageOpacity());
|
||||
BackgroundImage().HorizontalAlignment(newAppearance.BackgroundImageHorizontalAlignment());
|
||||
BackgroundImage().VerticalAlignment(newAppearance.BackgroundImageVerticalAlignment());
|
||||
}
|
||||
else
|
||||
{
|
||||
BackgroundImage().Source(nullptr);
|
||||
}
|
||||
_SetBackgroundImage(newAppearance);
|
||||
|
||||
// Update our control settings
|
||||
const auto bg = newAppearance.DefaultBackground();
|
||||
|
|
@ -416,6 +386,57 @@ namespace winrt::Microsoft::Terminal::Control::implementation
|
|||
}
|
||||
}
|
||||
|
||||
// Method Description:
|
||||
// - Sets background image and applies its settings (stretch, opacity and alignment)
|
||||
// - Checks path validity
|
||||
// Arguments:
|
||||
// - newAppearance
|
||||
// Return Value:
|
||||
// - <none>
|
||||
void TermControl::_SetBackgroundImage(const IControlAppearance& newAppearance)
|
||||
{
|
||||
if (newAppearance.BackgroundImage().empty())
|
||||
{
|
||||
BackgroundImage().Source(nullptr);
|
||||
return;
|
||||
}
|
||||
|
||||
Windows::Foundation::Uri imageUri{ nullptr };
|
||||
try
|
||||
{
|
||||
imageUri = Windows::Foundation::Uri{ newAppearance.BackgroundImage() };
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
LOG_CAUGHT_EXCEPTION();
|
||||
BackgroundImage().Source(nullptr);
|
||||
return;
|
||||
}
|
||||
|
||||
// Check if the image brush is already pointing to the image
|
||||
// in the modified settings; if it isn't (or isn't there),
|
||||
// set a new image source for the brush
|
||||
auto imageSource = BackgroundImage().Source().try_as<Media::Imaging::BitmapImage>();
|
||||
|
||||
if (imageSource == nullptr ||
|
||||
imageSource.UriSource() == nullptr ||
|
||||
imageSource.UriSource().RawUri() != imageUri.RawUri())
|
||||
{
|
||||
// Note that BitmapImage handles the image load asynchronously,
|
||||
// which is especially important since the image
|
||||
// may well be both large and somewhere out on the
|
||||
// internet.
|
||||
Media::Imaging::BitmapImage image(imageUri);
|
||||
BackgroundImage().Source(image);
|
||||
}
|
||||
|
||||
// Apply stretch, opacity and alignment settings
|
||||
BackgroundImage().Stretch(newAppearance.BackgroundImageStretchMode());
|
||||
BackgroundImage().Opacity(newAppearance.BackgroundImageOpacity());
|
||||
BackgroundImage().HorizontalAlignment(newAppearance.BackgroundImageHorizontalAlignment());
|
||||
BackgroundImage().VerticalAlignment(newAppearance.BackgroundImageVerticalAlignment());
|
||||
}
|
||||
|
||||
// Method Description:
|
||||
// - Set up each layer's brush used to display the control's background.
|
||||
// - Respects the settings for acrylic, background image and opacity from
|
||||
|
|
|
|||
|
|
@ -205,6 +205,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
|
|||
void _UpdateAppearanceFromUIThread(Control::IControlAppearance newAppearance);
|
||||
void _ApplyUISettings();
|
||||
winrt::fire_and_forget UpdateAppearance(Control::IControlAppearance newAppearance);
|
||||
void _SetBackgroundImage(const IControlAppearance& newAppearance);
|
||||
|
||||
void _InitializeBackgroundBrush();
|
||||
winrt::fire_and_forget _coreBackgroundColorChanged(const IInspectable& sender, const IInspectable& args);
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@
|
|||
<TextBox IsEnabled="{x:Bind local:Converters.StringsAreNotEqual('desktopWallpaper', Appearance.BackgroundImagePath), Mode=OneWay}"
|
||||
IsSpellCheckEnabled="False"
|
||||
Style="{StaticResource TextBoxSettingStyle}"
|
||||
Text="{x:Bind local:Converters.StringFallBackToEmptyString('desktopWallpaper', Appearance.BackgroundImagePath), Mode=TwoWay, BindBack=Appearance.SetBackgroundImagePath}" />
|
||||
Text="{x:Bind local:Converters.StringOrEmptyIfPlaceholder('desktopWallpaper', Appearance.BackgroundImagePath), Mode=TwoWay, BindBack=Appearance.SetBackgroundImagePath}" />
|
||||
<Button x:Uid="Profile_BackgroundImageBrowse"
|
||||
Click="BackgroundImage_Click"
|
||||
IsEnabled="{x:Bind local:Converters.StringsAreNotEqual('desktopWallpaper', Appearance.BackgroundImagePath), Mode=OneWay}"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include "pch.h"
|
||||
#include "pch.h"
|
||||
#include "Converters.h"
|
||||
#if __has_include("Converters.g.cpp")
|
||||
#include "Converters.g.cpp"
|
||||
|
|
@ -99,8 +99,16 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
|
|||
{
|
||||
return value.empty() ? winrt::Windows::UI::Xaml::Visibility::Collapsed : winrt::Windows::UI::Xaml::Visibility::Visible;
|
||||
}
|
||||
winrt::hstring Converters::StringFallBackToEmptyString(winrt::hstring expected, winrt::hstring actual)
|
||||
|
||||
// Method Description:
|
||||
// - Returns the value string, unless it matches the placeholder in which case the empty string.
|
||||
// Arguments:
|
||||
// - placeholder - the placeholder string.
|
||||
// - value - the value string.
|
||||
// Return Value:
|
||||
// - The value string, unless it matches the placeholder in which case the empty string.
|
||||
winrt::hstring Converters::StringOrEmptyIfPlaceholder(winrt::hstring placeholder, winrt::hstring value)
|
||||
{
|
||||
return expected == actual ? expected : L"";
|
||||
return placeholder == value ? L"" : value;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
|
|||
static double PercentageValueToPercentage(double value);
|
||||
static bool StringsAreNotEqual(winrt::hstring expected, winrt::hstring actual);
|
||||
static winrt::Windows::UI::Xaml::Visibility StringNotEmptyToVisibility(winrt::hstring value);
|
||||
static winrt::hstring StringFallBackToEmptyString(winrt::hstring expected, winrt::hstring actual);
|
||||
static winrt::hstring StringOrEmptyIfPlaceholder(winrt::hstring placeholder, winrt::hstring value);
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,6 @@ namespace Microsoft.Terminal.Settings.Editor
|
|||
static Double PercentageValueToPercentage(Double value);
|
||||
static Boolean StringsAreNotEqual(String expected, String actual);
|
||||
static Windows.UI.Xaml.Visibility StringNotEmptyToVisibility(String value);
|
||||
static String StringFallBackToEmptyString(String expected, String actual);
|
||||
static String StringOrEmptyIfPlaceholder(String placeholder, String value);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
#include "Interaction.h"
|
||||
#include "Rendering.h"
|
||||
#include "Actions.h"
|
||||
#include "ReadOnlyActions.h"
|
||||
#include "Profiles.h"
|
||||
#include "GlobalAppearance.h"
|
||||
#include "ColorSchemes.h"
|
||||
|
|
@ -293,21 +292,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
|
|||
}
|
||||
else if (clickedItemTag == actionsTag)
|
||||
{
|
||||
if constexpr (Feature_EditableActionsPage::IsEnabled())
|
||||
{
|
||||
contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<ActionsPageNavigationState>(_settingsClone));
|
||||
}
|
||||
else
|
||||
{
|
||||
auto actionsState{ winrt::make<ReadOnlyActionsPageNavigationState>(_settingsClone) };
|
||||
actionsState.OpenJson([weakThis = get_weak()](auto&&, auto&& arg) {
|
||||
if (auto self{ weakThis.get() })
|
||||
{
|
||||
self->_OpenJsonHandlers(nullptr, arg);
|
||||
}
|
||||
});
|
||||
contentFrame().Navigate(xaml_typename<Editor::ReadOnlyActions>(), actionsState);
|
||||
}
|
||||
contentFrame().Navigate(xaml_typename<Editor::Actions>(), winrt::make<ActionsPageNavigationState>(_settingsClone));
|
||||
}
|
||||
else if (clickedItemTag == globalProfileTag)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -77,9 +77,6 @@
|
|||
<DependentUpon>Appearances.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</ClInclude>
|
||||
<ClInclude Include="ReadOnlyActions.h">
|
||||
<DependentUpon>ReadOnlyActions.xaml</DependentUpon>
|
||||
</ClInclude>
|
||||
<ClInclude Include="Rendering.h">
|
||||
<DependentUpon>Rendering.xaml</DependentUpon>
|
||||
</ClInclude>
|
||||
|
|
@ -121,9 +118,6 @@
|
|||
<Page Include="Profiles.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="ReadOnlyActions.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
<Page Include="Appearances.xaml">
|
||||
<SubType>Designer</SubType>
|
||||
</Page>
|
||||
|
|
@ -177,9 +171,6 @@
|
|||
<DependentUpon>Appearances.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</ClCompile>
|
||||
<ClCompile Include="ReadOnlyActions.cpp">
|
||||
<DependentUpon>ReadOnlyActions.xaml</DependentUpon>
|
||||
</ClCompile>
|
||||
<ClCompile Include="Rendering.cpp">
|
||||
<DependentUpon>Rendering.xaml</DependentUpon>
|
||||
</ClCompile>
|
||||
|
|
@ -223,10 +214,6 @@
|
|||
<DependentUpon>Interaction.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Midl>
|
||||
<Midl Include="ReadOnlyActions.idl">
|
||||
<DependentUpon>ReadOnlyActions.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
</Midl>
|
||||
<Midl Include="Rendering.idl">
|
||||
<DependentUpon>Rendering.xaml</DependentUpon>
|
||||
<SubType>Code</SubType>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@
|
|||
<Page Include="Actions.xaml" />
|
||||
<Page Include="SettingContainerStyle.xaml" />
|
||||
<Page Include="AddProfile.xaml" />
|
||||
<Page Include="ReadOnlyActions.xaml" />
|
||||
<Page Include="KeyChordListener.xaml" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,64 +0,0 @@
|
|||
// Copyright (c) Microsoft Corporation.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
#include "pch.h"
|
||||
#include "ReadOnlyActions.h"
|
||||
#include "ReadOnlyActions.g.cpp"
|
||||
#include "ReadOnlyActionsPageNavigationState.g.cpp"
|
||||
#include "EnumEntry.h"
|
||||
|
||||
using namespace winrt::Windows::Foundation;
|
||||
using namespace winrt::Windows::System;
|
||||
using namespace winrt::Windows::UI::Core;
|
||||
using namespace winrt::Windows::UI::Xaml::Navigation;
|
||||
using namespace winrt::Microsoft::Terminal::Settings::Model;
|
||||
|
||||
namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
|
||||
{
|
||||
ReadOnlyActions::ReadOnlyActions()
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
_filteredActions = winrt::single_threaded_observable_vector<Command>();
|
||||
}
|
||||
|
||||
void ReadOnlyActions::OnNavigatedTo(const NavigationEventArgs& e)
|
||||
{
|
||||
_State = e.Parameter().as<Editor::ReadOnlyActionsPageNavigationState>();
|
||||
|
||||
std::vector<Command> keyBindingList;
|
||||
for (const auto& [_, command] : _State.Settings().GlobalSettings().ActionMap().NameMap())
|
||||
{
|
||||
// Filter out nested commands, and commands that aren't bound to a
|
||||
// key. This page is currently just for displaying the actions that
|
||||
// _are_ bound to keys.
|
||||
if (command.HasNestedCommands() || !command.Keys())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
keyBindingList.push_back(command);
|
||||
}
|
||||
std::sort(begin(keyBindingList), end(keyBindingList), CommandComparator{});
|
||||
_filteredActions = single_threaded_observable_vector<Command>(std::move(keyBindingList));
|
||||
}
|
||||
|
||||
Collections::IObservableVector<Command> ReadOnlyActions::FilteredActions()
|
||||
{
|
||||
return _filteredActions;
|
||||
}
|
||||
|
||||
void ReadOnlyActions::_OpenSettingsClick(const IInspectable& /*sender*/,
|
||||
const Windows::UI::Xaml::RoutedEventArgs& /*eventArgs*/)
|
||||
{
|
||||
const CoreWindow window = CoreWindow::GetForCurrentThread();
|
||||
const auto rAltState = window.GetKeyState(VirtualKey::RightMenu);
|
||||
const auto lAltState = window.GetKeyState(VirtualKey::LeftMenu);
|
||||
const bool altPressed = WI_IsFlagSet(lAltState, CoreVirtualKeyStates::Down) ||
|
||||
WI_IsFlagSet(rAltState, CoreVirtualKeyStates::Down);
|
||||
|
||||
const auto target = altPressed ? SettingsTarget::DefaultsFile : SettingsTarget::SettingsFile;
|
||||
|
||||
_State.RequestOpenJson(target);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
// Copyright (c) Microsoft Corporation.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "ReadOnlyActions.g.h"
|
||||
#include "ReadOnlyActionsPageNavigationState.g.h"
|
||||
#include "Utils.h"
|
||||
|
||||
namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
|
||||
{
|
||||
struct CommandComparator
|
||||
{
|
||||
bool operator()(const Model::Command& lhs, const Model::Command& rhs) const
|
||||
{
|
||||
return lhs.Name() < rhs.Name();
|
||||
}
|
||||
};
|
||||
|
||||
struct ReadOnlyActionsPageNavigationState : ReadOnlyActionsPageNavigationStateT<ReadOnlyActionsPageNavigationState>
|
||||
{
|
||||
public:
|
||||
ReadOnlyActionsPageNavigationState(const Model::CascadiaSettings& settings) :
|
||||
_Settings{ settings } {}
|
||||
|
||||
void RequestOpenJson(const Model::SettingsTarget target)
|
||||
{
|
||||
_OpenJsonHandlers(nullptr, target);
|
||||
}
|
||||
|
||||
WINRT_PROPERTY(Model::CascadiaSettings, Settings, nullptr)
|
||||
TYPED_EVENT(OpenJson, Windows::Foundation::IInspectable, Model::SettingsTarget);
|
||||
};
|
||||
|
||||
struct ReadOnlyActions : public HasScrollViewer<ReadOnlyActions>, ReadOnlyActionsT<ReadOnlyActions>
|
||||
{
|
||||
public:
|
||||
ReadOnlyActions();
|
||||
|
||||
void OnNavigatedTo(const winrt::Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
|
||||
|
||||
Windows::Foundation::Collections::IObservableVector<winrt::Microsoft::Terminal::Settings::Model::Command> FilteredActions();
|
||||
|
||||
WINRT_PROPERTY(Editor::ReadOnlyActionsPageNavigationState, State, nullptr);
|
||||
|
||||
private:
|
||||
friend struct ReadOnlyActionsT<ReadOnlyActions>; // for Xaml to bind events
|
||||
Windows::Foundation::Collections::IObservableVector<winrt::Microsoft::Terminal::Settings::Model::Command> _filteredActions{ nullptr };
|
||||
|
||||
void _OpenSettingsClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
|
||||
};
|
||||
}
|
||||
|
||||
namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
|
||||
{
|
||||
BASIC_FACTORY(ReadOnlyActions);
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
// Copyright (c) Microsoft Corporation.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
import "EnumEntry.idl";
|
||||
|
||||
namespace Microsoft.Terminal.Settings.Editor
|
||||
{
|
||||
runtimeclass ReadOnlyActionsPageNavigationState
|
||||
{
|
||||
Microsoft.Terminal.Settings.Model.CascadiaSettings Settings;
|
||||
void RequestOpenJson(Microsoft.Terminal.Settings.Model.SettingsTarget target);
|
||||
event Windows.Foundation.TypedEventHandler<Object, Microsoft.Terminal.Settings.Model.SettingsTarget> OpenJson;
|
||||
};
|
||||
|
||||
[default_interface] runtimeclass ReadOnlyActions : Windows.UI.Xaml.Controls.Page
|
||||
{
|
||||
ReadOnlyActions();
|
||||
ReadOnlyActionsPageNavigationState State { get; };
|
||||
|
||||
IObservableVector<Microsoft.Terminal.Settings.Model.Command> FilteredActions { get; };
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -1,222 +0,0 @@
|
|||
<!--
|
||||
Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
|
||||
the MIT License. See LICENSE in the project root for license information.
|
||||
-->
|
||||
<Page x:Class="Microsoft.Terminal.Settings.Editor.ReadOnlyActions"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:SettingsModel="using:Microsoft.Terminal.Settings.Model"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:local="using:Microsoft.Terminal.Settings.Editor"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
|
||||
mc:Ignorable="d">
|
||||
|
||||
<Page.Resources>
|
||||
<ResourceDictionary>
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<ResourceDictionary Source="CommonResources.xaml" />
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
<!--
|
||||
Template for actions. This is _heavily_ copied from the command
|
||||
palette, with modifications:
|
||||
* We don't need to use a HighlightedTextControl, because we're
|
||||
not filtering this list
|
||||
* We don't need the chevron for nested commands
|
||||
* We're not displaying the icon
|
||||
* We're binding directly to a Command, not a FilteredCommand
|
||||
|
||||
If we wanted to reuse the command palette's list more directly,
|
||||
that's theoretically possible, but then it would need to be
|
||||
lifted out of TerminalApp and either moved into the
|
||||
TerminalSettingsEditor or moved to it's own project consumed by
|
||||
both TSE and TerminalApp.
|
||||
-->
|
||||
<DataTemplate x:Key="GeneralItemTemplate"
|
||||
x:DataType="SettingsModel:Command">
|
||||
|
||||
<!--
|
||||
This HorizontalContentAlignment="Stretch" is important
|
||||
to make sure it takes the entire width of the line
|
||||
-->
|
||||
<ListViewItem HorizontalContentAlignment="Stretch"
|
||||
AutomationProperties.AcceleratorKey="{x:Bind KeyChordText, Mode=OneWay}"
|
||||
AutomationProperties.Name="{x:Bind Name, Mode=OneWay}">
|
||||
|
||||
<Grid HorizontalAlignment="Stretch"
|
||||
ColumnSpacing="8">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<!-- command label -->
|
||||
<ColumnDefinition Width="*" />
|
||||
<!-- key chord -->
|
||||
<ColumnDefinition Width="32" />
|
||||
<!-- gutter for scrollbar -->
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<TextBlock Grid.Column="0"
|
||||
HorizontalAlignment="Left"
|
||||
Text="{x:Bind Name, Mode=OneWay}" />
|
||||
|
||||
<!--
|
||||
Inexplicably, we don't need to set the
|
||||
AutomationProperties to Raw here, unlike in the
|
||||
CommandPalette. We're not quite sure why.
|
||||
-->
|
||||
<Border Grid.Column="1"
|
||||
Padding="2,0,2,0"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Center"
|
||||
Style="{ThemeResource KeyChordBorderStyle}">
|
||||
|
||||
<TextBlock FontSize="12"
|
||||
Style="{ThemeResource KeyChordTextBlockStyle}"
|
||||
Text="{x:Bind KeyChordText, Mode=OneWay}" />
|
||||
</Border>
|
||||
</Grid>
|
||||
</ListViewItem>
|
||||
</DataTemplate>
|
||||
|
||||
<!-- These resources again, HEAVILY copied from the command palette -->
|
||||
<ResourceDictionary.ThemeDictionaries>
|
||||
<ResourceDictionary x:Key="Dark">
|
||||
<!-- TextBox colors ! -->
|
||||
<SolidColorBrush x:Key="TextControlBackground"
|
||||
Color="#333333" />
|
||||
<SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush"
|
||||
Color="#B5B5B5" />
|
||||
<SolidColorBrush x:Key="TextControlForeground"
|
||||
Color="#B5B5B5" />
|
||||
<SolidColorBrush x:Key="TextControlBorderBrush"
|
||||
Color="#404040" />
|
||||
<SolidColorBrush x:Key="TextControlButtonForeground"
|
||||
Color="#B5B5B5" />
|
||||
|
||||
<SolidColorBrush x:Key="TextControlBackgroundPointerOver"
|
||||
Color="#404040" />
|
||||
<SolidColorBrush x:Key="TextControlForegroundPointerOver"
|
||||
Color="#FFFFFF" />
|
||||
<SolidColorBrush x:Key="TextControlBorderBrushPointerOver"
|
||||
Color="#404040" />
|
||||
<SolidColorBrush x:Key="TextControlButtonForegroundPointerOver"
|
||||
Color="#FF4343" />
|
||||
|
||||
<SolidColorBrush x:Key="TextControlBackgroundFocused"
|
||||
Color="#333333" />
|
||||
<SolidColorBrush x:Key="TextControlForegroundFocused"
|
||||
Color="#FFFFFF" />
|
||||
<SolidColorBrush x:Key="TextControlBorderBrushFocused"
|
||||
Color="#404040" />
|
||||
<SolidColorBrush x:Key="TextControlButtonForegroundPressed"
|
||||
Color="#FFFFFF" />
|
||||
<SolidColorBrush x:Key="TextControlButtonBackgroundPressed"
|
||||
Color="#FF4343" />
|
||||
|
||||
<!-- KeyChordText styles -->
|
||||
<Style x:Key="KeyChordBorderStyle"
|
||||
TargetType="Border">
|
||||
<Setter Property="BorderThickness" Value="1" />
|
||||
<Setter Property="CornerRadius" Value="1" />
|
||||
<Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
|
||||
<Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
|
||||
</Style>
|
||||
<Style x:Key="KeyChordTextBlockStyle"
|
||||
TargetType="TextBlock">
|
||||
<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
|
||||
</Style>
|
||||
|
||||
</ResourceDictionary>
|
||||
<ResourceDictionary x:Key="Light">
|
||||
<!-- TextBox colors ! -->
|
||||
<SolidColorBrush x:Key="TextControlBackground"
|
||||
Color="#CCCCCC" />
|
||||
<SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush"
|
||||
Color="#636363" />
|
||||
<SolidColorBrush x:Key="TextControlBorderBrush"
|
||||
Color="#636363" />
|
||||
<SolidColorBrush x:Key="TextControlButtonForeground"
|
||||
Color="#636363" />
|
||||
|
||||
<SolidColorBrush x:Key="TextControlBackgroundPointerOver"
|
||||
Color="#DADADA" />
|
||||
<SolidColorBrush x:Key="TextControlBorderBrushPointerOver"
|
||||
Color="#636363" />
|
||||
<SolidColorBrush x:Key="TextControlButtonForegroundPointerOver"
|
||||
Color="#FF4343" />
|
||||
|
||||
<SolidColorBrush x:Key="TextControlBackgroundFocused"
|
||||
Color="#CCCCCC" />
|
||||
<SolidColorBrush x:Key="TextControlBorderBrushFocused"
|
||||
Color="#636363" />
|
||||
<SolidColorBrush x:Key="TextControlButtonForegroundPressed"
|
||||
Color="#FFFFFF" />
|
||||
<SolidColorBrush x:Key="TextControlButtonBackgroundPressed"
|
||||
Color="#FF4343" />
|
||||
|
||||
<!-- KeyChordText styles -->
|
||||
<Style x:Key="KeyChordBorderStyle"
|
||||
TargetType="Border">
|
||||
<Setter Property="BorderThickness" Value="1" />
|
||||
<Setter Property="CornerRadius" Value="1" />
|
||||
<Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
|
||||
<Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
|
||||
</Style>
|
||||
<Style x:Key="KeyChordTextBlockStyle"
|
||||
TargetType="TextBlock">
|
||||
<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
|
||||
</Style>
|
||||
|
||||
</ResourceDictionary>
|
||||
<ResourceDictionary x:Key="HighContrast">
|
||||
|
||||
<!-- KeyChordText styles (use XAML defaults for High Contrast theme) -->
|
||||
<Style x:Key="KeyChordBorderStyle"
|
||||
TargetType="Border" />
|
||||
<Style x:Key="KeyChordTextBlockStyle"
|
||||
TargetType="TextBlock" />
|
||||
|
||||
</ResourceDictionary>
|
||||
</ResourceDictionary.ThemeDictionaries>
|
||||
|
||||
|
||||
</ResourceDictionary>
|
||||
</Page.Resources>
|
||||
|
||||
<ScrollViewer ViewChanging="ViewChanging">
|
||||
<StackPanel Style="{StaticResource SettingsStackStyle}">
|
||||
<TextBlock x:Uid="Globals_KeybindingsDisclaimer"
|
||||
Style="{StaticResource DisclaimerStyle}" />
|
||||
|
||||
<!--
|
||||
The Nav_OpenJSON resource just so happens to have a .Content
|
||||
and .Tooltip that are _exactly_ what we're looking for here.
|
||||
-->
|
||||
|
||||
<HyperlinkButton x:Uid="Nav_OpenJSON"
|
||||
Click="_OpenSettingsClick" />
|
||||
|
||||
<!-- Keybindings -->
|
||||
|
||||
<!--
|
||||
NOTE: Globals_Keybindings.Header is not defined, because that
|
||||
would result in the page having "Keybindings" displayed twice, which
|
||||
looks quite redundant
|
||||
-->
|
||||
<ContentPresenter x:Uid="Globals_Keybindings"
|
||||
Margin="0">
|
||||
|
||||
<ListView HorizontalAlignment="Stretch"
|
||||
VerticalAlignment="Stretch"
|
||||
AllowDrop="False"
|
||||
CanReorderItems="False"
|
||||
IsItemClickEnabled="False"
|
||||
ItemTemplate="{StaticResource GeneralItemTemplate}"
|
||||
ItemsSource="{x:Bind FilteredActions, Mode=OneWay}"
|
||||
SelectionMode="None" />
|
||||
|
||||
</ContentPresenter>
|
||||
|
||||
</StackPanel>
|
||||
|
||||
</ScrollViewer>
|
||||
</Page>
|
||||
|
|
@ -14,7 +14,6 @@
|
|||
<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
|
||||
<!-- ========================= Headers ======================== -->
|
||||
<ItemGroup>
|
||||
<ClInclude Include="VcDevCmdGenerator.h" />
|
||||
<ClInclude Include="VisualStudioGenerator.h" />
|
||||
<ClInclude Include="DefaultTerminal.h">
|
||||
<DependentUpon>DefaultTerminal.idl</DependentUpon>
|
||||
|
|
@ -85,7 +84,6 @@
|
|||
</ItemGroup>
|
||||
<!-- ========================= Cpp Files ======================== -->
|
||||
<ItemGroup>
|
||||
<ClCompile Include="VcDevCmdGenerator.cpp" />
|
||||
<ClCompile Include="VisualStudioGenerator.cpp" />
|
||||
<ClCompile Include="DefaultTerminal.cpp">
|
||||
<DependentUpon>DefaultTerminal.idl</DependentUpon>
|
||||
|
|
@ -267,4 +265,4 @@
|
|||
</Target>
|
||||
<Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
|
||||
<Import Project="..\..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.2.3.2262\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets" Condition="Exists('..\..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.2.3.2262\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" />
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -46,9 +46,6 @@
|
|||
<ClCompile Include="VsSetupConfiguration.cpp">
|
||||
<Filter>profileGeneration</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="VcDevCmdGenerator.cpp">
|
||||
<Filter>profileGeneration</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="pch.h" />
|
||||
|
|
@ -95,9 +92,6 @@
|
|||
<ClInclude Include="VsSetupConfiguration.h">
|
||||
<Filter>profileGeneration</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="VcDevCmdGenerator.h">
|
||||
<Filter>profileGeneration</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Midl Include="ActionArgs.idl" />
|
||||
|
|
@ -129,4 +123,4 @@
|
|||
<UniqueIdentifier>{81a6314f-aa5b-4533-a499-13bc3a5c4af0}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -1,94 +0,0 @@
|
|||
// Copyright (c) Microsoft Corporation.
|
||||
// Licensed under the MIT license.
|
||||
|
||||
#include "pch.h"
|
||||
#include "DynamicProfileUtils.h"
|
||||
#include "VcDevCmdGenerator.h"
|
||||
|
||||
using namespace winrt::Microsoft::Terminal::Settings::Model;
|
||||
|
||||
void VcDevCmdGenerator::GenerateProfiles(const VsSetupConfiguration::VsSetupInstance& instance, bool hidden, std::vector<winrt::com_ptr<implementation::Profile>>& profiles) const
|
||||
{
|
||||
try
|
||||
{
|
||||
const std::filesystem::path root{ GetVcCmdScriptDirectory(instance) };
|
||||
if (!std::filesystem::exists(root))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// x64 environments only installed on 64-bit machines.
|
||||
#ifdef _WIN64
|
||||
const auto vcvars64 = root / L"vcvars64.bat";
|
||||
if (std::filesystem::exists(vcvars64))
|
||||
{
|
||||
auto profile = CreateProfile(instance, L"x64", vcvars64, hidden);
|
||||
profiles.emplace_back(std::move(profile));
|
||||
|
||||
// Only the VC environment for the matching architecture should be shown by default.
|
||||
hidden = true;
|
||||
}
|
||||
|
||||
const auto vcvarsamd64_x86 = root / L"vcvarsamd64_x86.bat";
|
||||
if (std::filesystem::exists(vcvarsamd64_x86))
|
||||
{
|
||||
auto profile = CreateProfile(instance, L"x64_x86", vcvarsamd64_x86, true);
|
||||
profiles.emplace_back(std::move(profile));
|
||||
}
|
||||
|
||||
const auto vcvarsx86_amd64 = root / L"vcvarsx86_amd64.bat";
|
||||
if (std::filesystem::exists(vcvarsx86_amd64))
|
||||
{
|
||||
auto profile = CreateProfile(instance, L"x86_x64", vcvarsx86_amd64, true);
|
||||
profiles.emplace_back(std::move(profile));
|
||||
}
|
||||
#endif // _WIN64
|
||||
|
||||
const auto vcvars32 = root / L"vcvars32.bat";
|
||||
if (std::filesystem::exists(vcvars32))
|
||||
{
|
||||
auto profile = CreateProfile(instance, L"x86", vcvars32, hidden);
|
||||
profiles.emplace_back(std::move(profile));
|
||||
}
|
||||
}
|
||||
CATCH_LOG();
|
||||
}
|
||||
|
||||
winrt::com_ptr<implementation::Profile> VcDevCmdGenerator::CreateProfile(const VsSetupConfiguration::VsSetupInstance& instance, const std::wstring_view& prefix, const std::filesystem::path& path, bool hidden) const
|
||||
{
|
||||
const auto seed = GetProfileGuidSeed(instance, path);
|
||||
const winrt::guid profileGuid{ ::Microsoft::Console::Utils::CreateV5Uuid(TERMINAL_PROFILE_NAMESPACE_GUID, gsl::as_bytes(gsl::make_span(seed))) };
|
||||
|
||||
auto profile = winrt::make_self<implementation::Profile>(profileGuid);
|
||||
profile->Name(winrt::hstring{ GetProfileName(instance, prefix) });
|
||||
profile->Commandline(winrt::hstring{ GetProfileCommandLine(path) });
|
||||
profile->StartingDirectory(winrt::hstring{ instance.GetInstallationPath() });
|
||||
profile->Icon(winrt::hstring{ GetProfileIconPath() });
|
||||
profile->Hidden(hidden);
|
||||
|
||||
return profile;
|
||||
}
|
||||
|
||||
std::wstring VcDevCmdGenerator::GetProfileGuidSeed(const VsSetupConfiguration::VsSetupInstance& instance, const std::filesystem::path& path) const
|
||||
{
|
||||
return L"VsDevCmd" + instance.GetInstanceId() + path.native();
|
||||
}
|
||||
|
||||
std::wstring VcDevCmdGenerator::GetProfileName(const VsSetupConfiguration::VsSetupInstance& instance, const std::wstring_view& prefix) const
|
||||
{
|
||||
std::wstring name{ prefix + L" Native Tools Command Prompt for VS " };
|
||||
name.append(instance.GetProfileNameSuffix());
|
||||
return name;
|
||||
}
|
||||
|
||||
std::wstring VcDevCmdGenerator::GetProfileCommandLine(const std::filesystem::path& path) const
|
||||
{
|
||||
std::wstring commandLine{ L"cmd.exe /k \"" + path.native() + L"\"" };
|
||||
|
||||
return commandLine;
|
||||
}
|
||||
|
||||
std::wstring VcDevCmdGenerator::GetVcCmdScriptDirectory(const VsSetupConfiguration::VsSetupInstance& instance) const
|
||||
{
|
||||
return instance.ResolvePath(L"VC\\Auxiliary\\Build\\");
|
||||
}
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
/*++
|
||||
Copyright (c) Microsoft Corporation
|
||||
Licensed under the MIT license.
|
||||
|
||||
Module Name:
|
||||
- VcDevCmdGenerator
|
||||
|
||||
Abstract:
|
||||
- Dynamic profile generator for Visual C++ development environments.
|
||||
|
||||
Author(s):
|
||||
- Heath Stewart - September 2021
|
||||
|
||||
--*/
|
||||
|
||||
#pragma once
|
||||
#include "VisualStudioGenerator.h"
|
||||
#include "VsSetupConfiguration.h"
|
||||
|
||||
namespace winrt::Microsoft::Terminal::Settings::Model
|
||||
{
|
||||
class VcDevCmdGenerator final : public VisualStudioGenerator::IVisualStudioProfileGenerator
|
||||
{
|
||||
public:
|
||||
void GenerateProfiles(const VsSetupConfiguration::VsSetupInstance& instance, bool hidden, std::vector<winrt::com_ptr<implementation::Profile>>& profiles) const override;
|
||||
|
||||
private:
|
||||
winrt::com_ptr<implementation::Profile> CreateProfile(const VsSetupConfiguration::VsSetupInstance& instance, const std::wstring_view& prefix, const std::filesystem::path& path, bool hidden) const;
|
||||
|
||||
std::wstring GetProfileIconPath() const
|
||||
{
|
||||
return L"ms-appx:///ProfileIcons/{0caa0dad-35be-5f56-a8ff-afceeeaa6101}.png";
|
||||
}
|
||||
|
||||
std::wstring GetProfileGuidSeed(const VsSetupConfiguration::VsSetupInstance& instance, const std::filesystem::path& path) const;
|
||||
std::wstring GetProfileName(const VsSetupConfiguration::VsSetupInstance& instance, const std::wstring_view& prefix) const;
|
||||
std::wstring GetProfileCommandLine(const std::filesystem::path& path) const;
|
||||
std::wstring GetVcCmdScriptDirectory(const VsSetupConfiguration::VsSetupInstance& instance) const;
|
||||
};
|
||||
};
|
||||
|
|
@ -4,7 +4,6 @@
|
|||
#include "pch.h"
|
||||
#include "DynamicProfileUtils.h"
|
||||
#include "VisualStudioGenerator.h"
|
||||
#include "VcDevCmdGenerator.h"
|
||||
#include "VsDevCmdGenerator.h"
|
||||
#include "VsDevShellGenerator.h"
|
||||
|
||||
|
|
@ -20,7 +19,6 @@ void VisualStudioGenerator::GenerateProfiles(std::vector<winrt::com_ptr<implemen
|
|||
const auto instances = VsSetupConfiguration::QueryInstances();
|
||||
|
||||
VsDevCmdGenerator devCmdGenerator;
|
||||
VcDevCmdGenerator vcCmdGenerator;
|
||||
VsDevShellGenerator devShellGenerator;
|
||||
|
||||
// Instances are ordered from latest to oldest. Hide all but the profiles for the latest instance.
|
||||
|
|
@ -28,9 +26,7 @@ void VisualStudioGenerator::GenerateProfiles(std::vector<winrt::com_ptr<implemen
|
|||
for (auto const& instance : instances)
|
||||
{
|
||||
devCmdGenerator.GenerateProfiles(instance, hidden, profiles);
|
||||
vcCmdGenerator.GenerateProfiles(instance, hidden, profiles);
|
||||
devShellGenerator.GenerateProfiles(instance, hidden, profiles);
|
||||
|
||||
hidden = true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,8 +38,15 @@ std::wstring VsDevCmdGenerator::GetProfileName(const VsSetupConfiguration::VsSet
|
|||
|
||||
std::wstring VsDevCmdGenerator::GetProfileCommandLine(const VsSetupConfiguration::VsSetupInstance& instance) const
|
||||
{
|
||||
std::wstring commandLine{ L"cmd.exe /k \"" + GetDevCmdScriptPath(instance) + L"\"" };
|
||||
|
||||
std::wstring commandLine;
|
||||
commandLine.reserve(256);
|
||||
commandLine.append(LR"(cmd.exe /k ")");
|
||||
commandLine.append(GetDevCmdScriptPath(instance));
|
||||
#if defined(_M_ARM64)
|
||||
commandLine.append(LR"(" -arch=arm64 -host_arch=x64)");
|
||||
#elif defined(_M_AMD64)
|
||||
commandLine.append(LR"(" -arch=x64 -host_arch=x64)");
|
||||
#endif
|
||||
return commandLine;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,10 +42,19 @@ std::wstring VsDevShellGenerator::GetProfileCommandLine(const VsSetupConfigurati
|
|||
// The triple-quotes are a PowerShell path escape sequence that can safely be stored in a JSON object.
|
||||
// The "SkipAutomaticLocation" parameter will prevent "Enter-VsDevShell" from automatically setting the shell path
|
||||
// so the path in the profile will be used instead.
|
||||
std::wstring commandLine{ L"powershell.exe -NoExit -Command \"& {" };
|
||||
commandLine.append(L"Import-Module \"\"\"" + GetDevShellModulePath(instance) + L"\"\"\";");
|
||||
commandLine.append(L"Enter-VsDevShell " + instance.GetInstanceId() + L" -SkipAutomaticLocation");
|
||||
commandLine.append(L"}\"");
|
||||
std::wstring commandLine;
|
||||
commandLine.reserve(256);
|
||||
commandLine.append(LR"(powershell.exe -NoExit -Command "&{Import-Module """)");
|
||||
commandLine.append(GetDevShellModulePath(instance));
|
||||
commandLine.append(LR"("""; Enter-VsDevShell )");
|
||||
commandLine.append(instance.GetInstanceId());
|
||||
#if defined(_M_ARM64)
|
||||
commandLine.append(LR"( -SkipAutomaticLocation -DevCmdArguments """-arch=arm64 -host_arch=x64"""}")");
|
||||
#elif defined(_M_AMD64)
|
||||
commandLine.append(LR"( -SkipAutomaticLocation -DevCmdArguments """-arch=x64 -host_arch=x64"""}")");
|
||||
#else
|
||||
commandLine.append(LR"( -SkipAutomaticLocation}")");
|
||||
#endif
|
||||
|
||||
return commandLine;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,17 +21,11 @@ std::vector<VsSetupConfiguration::VsSetupInstance> VsSetupConfiguration::QueryIn
|
|||
wil::com_ptr<IEnumSetupInstances> e;
|
||||
THROW_IF_FAILED(pQuery->EnumInstances(&e));
|
||||
|
||||
ComPtrSetupInstance rgpInstance;
|
||||
auto result = e->Next(1, &rgpInstance, nullptr);
|
||||
while (S_OK == result)
|
||||
for (ComPtrSetupInstance rgpInstance; S_OK == THROW_IF_FAILED(e->Next(1, &rgpInstance, nullptr));)
|
||||
{
|
||||
// wrap the COM pointers in a friendly interface
|
||||
instances.emplace_back(VsSetupInstance{ pQuery, rgpInstance });
|
||||
result = e->Next(1, &rgpInstance, nullptr);
|
||||
instances.emplace_back(pQuery, std::move(rgpInstance));
|
||||
}
|
||||
|
||||
THROW_IF_FAILED(result);
|
||||
|
||||
// Sort instances based on version and install date from latest to oldest.
|
||||
std::sort(instances.begin(), instances.end(), [](const VsSetupInstance& a, const VsSetupInstance& b) {
|
||||
auto const aVersion = a.GetComparableVersion();
|
||||
|
|
@ -123,7 +117,7 @@ std::wstring VsSetupConfiguration::GetStringProperty(ISetupPropertyStore* pProps
|
|||
}
|
||||
|
||||
wil::unique_variant var;
|
||||
if (FAILED(pProps->GetValue(name.data(), &var)))
|
||||
if (FAILED(pProps->GetValue(name.data(), &var)) || var.vt != VT_BSTR)
|
||||
{
|
||||
return std::wstring{};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,12 +56,12 @@ namespace winrt::Microsoft::Terminal::Settings::Model
|
|||
return VsSetupConfiguration::GetInstallationVersion(inst.get());
|
||||
}
|
||||
|
||||
unsigned long long GetComparableInstallDate() const
|
||||
unsigned long long GetComparableInstallDate() const noexcept
|
||||
{
|
||||
return installDate;
|
||||
}
|
||||
|
||||
unsigned long long GetComparableVersion() const
|
||||
unsigned long long GetComparableVersion() const noexcept
|
||||
{
|
||||
return version;
|
||||
}
|
||||
|
|
@ -114,9 +114,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model
|
|||
return profileNameSuffix;
|
||||
}
|
||||
|
||||
private:
|
||||
friend class VsSetupConfiguration;
|
||||
|
||||
VsSetupInstance(ComPtrSetupQuery pQuery, ComPtrSetupInstance pInstance) :
|
||||
query(pQuery), // Copy and AddRef the query object.
|
||||
inst(std::move(pInstance)), // Take ownership of the instance object.
|
||||
|
|
@ -126,6 +123,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model
|
|||
{
|
||||
}
|
||||
|
||||
private:
|
||||
ComPtrSetupQuery query;
|
||||
ComPtrSetupInstance inst;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
// Miscellaneous
|
||||
"confirmCloseAllTabs": true,
|
||||
"startOnUserLogin": false,
|
||||
"startOnUserLogin": false,
|
||||
"theme": "system",
|
||||
"snapToGridOnResize": true,
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
// Miscellaneous
|
||||
"confirmCloseAllTabs": true,
|
||||
"startOnUserLogin": false,
|
||||
"startOnUserLogin": false,
|
||||
"theme": "system",
|
||||
"snapToGridOnResize": true,
|
||||
"disableAnimations": false,
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ AppHost::AppHost() noexcept :
|
|||
_window->SetAlwaysOnTop(_logic.GetInitialAlwaysOnTop());
|
||||
_window->MakeWindow();
|
||||
|
||||
_windowManager.GetWindowLayoutRequested([this](auto&&, const winrt::Microsoft::Terminal::Remoting::GetWindowLayoutArgs& args) {
|
||||
_GetWindowLayoutRequestedToken = _windowManager.GetWindowLayoutRequested([this](auto&&, const winrt::Microsoft::Terminal::Remoting::GetWindowLayoutArgs& args) {
|
||||
// The peasants are running on separate threads, so they'll need to
|
||||
// swap what context they are in to the ui thread to get the actual layout.
|
||||
args.WindowLayoutJsonAsync(_GetWindowLayoutAsync());
|
||||
|
|
@ -401,23 +401,42 @@ void AppHost::LastTabClosed(const winrt::Windows::Foundation::IInspectable& /*se
|
|||
_HideNotificationIconRequested();
|
||||
}
|
||||
|
||||
// We don't want to try to save layouts if we are about to close
|
||||
_getWindowLayoutThrottler.reset();
|
||||
_windowManager.GetWindowLayoutRequested(_GetWindowLayoutRequestedToken);
|
||||
// Remove ourself from the list of peasants so that we aren't included in
|
||||
// any future requests. This will also mean we block until any existing
|
||||
// event handler finishes.
|
||||
_windowManager.SignalClose();
|
||||
|
||||
_window->Close();
|
||||
}
|
||||
|
||||
LaunchPosition AppHost::_GetWindowLaunchPosition()
|
||||
{
|
||||
// Get the position of the current window. This includes the
|
||||
// non-client already.
|
||||
const auto window = _window->GetWindowRect();
|
||||
|
||||
const auto dpi = _window->GetCurrentDpi();
|
||||
const auto nonClientArea = _window->GetNonClientFrame(dpi);
|
||||
|
||||
// The nonClientArea adjustment is negative, so subtract that out.
|
||||
// This way we save the user-visible location of the terminal.
|
||||
LaunchPosition pos{};
|
||||
pos.X = window.left - nonClientArea.left;
|
||||
pos.Y = window.top;
|
||||
// If we started saving before closing, but didn't resume the event handler
|
||||
// until after _window might be a nullptr.
|
||||
if (!_window)
|
||||
{
|
||||
return pos;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
// Get the position of the current window. This includes the
|
||||
// non-client already.
|
||||
const auto window = _window->GetWindowRect();
|
||||
|
||||
const auto dpi = _window->GetCurrentDpi();
|
||||
const auto nonClientArea = _window->GetNonClientFrame(dpi);
|
||||
|
||||
// The nonClientArea adjustment is negative, so subtract that out.
|
||||
// This way we save the user-visible location of the terminal.
|
||||
pos.X = window.left - nonClientArea.left;
|
||||
pos.Y = window.top;
|
||||
}
|
||||
CATCH_LOG();
|
||||
|
||||
return pos;
|
||||
}
|
||||
|
|
@ -723,10 +742,15 @@ winrt::Windows::Foundation::IAsyncOperation<winrt::hstring> AppHost::_GetWindowL
|
|||
{
|
||||
winrt::apartment_context peasant_thread;
|
||||
|
||||
winrt::hstring layoutJson = L"";
|
||||
// Use the main thread since we are accessing controls.
|
||||
co_await winrt::resume_foreground(_logic.GetRoot().Dispatcher());
|
||||
const auto pos = _GetWindowLaunchPosition();
|
||||
const auto layoutJson = _logic.GetWindowLayoutJson(pos);
|
||||
try
|
||||
{
|
||||
const auto pos = _GetWindowLaunchPosition();
|
||||
layoutJson = _logic.GetWindowLayoutJson(pos);
|
||||
}
|
||||
CATCH_LOG()
|
||||
|
||||
// go back to give the result to the peasant.
|
||||
co_await peasant_thread;
|
||||
|
|
@ -1323,14 +1347,23 @@ void AppHost::_WindowMoved()
|
|||
|
||||
const auto root{ _logic.GetRoot() };
|
||||
|
||||
// This is basically DismissAllPopups which is also in
|
||||
// TerminalSettingsEditor/Utils.h
|
||||
// There isn't a good place that's shared between these two files, but
|
||||
// it's only 5 LOC so whatever.
|
||||
const auto popups{ Media::VisualTreeHelper::GetOpenPopupsForXamlRoot(root.XamlRoot()) };
|
||||
for (const auto& p : popups)
|
||||
try
|
||||
{
|
||||
p.IsOpen(false);
|
||||
// This is basically DismissAllPopups which is also in
|
||||
// TerminalSettingsEditor/Utils.h
|
||||
// There isn't a good place that's shared between these two files, but
|
||||
// it's only 5 LOC so whatever.
|
||||
const auto popups{ Media::VisualTreeHelper::GetOpenPopupsForXamlRoot(root.XamlRoot()) };
|
||||
for (const auto& p : popups)
|
||||
{
|
||||
p.IsOpen(false);
|
||||
}
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
// We purposely don't log here, because this is exceptionally noisy,
|
||||
// especially on startup, when we're moving the window into place
|
||||
// but might not have a real xamlRoot yet.
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -114,4 +114,5 @@ private:
|
|||
winrt::event_token _NotificationIconPressedToken;
|
||||
winrt::event_token _ShowNotificationIconContextMenuToken;
|
||||
winrt::event_token _NotificationIconMenuItemSelectedToken;
|
||||
winrt::event_token _GetWindowLayoutRequestedToken;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,12 +10,6 @@
|
|||
</alwaysDisabledBrandingTokens>
|
||||
</feature>
|
||||
|
||||
<feature>
|
||||
<name>Feature_EditableActionsPage</name>
|
||||
<description>The Actions page in the settings UI should allow users to edit actions.</description>
|
||||
<stage>AlwaysEnabled</stage>
|
||||
</feature>
|
||||
|
||||
<feature>
|
||||
<name>Feature_EditableUnfocusedAppearance</name>
|
||||
<description>The unfocused appearance section in profiles in the SUI that allows users to create and edit unfocused appearances.</description>
|
||||
|
|
|
|||
|
|
@ -387,7 +387,7 @@ void ApiRoutines::GetNumberOfConsoleMouseButtonsImpl(ULONG& buttons) noexcept
|
|||
RETURN_HR_IF(E_INVALIDARG, WI_IsAnyFlagSet(mode, ~(INPUT_MODES | PRIVATE_MODES)));
|
||||
|
||||
// ECHO on with LINE off is invalid.
|
||||
RETURN_HR_IF(E_INVALIDARG, WI_IsFlagSet(mode, ENABLE_ECHO_INPUT) && WI_IsFlagClear(mode, ENABLE_LINE_INPUT));
|
||||
RETURN_HR_IF_EXPECTED(E_INVALIDARG, WI_IsFlagSet(mode, ENABLE_ECHO_INPUT) && WI_IsFlagClear(mode, ENABLE_LINE_INPUT));
|
||||
}
|
||||
|
||||
return S_OK;
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@
|
|||
#include "../inc/conint.h"
|
||||
#include "../propslib/DelegationConfig.hpp"
|
||||
|
||||
#include "tracing.hpp"
|
||||
|
||||
#if TIL_FEATURE_RECEIVEINCOMINGHANDOFF_ENABLED
|
||||
#include "ITerminalHandoff.h"
|
||||
#endif // TIL_FEATURE_RECEIVEINCOMINGHANDOFF_ENABLED
|
||||
|
|
@ -69,10 +71,20 @@ try
|
|||
if (SUCCEEDED(DelegationConfig::s_GetDefaultConsoleId(delegationClsid)))
|
||||
{
|
||||
Globals.handoffConsoleClsid = delegationClsid;
|
||||
TraceLoggingWrite(g_hConhostV2EventTraceProvider,
|
||||
"SrvInit_FoundDelegationConsole",
|
||||
TraceLoggingGuid(Globals.handoffConsoleClsid.value(), "ConsoleClsid"),
|
||||
TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
|
||||
TraceLoggingKeyword(TIL_KEYWORD_TRACE));
|
||||
}
|
||||
if (SUCCEEDED(DelegationConfig::s_GetDefaultTerminalId(delegationClsid)))
|
||||
{
|
||||
Globals.handoffTerminalClsid = delegationClsid;
|
||||
TraceLoggingWrite(g_hConhostV2EventTraceProvider,
|
||||
"SrvInit_FoundDelegationTerminal",
|
||||
TraceLoggingGuid(Globals.handoffTerminalClsid.value(), "TerminalClsid"),
|
||||
TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
|
||||
TraceLoggingKeyword(TIL_KEYWORD_TRACE));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -400,7 +412,16 @@ HRESULT ConsoleCreateIoThread(_In_ HANDLE Server,
|
|||
[[maybe_unused]] PCONSOLE_API_MSG connectMessage)
|
||||
try
|
||||
{
|
||||
// Create a telemetry instance here - this singleton is responsible for
|
||||
// setting up the g_hConhostV2EventTraceProvider, which is otherwise not
|
||||
// initialized in the defterm handoff at this point.
|
||||
(void)Telemetry::Instance();
|
||||
|
||||
#if !TIL_FEATURE_RECEIVEINCOMINGHANDOFF_ENABLED
|
||||
TraceLoggingWrite(g_hConhostV2EventTraceProvider,
|
||||
"SrvInit_ReceiveHandoff_Disabled",
|
||||
TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
|
||||
TraceLoggingKeyword(TIL_KEYWORD_TRACE));
|
||||
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
|
||||
#else // TIL_FEATURE_RECEIVEINCOMINGHANDOFF_ENABLED
|
||||
auto& g = ServiceLocator::LocateGlobals();
|
||||
|
|
@ -418,9 +439,19 @@ try
|
|||
|
||||
if (!g.handoffTerminalClsid)
|
||||
{
|
||||
TraceLoggingWrite(g_hConhostV2EventTraceProvider,
|
||||
"SrvInit_ReceiveHandoff_NoTerminal",
|
||||
TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
|
||||
TraceLoggingKeyword(TIL_KEYWORD_TRACE));
|
||||
return E_NOT_SET;
|
||||
}
|
||||
|
||||
TraceLoggingWrite(g_hConhostV2EventTraceProvider,
|
||||
"SrvInit_ReceiveHandoff",
|
||||
TraceLoggingGuid(g.handoffTerminalClsid.value(), "TerminalClsid"),
|
||||
TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
|
||||
TraceLoggingKeyword(TIL_KEYWORD_TRACE));
|
||||
|
||||
// Capture handle to the inbox process into a unique handle holder.
|
||||
g.handoffInboxConsoleHandle.reset(hostProcessHandle);
|
||||
|
||||
|
|
@ -453,9 +484,19 @@ try
|
|||
|
||||
RETURN_IF_WIN32_BOOL_FALSE(CreatePipe(outPipeTheirSide.addressof(), outPipeOurSide.addressof(), nullptr, 0));
|
||||
|
||||
TraceLoggingWrite(g_hConhostV2EventTraceProvider,
|
||||
"SrvInit_ReceiveHandoff_OpenedPipes",
|
||||
TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
|
||||
TraceLoggingKeyword(TIL_KEYWORD_TRACE));
|
||||
|
||||
wil::unique_handle clientProcess{ OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ | SYNCHRONIZE, TRUE, static_cast<DWORD>(connectMessage->Descriptor.Process)) };
|
||||
RETURN_LAST_ERROR_IF_NULL(clientProcess.get());
|
||||
|
||||
TraceLoggingWrite(g_hConhostV2EventTraceProvider,
|
||||
"SrvInit_ReceiveHandoff_OpenedClient",
|
||||
TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
|
||||
TraceLoggingKeyword(TIL_KEYWORD_TRACE));
|
||||
|
||||
wil::unique_handle refHandle;
|
||||
RETURN_IF_NTSTATUS_FAILED(DeviceHandle::CreateClientHandle(refHandle.addressof(),
|
||||
Server,
|
||||
|
|
@ -466,7 +507,18 @@ try
|
|||
|
||||
::Microsoft::WRL::ComPtr<ITerminalHandoff> handoff;
|
||||
|
||||
TraceLoggingWrite(g_hConhostV2EventTraceProvider,
|
||||
"SrvInit_PrepareToCreateDelegationTerminal",
|
||||
TraceLoggingGuid(g.handoffTerminalClsid.value(), "TerminalClsid"),
|
||||
TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
|
||||
TraceLoggingKeyword(TIL_KEYWORD_TRACE));
|
||||
|
||||
RETURN_IF_FAILED(CoCreateInstance(g.handoffTerminalClsid.value(), nullptr, CLSCTX_LOCAL_SERVER, IID_PPV_ARGS(&handoff)));
|
||||
TraceLoggingWrite(g_hConhostV2EventTraceProvider,
|
||||
"SrvInit_CreatedDelegationTerminal",
|
||||
TraceLoggingGuid(g.handoffTerminalClsid.value(), "TerminalClsid"),
|
||||
TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
|
||||
TraceLoggingKeyword(TIL_KEYWORD_TRACE));
|
||||
|
||||
RETURN_IF_FAILED(handoff->EstablishPtyHandoff(inPipeTheirSide.get(),
|
||||
outPipeTheirSide.get(),
|
||||
|
|
@ -475,6 +527,11 @@ try
|
|||
serverProcess,
|
||||
clientProcess.get()));
|
||||
|
||||
TraceLoggingWrite(g_hConhostV2EventTraceProvider,
|
||||
"SrvInit_DelegateToTerminalSucceeded",
|
||||
TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
|
||||
TraceLoggingKeyword(TIL_KEYWORD_TRACE));
|
||||
|
||||
inPipeTheirSide.reset();
|
||||
outPipeTheirSide.reset();
|
||||
signalPipeTheirSide.reset();
|
||||
|
|
|
|||
Loading…
Reference in a new issue