Skip to content

Commit 36b7c89

Browse files
htcfreekhtcfreek
authored
Merge branch 'microsoft:main' into Term_ConHostGpo
2 parents c9789b7 + 8ddb14b commit 36b7c89

37 files changed

+2176
-128
lines changed

‎README.md

-9
Original file line numberDiff line numberDiff line change
@@ -362,15 +362,6 @@ If you would like to ask a question that you feel doesn't warrant an issue
362362

363363
## Building the Code
364364

365-
This repository uses [git
366-
submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) for some of its
367-
dependencies. To make sure submodules are restored or updated, be sure to run
368-
the following prior to building:
369-
370-
```shell
371-
git submodule update --init --recursive
372-
```
373-
374365
OpenConsole.sln may be built from within Visual Studio or from the command-line
375366
using a set of convenience scripts & tools in the **/tools** directory:
376367

‎build/pipelines/ob-nightly.yml

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ extends:
3737
akvName: $(SigningAKVName)
3838
authCertName: $(SigningAuthCertName)
3939
signCertName: $(SigningSignCertName)
40+
useManagedIdentity: $(SigningUseManagedIdentity)
41+
clientId: $(SigningOriginalClientId)
4042
publishSymbolsToPublic: true
4143
publishVpackToWindows: false
4244
symbolExpiryTime: 15

‎build/pipelines/ob-release.yml

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ extends:
8585
akvName: $(SigningAKVName)
8686
authCertName: $(SigningAuthCertName)
8787
signCertName: $(SigningSignCertName)
88+
useManagedIdentity: $(SigningUseManagedIdentity)
89+
clientId: $(SigningOriginalClientId)
8890
terminalInternalPackageVersion: ${{ parameters.terminalInternalPackageVersion }}
8991
publishSymbolsToPublic: ${{ parameters.publishSymbolsToPublic }}
9092
publishVpackToWindows: ${{ parameters.publishVpackToWindows }}

‎build/pipelines/templates-v2/steps-esrp-signing.yml

+2
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,6 @@ steps:
1919
AuthAKVName: ${{ parameters.signingIdentity.akvName }}
2020
AuthCertName: ${{ parameters.signingIdentity.authCertName }}
2121
AuthSignCertName: ${{ parameters.signingIdentity.signCertName }}
22+
UseMSIAuthentication: ${{ coalesce(parameters.signingIdentity.useManagedIdentity, 'false') }}
23+
EsrpClientId: ${{ parameters.signingIdentity.clientId }}
2224
${{ insert }}: ${{ parameters.inputs }}

‎src/cascadia/TerminalControl/TermControl.cpp

+7-13
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ DEFINE_ENUM_FLAG_OPERATORS(winrt::Microsoft::Terminal::Control::MouseButtonState
5757
// the current foreground window, but still on top of another Terminal window in the background.
5858
static void hideCursorUntilMoved()
5959
{
60-
static CoreCursor previousCursor{ nullptr };
60+
static bool cursorIsHidden;
6161
static const auto shouldVanish = []() {
6262
BOOL shouldVanish = TRUE;
6363
SystemParametersInfoW(SPI_GETMOUSEVANISH, 0, &shouldVanish, 0);
@@ -68,16 +68,16 @@ static void hideCursorUntilMoved()
6868

6969
const auto window = CoreWindow::GetForCurrentThread();
7070
static constexpr auto releaseCapture = [](CoreWindow window, PointerEventArgs) {
71-
if (previousCursor)
71+
if (cursorIsHidden)
7272
{
7373
window.ReleasePointerCapture();
7474
}
7575
};
7676
static constexpr auto restoreCursor = [](CoreWindow window, PointerEventArgs) {
77-
if (previousCursor)
77+
if (cursorIsHidden)
7878
{
79-
window.PointerCursor(previousCursor);
80-
previousCursor = nullptr;
79+
cursorIsHidden = false;
80+
window.PointerCursor(CoreCursor{ CoreCursorType::Arrow, 0 });
8181
}
8282
};
8383

@@ -90,20 +90,14 @@ static void hideCursorUntilMoved()
9090
return true;
9191
}();
9292

93-
if (shouldVanish && !previousCursor)
93+
if (shouldVanish && !cursorIsHidden)
9494
{
9595
try
9696
{
9797
const auto window = CoreWindow::GetForCurrentThread();
98-
99-
previousCursor = window.PointerCursor();
100-
if (!previousCursor)
101-
{
102-
return;
103-
}
104-
10598
window.PointerCursor(nullptr);
10699
window.SetPointerCapture();
100+
cursorIsHidden = true;
107101
}
108102
catch (...)
109103
{

‎src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw

+151
Original file line numberDiff line numberDiff line change
@@ -886,6 +886,10 @@
886886
<value>Farbschema</value>
887887
<comment>Header for a control to select the scheme (or set) of colors used in the session. This is selected from a list of options managed by the user.</comment>
888888
</data>
889+
<data name="Profile_ColorScheme.HelpText" xml:space="preserve">
890+
<value>Erweitern, um den Vordergrund-, Hintergrund- und Auswahlhintergrund außer Kraft zu setzen.</value>
891+
<comment>Help text for a control to select the scheme (or set) of colors used in the session. Directs the user to expand the control to access overrides for certain values in the color scheme.</comment>
892+
</data>
889893
<data name="Profile_Commandline.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
890894
<value>Befehlszeile</value>
891895
<comment>Name for a control to determine commandline executable (i.e. a .exe file) to run when a terminal session of this profile is launched.</comment>
@@ -1113,6 +1117,10 @@
11131117
<value>Symbol</value>
11141118
<comment>Name for a control to determine what icon can be used to represent this profile. This is not necessarily a file path, but can be one.</comment>
11151119
</data>
1120+
<data name="Profile_IconEmojiBox.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
1121+
<value>Symbol</value>
1122+
<comment>Name for a control to determine what icon can be used to represent this profile.</comment>
1123+
</data>
11161124
<data name="Profile_Icon.HelpText" xml:space="preserve">
11171125
<value>Emoji- oder Bilddateipfad des im Profil verwendeten Symbols.</value>
11181126
<comment>A description for what the "icon" setting does. Presented near "Profile_Icon".</comment>
@@ -1917,6 +1925,149 @@
19171925
<value>Proportionale Schriftarten:</value>
19181926
<comment>This is a label that is followed by a list of proportional fonts.</comment>
19191927
</data>
1928+
<data name="Profile_BellSoundPreviewDefault" xml:space="preserve">
1929+
<value>Standardsystemsound</value>
1930+
<comment>The value shown for the default value for bell sound.</comment>
1931+
</data>
1932+
<data name="Profile_BellSoundPreviewMultiple" xml:space="preserve">
1933+
<value>Mehrere Sounds</value>
1934+
<comment>The value shown for when the "bell sound" setting is set to multiple values.</comment>
1935+
</data>
1936+
<data name="Profile_BellSound.Header" xml:space="preserve">
1937+
<value>Klingelton</value>
1938+
<comment>Header for a control to determine what sound the app uses to notify the user. "Bell" is the common term in terminals for the BEL character (like the metal device used to chime).</comment>
1939+
</data>
1940+
<data name="Profile_BellSound.HelpText" xml:space="preserve">
1941+
<value>Steuert, welcher Sound wiedergegeben wird, wenn die Anwendung ein BEL Zeichen ausgibt. "Glockenbenachrichtigungsstil" muss "Hörbar" enthalten.</value>
1942+
<comment>A description for what the "bell sound" setting does. Presented near "Profile_BellSound". "Bell notification style" and "audible" come from "Profile_BellStyle" and "Profile_BellStyleAudible.Content" respectively.{Locked="BEL"}</comment>
1943+
</data>
1944+
<data name="Profile_AddBellSound.Text" xml:space="preserve">
1945+
<value>Sound hinzufügen</value>
1946+
<comment>Text label for a button that adds a sound to the bell sound list. Presented near "Profile_BellSound"</comment>
1947+
</data>
1948+
<data name="Profile_BellSoundBrowse.Content" xml:space="preserve">
1949+
<value>Durchsuchen…</value>
1950+
<comment>Text label for a button that opens a file picker to select a sound file to use for the bell sound. Presented near "Profile_BellSound".</comment>
1951+
</data>
1952+
<data name="Profile_BellSoundInfo.Text" xml:space="preserve">
1953+
<value>Wenn mehrere Sounds definiert sind, wird beim Empfang des BEL-Zeichens einer nach dem Zufallsprinzip ausgewählt.</value>
1954+
<comment>{Locked="BEL"} Text block displayed near "Profile_BellSound".</comment>
1955+
</data>
1956+
<data name="Profile_BellSoundNotFound" xml:space="preserve">
1957+
<value>⚠️ Datei nicht gefunden</value>
1958+
</data>
1959+
<data name="Profile_BellSoundAudioPreview.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
1960+
<value>Sound wiedergeben</value>
1961+
<comment>Tooltip for a button that plays the selected sound when pressed.</comment>
1962+
</data>
1963+
<data name="Profile_BellSoundDelete.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
1964+
<value>Löschen</value>
1965+
<comment>Tooltip for a button that deletes the selected sound when pressed.</comment>
1966+
</data>
1967+
<data name="Profile_BellSoundAudioPreview.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
1968+
<value>Sound wiedergeben</value>
1969+
<comment>Screen reader name for a button that plays the selected sound when pressed.</comment>
1970+
</data>
1971+
<data name="Profile_BellSoundDelete.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
1972+
<value>Löschen</value>
1973+
<comment>Screen reader name for a button that deletes the selected sound when pressed.</comment>
1974+
</data>
1975+
<data name="Profile_TabColor.Header" xml:space="preserve">
1976+
<value>Registerkartenfarbe</value>
1977+
<comment>Header for a control to determine the color of the tab.</comment>
1978+
</data>
1979+
<data name="Profile_Foreground.Header" xml:space="preserve">
1980+
<value>Vordergrund</value>
1981+
<comment>Header for a control to determine the foreground color of text.</comment>
1982+
</data>
1983+
<data name="Profile_Background.Header" xml:space="preserve">
1984+
<value>Hintergrund</value>
1985+
<comment>Header for a control to determine the background color of text.</comment>
1986+
</data>
1987+
<data name="Profile_SelectionBackground.Header" xml:space="preserve">
1988+
<value>Hintergrund der Auswahl</value>
1989+
<comment>Header for a control to determine the background color of selected text.</comment>
1990+
</data>
1991+
<data name="Profile_CursorColor.Header" xml:space="preserve">
1992+
<value>Cursorfarbe</value>
1993+
<comment>Header for a control to determine the color of the cursor.</comment>
1994+
</data>
1995+
<data name="Profile_Foreground.HelpText" xml:space="preserve">
1996+
<value>Überschreibt die Vordergrundfarbe aus dem Farbschema.</value>
1997+
<comment>A description for what the "foreground" setting does. Presented near "Profile_Foreground".</comment>
1998+
</data>
1999+
<data name="Profile_CursorColor.HelpText" xml:space="preserve">
2000+
<value>Überschreibt die Cursorfarbe aus dem Farbschema.</value>
2001+
<comment>A description for what the "cursor color" setting does. Presented near "Profile_CursorColor".</comment>
2002+
</data>
2003+
<data name="Profile_Background.HelpText" xml:space="preserve">
2004+
<value>Überschreibt die Hintergrundfarbe aus dem Farbschema.</value>
2005+
<comment>A description for what the "background" setting does. Presented near "Profile_Background".</comment>
2006+
</data>
2007+
<data name="Profile_SelectionBackground.HelpText" xml:space="preserve">
2008+
<value>Überschreibt die Hintergrundfarbe der Auswahl aus dem Farbschema.</value>
2009+
<comment>A description for what the "selection background" setting does. Presented near "Profile_SelectionBackground".</comment>
2010+
</data>
2011+
<data name="NullableColorPicker_MoreColorsButton.Content" xml:space="preserve">
2012+
<value>Weitere Farben...</value>
2013+
<comment>Text label for a button that allows the user to select from more colors in a new window. {Locked="..."}</comment>
2014+
</data>
2015+
<data name="NullableColorPicker_ColorPickerContentDialog.Title" xml:space="preserve">
2016+
<value>Farbe wählen</value>
2017+
<comment>Title displayed on a content dialog directing the user to pick a color.</comment>
2018+
</data>
2019+
<data name="NullableColorPicker_ColorPickerContentDialog.PrimaryButtonText" xml:space="preserve">
2020+
<value>OK</value>
2021+
<comment>Button label for the color picker content dialog. Used as confirmation to apply the selected color.</comment>
2022+
</data>
2023+
<data name="NullableColorPicker_ColorPickerContentDialog.SecondaryButtonText" xml:space="preserve">
2024+
<value>Abbrechen</value>
2025+
<comment>Text label for secondary button the color picker content dialog. When clicked, the operation of selecting a color is cancelled by the user.</comment>
2026+
</data>
2027+
<data name="Profile_CursorColor_NullableColorPicker.NullColorButtonLabel" xml:space="preserve">
2028+
<value>Cursorfarbe aus Farbschema verwenden</value>
2029+
<comment>Label for a button directing the user to use the cursor color defined in the terminal's current color scheme.</comment>
2030+
</data>
2031+
<data name="Profile_Foreground_NullableColorPicker.NullColorButtonLabel" xml:space="preserve">
2032+
<value>Vordergrundfarbe aus Farbschema verwenden</value>
2033+
<comment>Label for a button directing the user to use the foreground color defined in the terminal's current color scheme.</comment>
2034+
</data>
2035+
<data name="Profile_Background_NullableColorPicker.NullColorButtonLabel" xml:space="preserve">
2036+
<value>Hintergrundfarbe aus Farbschema verwenden</value>
2037+
<comment>Label for a button directing the user to use the background color defined in the terminal's current color scheme.</comment>
2038+
</data>
2039+
<data name="Profile_SelectionBackground_NullableColorPicker.NullColorButtonLabel" xml:space="preserve">
2040+
<value>Auswahlhintergrundfarbe aus Farbschema verwenden</value>
2041+
<comment>Label for a button directing the user to use the selection background color defined in the terminal's current color scheme.</comment>
2042+
</data>
2043+
<data name="Profile_IconTypeNone" xml:space="preserve">
2044+
<value>Keine</value>
2045+
<comment>An option to choose from for the "icon style" dropdown. When selected, there will be no icon for the profile.</comment>
2046+
</data>
2047+
<data name="Profile_IconTypeImage" xml:space="preserve">
2048+
<value>Datei</value>
2049+
<comment>An option to choose from for the "icon style" dropdown. When selected, a custom image can set for the profile's icon.</comment>
2050+
</data>
2051+
<data name="Profile_IconTypeEmoji" xml:space="preserve">
2052+
<value>Emoji</value>
2053+
<comment>An option to choose from for the "icon style" dropdown. When selected, an emoji can be set for the profile's icon.</comment>
2054+
</data>
2055+
<data name="Profile_IconTypeFontIcon" xml:space="preserve">
2056+
<value>Integriertes Symbol</value>
2057+
<comment>An option to choose from for the "icon style" dropdown. When selected, the user can choose from several preselected options to set the profile's icon.</comment>
2058+
</data>
2059+
<data name="Profile_IconEmojiBox.PlaceholderText" xml:space="preserve">
2060+
<value>Verwenden Sie "WIN + PUNKT", um die Emojiauswahl zu öffnen.</value>
2061+
<comment>"Win + period" refers to the OS key binding to open the emoji picker.</comment>
2062+
</data>
2063+
<data name="Profile_IconType.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
2064+
<value>Symboltyp</value>
2065+
<comment>Accessible name for a control allowing the user to select the type of icon they would like to use.</comment>
2066+
</data>
2067+
<data name="Profile_BuiltInIcon.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
2068+
<value>Symbol</value>
2069+
<comment>Accessible name for a control allowing the user to select the icon from a list of built in icons.</comment>
2070+
</data>
19202071
<data name="Nav_NewTabMenu.Content" xml:space="preserve">
19212072
<value>Menü „Neue Registerkarte“</value>
19222073
<comment>Header for the "new tab menu" menu item. This navigates to a page that lets you see and modify settings related to the app's new tab menu (i.e. profile ordering, nested folders, dividers, etc.)</comment>

0 commit comments

Comments
 (0)