Add support for changing the active color scheme with an action

doc/cascadia/profiles.schema.json

@@ -59,6 +59,7 @@
  "toggleAlwaysOnTop",
  "toggleRetroEffect",
  "find",
+ "setColorScheme",
  "setTabColor",
  "openTabColorPicker",
  "renameTab",
@@ -281,6 +282,23 @@
  }
  ]
  },
+ "SetColorSchemeAction": {
+ "description": "Arguments corresponding to a Set Color Scheme Action",
+ "allOf": [
+ { "$ref": "#/definitions/ShortcutAction" },
+ {
+ "properties": {
+ "action": { "type": "string", "pattern": "setColorScheme" },
+ "name": {
+ "type": "string",
+ "default": "",
+ "description": "the name of the scheme to apply to the active pane"
+ }
+ }
+ }
+ ],
+ "required": [ "name" ]
+ },
  "WtAction": {
  "description": "Arguments corresponding to a wt Action",
  "allOf": [
@@ -314,6 +332,7 @@
  { "$ref": "#/definitions/SplitPaneAction" },
  { "$ref": "#/definitions/OpenSettingsAction" },
  { "$ref": "#/definitions/SetTabColorAction" },
+ { "$ref": "#/definitions/SetColorSchemeAction" },
  { "$ref": "#/definitions/WtAction" },
  { "type": "null" }
  ]

src/cascadia/TerminalApp/ActionAndArgs.cpp

@@ -35,6 +35,7 @@ static constexpr std::string_view ToggleRetroEffectKey{ "toggleRetroEffect" };
 static constexpr std::string_view ToggleFocusModeKey{ "toggleFocusMode" };
 static constexpr std::string_view ToggleFullscreenKey{ "toggleFullscreen" };
 static constexpr std::string_view ToggleAlwaysOnTopKey{ "toggleAlwaysOnTop" };
+static constexpr std::string_view SetColorSchemeKey{ "setColorScheme" };
 static constexpr std::string_view SetTabColorKey{ "setTabColor" };
 static constexpr std::string_view OpenTabColorPickerKey{ "openTabColorPicker" };
 static constexpr std::string_view RenameTabKey{ "renameTab" };
@@ -85,6 +86,7 @@ namespace winrt::TerminalApp::implementation
  { ToggleFullscreenKey, ShortcutAction::ToggleFullscreen },
  { ToggleAlwaysOnTopKey, ShortcutAction::ToggleAlwaysOnTop },
  { SplitPaneKey, ShortcutAction::SplitPane },
+ { SetColorSchemeKey, ShortcutAction::SetColorScheme },
  { SetTabColorKey, ShortcutAction::SetTabColor },
  { OpenTabColorPickerKey, ShortcutAction::OpenTabColorPicker },
  { UnboundKey, ShortcutAction::Invalid },
@@ -119,6 +121,8 @@ namespace winrt::TerminalApp::implementation
 
  { ShortcutAction::OpenSettings, winrt::TerminalApp::implementation::OpenSettingsArgs::FromJson },
 
+ { ShortcutAction::SetColorScheme, winrt::TerminalApp::implementation::SetColorSchemeArgs::FromJson },
+
  { ShortcutAction::SetTabColor, winrt::TerminalApp::implementation::SetTabColorArgs::FromJson },
 
  { ShortcutAction::RenameTab, winrt::TerminalApp::implementation::RenameTabArgs::FromJson },
@@ -269,6 +273,7 @@ namespace winrt::TerminalApp::implementation
  { ShortcutAction::SplitPane, RS_(L"SplitPaneCommandKey") },
  { ShortcutAction::Invalid, L"" },
  { ShortcutAction::Find, RS_(L"FindCommandKey") },
+ { ShortcutAction::SetColorScheme, L"" },
  { ShortcutAction::SetTabColor, RS_(L"ResetTabColorCommandKey") },
  { ShortcutAction::OpenTabColorPicker, RS_(L"OpenTabColorPickerCommandKey") },
  { ShortcutAction::RenameTab, RS_(L"ResetTabNameCommandKey") },

src/cascadia/TerminalApp/ActionArgs.cpp

@@ -15,6 +15,7 @@
 #include "AdjustFontSizeArgs.g.cpp"
 #include "SplitPaneArgs.g.cpp"
 #include "OpenSettingsArgs.g.cpp"
+#include "SetColorSchemeArgs.g.cpp"
 #include "SetTabColorArgs.g.cpp"
 #include "RenameTabArgs.g.cpp"
 #include "ExecuteCommandlineArgs.g.cpp"
@@ -229,6 +230,19 @@ namespace winrt::TerminalApp::implementation
  }
  }
 
+ winrt::hstring SetColorSchemeArgs::GenerateName() const
+ {
+ // "Set color scheme to "{_SchemeName}""
+ if (!_SchemeName.empty())
+ {
+ return winrt::hstring{
+ fmt::format(std::wstring_view(RS_(L"SetColorSchemeCommandKey")),
+ _SchemeName.c_str())
+ };
+ }
+ return L"";
+ }
+
  winrt::hstring SetTabColorArgs::GenerateName() const
  {
  // "Set tab color to #RRGGBB"

src/cascadia/TerminalApp/ActionArgs.h

@@ -15,6 +15,7 @@
 #include "AdjustFontSizeArgs.g.h"
 #include "SplitPaneArgs.g.h"
 #include "OpenSettingsArgs.g.h"
+#include "SetColorSchemeArgs.g.h"
 #include "SetTabColorArgs.g.h"
 #include "RenameTabArgs.g.h"
 #include "ExecuteCommandlineArgs.g.h"
@@ -330,6 +331,38 @@ namespace winrt::TerminalApp::implementation
  }
  };
 
+ struct SetColorSchemeArgs : public SetColorSchemeArgsT<SetColorSchemeArgs>
+ {
+ SetColorSchemeArgs() = default;
+ GETSET_PROPERTY(winrt::hstring, SchemeName, L"");
+
+ static constexpr std::string_view NameKey{ "name" };
+
+ public:
+ hstring GenerateName() const;
+
+ bool Equals(const IActionArgs& other)
+ {
+ auto otherAsUs = other.try_as<SetColorSchemeArgs>();
+ if (otherAsUs)
+ {
+ return otherAsUs->_SchemeName == _SchemeName;
+ }
+ return false;
+ };
+ static FromJsonResult FromJson(const Json::Value& json)
+ {
+ // LOAD BEARING: Not using make_self here _will_ break you in the future!
+ auto args = winrt::make_self<SetColorSchemeArgs>();
+ JsonUtils::GetValueForKey(json, NameKey, args->_SchemeName);
+ if (args->_SchemeName.empty())
+ {
+ return { nullptr, { ::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
+ }
+ return { *args, {} };
+ }
+ };
+
  struct SetTabColorArgs : public SetTabColorArgsT<SetTabColorArgs>
  {
  SetTabColorArgs() = default;

src/cascadia/TerminalApp/ActionArgs.idl

@@ -106,6 +106,11 @@ namespace TerminalApp
  SettingsTarget Target { get; };
  };
 
+ [default_interface] runtimeclass SetColorSchemeArgs : IActionArgs
+ {
+ String SchemeName { get; };
+ };
+
  [default_interface] runtimeclass SetTabColorArgs : IActionArgs
  {
  Windows.Foundation.IReference<UInt32> TabColor { get; };

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -272,6 +272,29 @@ namespace winrt::TerminalApp::implementation
  args.Handled(true);
  }
 
+ void TerminalPage::_HandleSetColorScheme(const IInspectable& /*sender*/,
+ const TerminalApp::ActionEventArgs& args)
+ {
+ if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::SetColorSchemeArgs>())
+ {
+ if (auto activeTab = _GetFocusedTab())
+ {
+ if (auto activeControl = activeTab->GetActiveTerminalControl())
+ {
+ // Theoretically, if the properties in an IControlSettings
+ // were all observable, then the termcontrol could just
+ // listen for their changes, and update in real time. But
+ // _meh_
+ auto controlSettings = activeControl.Settings();
+ _settings->ApplyColorScheme(controlSettings, realArgs.SchemeName());
+ activeControl.UpdateSettings(controlSettings);
+ }
+ }
+ }
+
+ args.Handled(true);
+ }
+
  void TerminalPage::_HandleSetTabColor(const IInspectable& /*sender*/,
  const TerminalApp::ActionEventArgs& args)
  {

src/cascadia/TerminalApp/CascadiaSettings.cpp

@@ -745,3 +745,23 @@ const ColorScheme* CascadiaSettings::GetColorSchemeForProfile(const GUID profile
  return nullptr;
  }
 }
+
+// Method Description:
+// - Apply the color scheme (provided by name) to the given IControlSettings.
+// The settings are modified in-place.
+// - If the name doesn't correspond to any of our schemes, this does nothing.
+// Arguments:
+// - settings: the IControlSettings object to modify
+// - name: the name of the scheme to apply
+// Return Value:
+// - <none>
+void CascadiaSettings::ApplyColorScheme(winrt::Microsoft::Terminal::Settings::IControlSettings& settings, std::wstring_view schemeName)
+{
+ std::wstring name{ schemeName };
+ auto schemeAndName = _globals.GetColorSchemes().find(name);
+ if (schemeAndName != _globals.GetColorSchemes().end())
+ {
+ const auto& scheme = schemeAndName->second;
+ scheme.ApplyScheme(settings);
+ }
+}

src/cascadia/TerminalApp/CascadiaSettings.h

@@ -74,6 +74,8 @@ class TerminalApp::CascadiaSettings final
 
  std::vector<TerminalApp::SettingsLoadWarnings>& GetWarnings();
 
+ void ApplyColorScheme(winrt::Microsoft::Terminal::Settings::IControlSettings& settings, std::wstring_view schemeName);
+
 private:
  GlobalAppSettings _globals;
  std::vector<Profile> _profiles;

src/cascadia/TerminalApp/ColorScheme.cpp

@@ -68,7 +68,7 @@ ColorScheme::~ColorScheme()
 // - terminalSettings: the object to apply our settings to.
 // Return Value:
 // - <none>
-void ColorScheme::ApplyScheme(TerminalSettings terminalSettings) const
+void ColorScheme::ApplyScheme(IControlSettings& terminalSettings) const
 {
  terminalSettings.DefaultForeground(static_cast<COLORREF>(_defaultForeground));
  terminalSettings.DefaultBackground(static_cast<COLORREF>(_defaultBackground));

src/cascadia/TerminalApp/ColorScheme.h

@@ -38,7 +38,7 @@ class TerminalApp::ColorScheme
  ColorScheme(std::wstring name, til::color defaultFg, til::color defaultBg, til::color cursorColor);
  ~ColorScheme();
 
- void ApplyScheme(winrt::Microsoft::Terminal::Settings::TerminalSettings terminalSettings) const;
+ void ApplyScheme(winrt::Microsoft::Terminal::Settings::IControlSettings& terminalSettings) const;
 
  static ColorScheme FromJson(const Json::Value& json);
  bool ShouldBeLayered(const Json::Value& json) const;

src/cascadia/TerminalApp/Profile.cpp

@@ -176,7 +176,8 @@ TerminalSettings Profile::CreateTerminalSettings(const std::unordered_map<std::w
  const auto found = schemes.find(_schemeName.value());
  if (found != schemes.end())
  {
- found->second.ApplyScheme(terminalSettings);
+ IControlSettings controlSettings = terminalSettings;
+ found->second.ApplyScheme(controlSettings);
  }
  }
  if (_defaultForeground)

src/cascadia/TerminalApp/Resources/en-US/Resources.resw

@@ -526,6 +526,10 @@
  <data name="ToggleCommandPaletteCommandKey" xml:space="preserve">
  <value>Toggle command palette</value>
  </data>
+ <data name="SetColorSchemeCommandKey" xml:space="preserve">
+ <value>Set color scheme to {0}</value>
+ <comment>{0} will be replaced with the name of a color scheme as defined by the user.</comment>
+ </data>
  <data name="SetTabColorCommandKey" xml:space="preserve">
  <value>Set tab color to {0}</value>
  <comment>{0} will be replaced with a color, displayed in hexadecimal (#RRGGBB) notation.</comment>

src/cascadia/TerminalApp/ShortcutActionDispatch.cpp

@@ -179,6 +179,11 @@ namespace winrt::TerminalApp::implementation
  _ToggleCommandPaletteHandlers(*this, *eventArgs);
  break;
  }
+ case ShortcutAction::SetColorScheme:
+ {
+ _SetColorSchemeHandlers(*this, *eventArgs);
+ break;
+ }
  case ShortcutAction::SetTabColor:
  {
  _SetTabColorHandlers(*this, *eventArgs);

src/cascadia/TerminalApp/ShortcutActionDispatch.h

@@ -51,6 +51,7 @@ namespace winrt::TerminalApp::implementation
  TYPED_EVENT(ToggleFullscreen, TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
  TYPED_EVENT(ToggleAlwaysOnTop, TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
  TYPED_EVENT(ToggleCommandPalette, TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
+ TYPED_EVENT(SetColorScheme, TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
  TYPED_EVENT(SetTabColor, TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
  TYPED_EVENT(OpenTabColorPicker, TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);
  TYPED_EVENT(RenameTab, TerminalApp::ShortcutActionDispatch, TerminalApp::ActionEventArgs);

src/cascadia/TerminalApp/ShortcutActionDispatch.idl

@@ -36,6 +36,7 @@ namespace TerminalApp
  ToggleFullscreen,
  ToggleAlwaysOnTop,
  OpenSettings,
+ SetColorScheme,
  SetTabColor,
  OpenTabColorPicker,
  RenameTab,
@@ -82,6 +83,7 @@ namespace TerminalApp
  event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> ToggleFullscreen;
  event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> ToggleAlwaysOnTop;
  event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> ToggleCommandPalette;
+ event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> SetColorScheme;
  event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> SetTabColor;
  event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> OpenTabColorPicker;
  event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, ActionEventArgs> RenameTab;

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -869,6 +869,7 @@ namespace winrt::TerminalApp::implementation
  _actionDispatch->ToggleFullscreen({ this, &TerminalPage::_HandleToggleFullscreen });
  _actionDispatch->ToggleAlwaysOnTop({ this, &TerminalPage::_HandleToggleAlwaysOnTop });
  _actionDispatch->ToggleCommandPalette({ this, &TerminalPage::_HandleToggleCommandPalette });
+ _actionDispatch->SetColorScheme({ this, &TerminalPage::_HandleSetColorScheme });
  _actionDispatch->SetTabColor({ this, &TerminalPage::_HandleSetTabColor });
  _actionDispatch->OpenTabColorPicker({ this, &TerminalPage::_HandleOpenTabColorPicker });
  _actionDispatch->RenameTab({ this, &TerminalPage::_HandleRenameTab });

src/cascadia/TerminalApp/TerminalPage.h

@@ -219,6 +219,7 @@ namespace winrt::TerminalApp::implementation
  void _HandleToggleFocusMode(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
  void _HandleToggleFullscreen(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
  void _HandleToggleAlwaysOnTop(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
+ void _HandleSetColorScheme(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
  void _HandleSetTabColor(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
  void _HandleOpenTabColorPicker(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);
  void _HandleRenameTab(const IInspectable& sender, const TerminalApp::ActionEventArgs& args);

src/cascadia/TerminalControl/TermControl.cpp

@@ -2819,6 +2819,11 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
  _renderer->ResetErrorStateAndResume();
  }
 
+ Settings::IControlSettings TermControl::Settings() const
+ {
+ return _settings;
+ }
+
  // -------------------------------- WinRT Events ---------------------------------
  // Winrt events need a method for adding a callback to the event and removing the callback.
  // These macros will define them both for you.

src/cascadia/TerminalControl/TermControl.h

@@ -99,6 +99,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
  const Windows::UI::Xaml::Thickness GetPadding();
 
  TerminalConnection::ConnectionState ConnectionState() const;
+ Settings::IControlSettings Settings() const;
 
  static Windows::Foundation::Size GetProposedDimensions(Microsoft::Terminal::Settings::IControlSettings const& settings, const uint32_t dpi);
  static Windows::Foundation::Size GetProposedDimensions(const winrt::Windows::Foundation::Size& initialSizeInChars,

src/cascadia/TerminalControl/TermControl.idl

@@ -38,6 +38,7 @@ namespace Microsoft.Terminal.TerminalControl
  static Windows.Foundation.Size GetProposedDimensions(Microsoft.Terminal.Settings.IControlSettings settings, UInt32 dpi);
 
  void UpdateSettings(Microsoft.Terminal.Settings.IControlSettings newSettings);
+ Microsoft.Terminal.Settings.IControlSettings Settings { get; };
 
  event TitleChangedEventArgs TitleChanged;
  event FontSizeChangedEventArgs FontSizeChanged;