Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow inheriting env vars from wt again and other env var changes too #15897

Merged
merged 17 commits into from
Sep 19, 2023
Merged

Allow inheriting env vars from wt again and other env var changes too #15897

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
434fcdb
start plumbing from the top down
zadjii-msft Aug 28, 2023
54209f7
start plumbing from the bottom up
zadjii-msft Aug 28, 2023
8415db1
`set FOO=fooz & wtd -w -1` will pass %FOO% to the new tab...
zadjii-msft Aug 28, 2023
619615f
well dang that's the whole thing
zadjii-msft Aug 29, 2023
c592d97
migrate the setting, too
zadjii-msft Aug 29, 2023
a68395f
This should really be in the SUI, too
zadjii-msft Aug 29, 2023
26639d3
spel
zadjii-msft Aug 29, 2023
c6d3b0d
shema too
zadjii-msft Aug 29, 2023
e4ef76a
Merge remote-tracking branch 'origin/main' into dev/migrie/f/--inheri…
zadjii-msft Sep 5, 2023
e4b0aee
it's important to build and run the tests too
zadjii-msft Sep 5, 2023
bd9076f
Merge remote-tracking branch 'origin/main' into dev/migrie/f/--inheri…
zadjii-msft Sep 7, 2023
629d5c4
nits from review
zadjii-msft Sep 7, 2023
c4349d0
YOu know, actually make it a real test
zadjii-msft Sep 7, 2023
2efdd72
happends
zadjii-msft Sep 7, 2023
ed380ac
Merge remote-tracking branch 'origin/main' into dev/migrie/f/--inheri…
zadjii-msft Sep 19, 2023
f8130ff
hey we don't need this member
zadjii-msft Sep 19, 2023
7811c22
I'm sick and tired of copypasting that block
zadjii-msft Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions src/cascadia/TerminalConnection/ConptyConnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,12 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
return vs;
}

template<typename T>
T unbox_prop_or(const Windows::Foundation::Collections::ValueSet& blob, std::wstring_view key, T defaultValue)
{
return winrt::unbox_value_or<T>(blob.TryLookup(key).try_as<Windows::Foundation::IPropertyValue>(), defaultValue);
}
Comment on lines +267 to +270
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Neat!


void ConptyConnection::Initialize(const Windows::Foundation::Collections::ValueSet& settings)
{
if (settings)
Expand All @@ -271,24 +277,23 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
// auto bad = unbox_value_or<hstring>(settings.TryLookup(L"foo").try_as<IPropertyValue>(), nullptr);
// It'll just return null

_commandline = winrt::unbox_value_or<winrt::hstring>(settings.TryLookup(L"commandline").try_as<Windows::Foundation::IPropertyValue>(), _commandline);
_startingDirectory = winrt::unbox_value_or<winrt::hstring>(settings.TryLookup(L"startingDirectory").try_as<Windows::Foundation::IPropertyValue>(), _startingDirectory);
_startingTitle = winrt::unbox_value_or<winrt::hstring>(settings.TryLookup(L"startingTitle").try_as<Windows::Foundation::IPropertyValue>(), _startingTitle);
_rows = winrt::unbox_value_or<uint32_t>(settings.TryLookup(L"initialRows").try_as<Windows::Foundation::IPropertyValue>(), _rows);
_cols = winrt::unbox_value_or<uint32_t>(settings.TryLookup(L"initialCols").try_as<Windows::Foundation::IPropertyValue>(), _cols);
_guid = winrt::unbox_value_or<winrt::guid>(settings.TryLookup(L"guid").try_as<Windows::Foundation::IPropertyValue>(), _guid);
_commandline = unbox_prop_or<winrt::hstring>(settings, L"commandline", _commandline);
_startingDirectory = unbox_prop_or<winrt::hstring>(settings, L"startingDirectory", _startingDirectory);
_startingTitle = unbox_prop_or<winrt::hstring>(settings, L"startingTitle", _startingTitle);
_rows = unbox_prop_or<uint32_t>(settings, L"initialRows", _rows);
_cols = unbox_prop_or<uint32_t>(settings, L"initialCols", _cols);
_guid = unbox_prop_or<winrt::guid>(settings, L"guid", _guid);
_environment = settings.TryLookup(L"environment").try_as<Windows::Foundation::Collections::ValueSet>();
if constexpr (Feature_VtPassthroughMode::IsEnabled())
{
_passthroughMode = winrt::unbox_value_or<bool>(settings.TryLookup(L"passthroughMode").try_as<Windows::Foundation::IPropertyValue>(), _passthroughMode);
_passthroughMode = unbox_prop_or<bool>(settings, L"passthroughMode", _passthroughMode);
}
_inheritCursor = winrt::unbox_value_or<bool>(settings.TryLookup(L"inheritCursor").try_as<Windows::Foundation::IPropertyValue>(), _inheritCursor);
_profileGuid = winrt::unbox_value_or<winrt::guid>(settings.TryLookup(L"profileGuid").try_as<Windows::Foundation::IPropertyValue>(), _profileGuid);
_inheritCursor = unbox_prop_or<bool>(settings, L"inheritCursor", _inheritCursor);
_profileGuid = unbox_prop_or<winrt::guid>(settings, L"profileGuid", _profileGuid);

const auto& initialEnvironment{ winrt::unbox_value_or<winrt::hstring>(settings.TryLookup(L"initialEnvironment").try_as<Windows::Foundation::IPropertyValue>(), L"") };
const auto& initialEnvironment{ unbox_prop_or<winrt::hstring>(settings, L"initialEnvironment", L"") };

const bool reloadEnvironmentVariables = winrt::unbox_value_or<bool>(settings.TryLookup(L"reloadEnvironmentVariables").try_as<Windows::Foundation::IPropertyValue>(),
false);
const bool reloadEnvironmentVariables = unbox_prop_or<bool>(settings, L"reloadEnvironmentVariables", false);

if (reloadEnvironmentVariables)
{
Expand Down
Loading