Skip to content

Commit

Permalink
add a velocity flag for this
Browse files Browse the repository at this point in the history
  • Loading branch information
zadjii-msft committed Apr 12, 2022
1 parent 5429fca commit b253440
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 4 deletions.
16 changes: 12 additions & 4 deletions src/cascadia/WindowsTerminal/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,18 @@ int __stdcall wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
// should choose and install the correct one from the bundle.
EnsureNativeArchitecture();

// If we _are_ a content process, then this function will call ExitThread(),
// after spawning some COM threads to deal with inbound COM requests to the
// ContentProcess object.
TryRunAsContentProcess();
// Content processes are only enabled in dev builds, so that we can check
// the feature in to dev builds one piece at a time.
if constexpr (Feature_ContentProcess::IsEnabled())
{
// If we _are_ a content process, then this function will call ExitThread(),
// after spawning some COM threads to deal with inbound COM requests to the
// ContentProcess object.
TryRunAsContentProcess();
// If we are a content process, then TryRunAsContentProcess will
// ExitThread before it returns, so that nothing else will run here.
}

// If we weren't a content process, then we'll just move on, and do the
// normal WindowsTerminal thing.

Expand Down
11 changes: 11 additions & 0 deletions src/features.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,15 @@
<brandingToken>Preview</brandingToken>
</alwaysDisabledBrandingTokens>
</feature>

<feature>
<name>Feature_ContentProcess</name>
<description>Enables the --content flag, for allowing TermControls to be created as OOP content for the window.</description>
<stage>AlwaysDisabled</stage>
<!-- This is VERY MUCH a WIP, so we're using velocity to start checking in code to dev branches without shipping it. -->
<alwaysEnabledBrandingTokens>
<brandingToken>Dev</brandingToken>
</alwaysDisabledBrandingTokens>
</feature>

</featureStaging>

1 comment on commit b253440

@github-actions

This comment was marked as outdated.

Please sign in to comment.