From 99bc2802076ec7fa833bb77ef4a2c3997d93e52b Mon Sep 17 00:00:00 2001 From: Mike Griese Date: Tue, 31 Jan 2023 09:34:02 -0600 Subject: [PATCH] It doesn't crash on launch. That's something. There's no startupActions though, so it immediately exits --- src/cascadia/TerminalApp/AppLogic.cpp | 19 +++++++++++++++++-- src/cascadia/TerminalApp/AppLogic.h | 2 ++ src/cascadia/TerminalApp/AppLogic.idl | 5 +++++ src/cascadia/TerminalApp/TerminalWindow.cpp | 10 ++++++++++ src/cascadia/TerminalApp/TerminalWindow.h | 1 + src/cascadia/WindowsTerminal/AppHost.cpp | 13 +++++++------ 6 files changed, 42 insertions(+), 8 deletions(-) diff --git a/src/cascadia/TerminalApp/AppLogic.cpp b/src/cascadia/TerminalApp/AppLogic.cpp index 40d2637aa3..1ab897ca2e 100644 --- a/src/cascadia/TerminalApp/AppLogic.cpp +++ b/src/cascadia/TerminalApp/AppLogic.cpp @@ -301,6 +301,11 @@ namespace winrt::TerminalApp::implementation return hr; } + bool AppLogic::HasSettingsStartupActions() const noexcept + { + return _hasSettingsStartupActions; + } + // Call this function after loading your _settings. // It handles any CPU intensive settings updates (like updating the Jumplist) // which should thus only occur if the settings file actually changed. @@ -474,6 +479,10 @@ namespace winrt::TerminalApp::implementation } else { + // TODO! Arg should be a SettingsLoadEventArgs{ result, warnings, error, settings} + // + // _SettingsChangedHandlers(*this, make_self( _settingsLoadedResult, warnings, _settingsLoadExceptionText, settings})) + // const winrt::hstring titleKey = USES_RESOURCE(L"ReloadJsonParseErrorTitle"); // const winrt::hstring textKey = USES_RESOURCE(L"ReloadJsonParseErrorText"); // _ShowLoadErrorsDialog(titleKey, textKey, _settingsLoadedResult); @@ -500,7 +509,7 @@ namespace winrt::TerminalApp::implementation _ApplyStartupTaskStateChange(); _ProcessLazySettingsChanges(); - _SettingsChangedHandlers(*this, nullptr); + _SettingsChangedHandlers(*this, _settings); } // Method Description: @@ -675,6 +684,12 @@ namespace winrt::TerminalApp::implementation TerminalApp::TerminalWindow AppLogic::CreateNewWindow() { - return *winrt::make_self(_settings); + if (_settings == nullptr) + { + ReloadSettings(); + } + auto window = winrt::make_self(_settings); + this->SettingsChanged({ window->get_weak(), &implementation::TerminalWindow::UpdateSettingsHandler }); + return *window; } } diff --git a/src/cascadia/TerminalApp/AppLogic.h b/src/cascadia/TerminalApp/AppLogic.h index eeee667336..ffe744b897 100644 --- a/src/cascadia/TerminalApp/AppLogic.h +++ b/src/cascadia/TerminalApp/AppLogic.h @@ -52,6 +52,8 @@ namespace winrt::TerminalApp::implementation bool IsElevated() const noexcept; void ReloadSettings(); + bool HasSettingsStartupActions() const noexcept; + [[nodiscard]] Microsoft::Terminal::Settings::Model::CascadiaSettings GetSettings() const noexcept; TerminalApp::FindTargetWindowResult FindTargetWindow(array_view actions); diff --git a/src/cascadia/TerminalApp/AppLogic.idl b/src/cascadia/TerminalApp/AppLogic.idl index 2a3488e6f9..7946403aee 100644 --- a/src/cascadia/TerminalApp/AppLogic.idl +++ b/src/cascadia/TerminalApp/AppLogic.idl @@ -27,6 +27,8 @@ namespace TerminalApp void RunAsUwp(); Boolean IsElevated(); + Boolean HasSettingsStartupActions(); + void ReloadSettings(); void SetInboundListener(); @@ -37,6 +39,9 @@ namespace TerminalApp TerminalWindow CreateNewWindow(); + Boolean ShouldImmediatelyHandoffToElevated(); + void HandoffToElevated(); + Windows.Foundation.Collections.IMapView GlobalHotkeys(); event Windows.Foundation.TypedEventHandler SettingsChanged; diff --git a/src/cascadia/TerminalApp/TerminalWindow.cpp b/src/cascadia/TerminalApp/TerminalWindow.cpp index 0b1c9e2763..89ce8856c1 100644 --- a/src/cascadia/TerminalApp/TerminalWindow.cpp +++ b/src/cascadia/TerminalApp/TerminalWindow.cpp @@ -1137,4 +1137,14 @@ namespace winrt::TerminalApp::implementation { return _settings.GlobalSettings().AutoHideWindow(); } + // TODO! Arg should be a SettingsLoadEventArgs{ result, warnings, error, settings} + void TerminalWindow::UpdateSettingsHandler(const winrt::IInspectable& /*sender*/, + const winrt::IInspectable& arg) + { + if (const auto& settings{ arg.try_as() }) + { + this->UpdateSettings(S_OK, settings); + _root->SetSettings(_settings, true); + } + } }; diff --git a/src/cascadia/TerminalApp/TerminalWindow.h b/src/cascadia/TerminalApp/TerminalWindow.h index aee3173bcb..b2cef567f9 100644 --- a/src/cascadia/TerminalApp/TerminalWindow.h +++ b/src/cascadia/TerminalApp/TerminalWindow.h @@ -107,6 +107,7 @@ namespace winrt::TerminalApp::implementation void DismissDialog(); Microsoft::Terminal::Settings::Model::Theme Theme(); + void UpdateSettingsHandler(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::Foundation::IInspectable& arg); // -------------------------------- WinRT Events --------------------------------- // PropertyChanged is surprisingly not a typed event, so we'll define that one manually. diff --git a/src/cascadia/WindowsTerminal/AppHost.cpp b/src/cascadia/WindowsTerminal/AppHost.cpp index 48bc98e683..60ded0d3fe 100644 --- a/src/cascadia/WindowsTerminal/AppHost.cpp +++ b/src/cascadia/WindowsTerminal/AppHost.cpp @@ -32,7 +32,7 @@ AppHost::AppHost() noexcept : _app{}, _windowManager{}, _appLogic{ nullptr }, // don't make one, we're going to take a ref on app's - _windowLogic{ nullptr }, + _windowLogic{ nullptr }, _window{ nullptr }, _getWindowLayoutThrottler{} // this will get set if we become the monarch { @@ -234,7 +234,7 @@ void AppHost::_HandleCommandlineArgs() } // We did want to make a window, so let's instantiate it here. - // We don't have XAML yet, but we do have other stuff. + // We don't have XAML yet, but we do have other stuff. _windowLogic = _appLogic.CreateNewWindow(); if (auto peasant{ _windowManager.CurrentWindow() }) @@ -269,10 +269,10 @@ void AppHost::_HandleCommandlineArgs() // the window at all here. In that case, we're going through this // special escape hatch to dispatch all the calls to elevate-shim, and // then we're going to exit immediately. - if (_windowLogic.ShouldImmediatelyHandoffToElevated()) + if (_appLogic.ShouldImmediatelyHandoffToElevated()) { _shouldCreateWindow = false; - _windowLogic.HandoffToElevated(); + _appLogic.HandoffToElevated(); return; } @@ -425,6 +425,7 @@ void AppHost::Initialize() _revokers.PropertyChanged = _windowLogic.PropertyChanged(winrt::auto_revoke, { this, &AppHost::_PropertyChangedHandler }); _appLogic.Create(); + _windowLogic.Create(); _revokers.TitleChanged = _windowLogic.TitleChanged(winrt::auto_revoke, { this, &AppHost::AppTitleChanged }); _revokers.LastTabClosed = _windowLogic.LastTabClosed(winrt::auto_revoke, { this, &AppHost::LastTabClosed }); @@ -974,14 +975,14 @@ void AppHost::_BecomeMonarch(const winrt::Windows::Foundation::IInspectable& /*s if (_getWindowLayoutThrottler) { _getWindowLayoutThrottler.value()(); } - _appLogic.SetNumberOfOpenWindows(_windowManager.GetNumberOfPeasants()); }); + _windowLogic.SetNumberOfOpenWindows(_windowManager.GetNumberOfPeasants()); }); _WindowClosedToken = _windowManager.WindowClosed([this](auto&&, auto&&) { if (_getWindowLayoutThrottler) { _getWindowLayoutThrottler.value()(); } - _appLogic.SetNumberOfOpenWindows(_windowManager.GetNumberOfPeasants()); + _windowLogic.SetNumberOfOpenWindows(_windowManager.GetNumberOfPeasants()); }); // These events are coming from peasants that become or un-become quake windows.