Merge remote-tracking branch 'origin/main' into feature/llm

.github/actions/spelling/expect/expect.txt

@@ -1155,6 +1155,7 @@ NOCONTEXTHELP
 NOCOPYBITS
 NODUP
 noexcepts
+NOFONT
 NOINTEGRALHEIGHT
 NOINTERFACE
 NOLINKINFO

build/pipelines/ci.yml

@@ -4,6 +4,7 @@ trigger:
  include:
  - main
  - feature/*
+ - gh-readonly-queue/*
  paths:
  exclude:
  - doc/*

doc/cascadia/profiles.schema.json

@@ -2333,12 +2333,20 @@
  },
  "type": "array"
  },
- "experimental.rendering.forceFullRepaint": {
- "description": "When set to true, we will redraw the entire screen each frame. When set to false, we will render only the updates to the screen between frames.",
+ "rendering.graphicsAPI": {
+ "description": "Direct3D 11 provides a more performant and feature-rich experience, whereas Direct2D is more stable. The default option \"Automatic\" will pick the API that best fits your graphics hardware. If you experience significant issues, consider using Direct2D.",
+ "type": "string",
+ "enum": [
+ "direct2d",
+ "direct3d11"
+ ]
+ },
+ "rendering.disablePartialInvalidation": {
+ "description": "By default, the text renderer uses a FLIP_SEQUENTIAL Swap Chain and declares dirty rectangles via the Present1 API. When this setting is enabled, a FLIP_DISCARD Swap Chain will be used instead, and no dirty rectangles will be declared. Whether one or the other is better depends on your hardware and various other factors.",
  "type": "boolean"
  },
- "experimental.rendering.software": {
- "description": "When set to true, we will use the software renderer (a.k.a. WARP) instead of the hardware one.",
+ "rendering.software": {
+ "description": "When enabled, the terminal will use a software rasterizer (WARP). This setting should be left disabled under almost all circumstances.",
  "type": "boolean"
  },
  "experimental.input.forceVT": {

src/cascadia/LocalTests_TerminalApp/TabTests.cpp

@@ -1326,7 +1326,7 @@ namespace TerminalAppLocalTests
  const auto& controlSettings = activeControl.Settings();
  VERIFY_IS_NOT_NULL(controlSettings);
 
- VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, controlSettings.DefaultBackground());
+ VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, til::color{ controlSettings.DefaultBackground() });
  });
 
  TestOnUIThread([&page]() {
@@ -1344,7 +1344,7 @@ namespace TerminalAppLocalTests
  VERIFY_IS_NOT_NULL(controlSettings);
 
  Log::Comment(L"Color should be changed to the preview");
- VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, controlSettings.DefaultBackground());
+ VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, til::color{ controlSettings.DefaultBackground() });
 
  // And we should have stored a function to revert the change.
  VERIFY_ARE_EQUAL(1u, page->_restorePreviewFuncs.size());
@@ -1366,7 +1366,7 @@ namespace TerminalAppLocalTests
  VERIFY_IS_NOT_NULL(controlSettings);
 
  Log::Comment(L"Color should be changed");
- VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, controlSettings.DefaultBackground());
+ VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, til::color{ controlSettings.DefaultBackground() });
 
  // After preview there should be no more restore functions to execute.
  VERIFY_ARE_EQUAL(0u, page->_restorePreviewFuncs.size());
@@ -1394,7 +1394,7 @@ namespace TerminalAppLocalTests
  const auto& controlSettings = activeControl.Settings();
  VERIFY_IS_NOT_NULL(controlSettings);
 
- VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, controlSettings.DefaultBackground());
+ VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, til::color{ controlSettings.DefaultBackground() });
  });
 
  TestOnUIThread([&page]() {
@@ -1412,7 +1412,7 @@ namespace TerminalAppLocalTests
  VERIFY_IS_NOT_NULL(controlSettings);
 
  Log::Comment(L"Color should be changed to the preview");
- VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, controlSettings.DefaultBackground());
+ VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, til::color{ controlSettings.DefaultBackground() });
  });
 
  TestOnUIThread([&page]() {
@@ -1428,7 +1428,7 @@ namespace TerminalAppLocalTests
  VERIFY_IS_NOT_NULL(controlSettings);
 
  Log::Comment(L"Color should be the same as it originally was");
- VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, controlSettings.DefaultBackground());
+ VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, til::color{ controlSettings.DefaultBackground() });
  });
  Log::Comment(L"Sleep to let events propagate");
  Sleep(250);
@@ -1450,7 +1450,7 @@ namespace TerminalAppLocalTests
  const auto& controlSettings = activeControl.Settings();
  VERIFY_IS_NOT_NULL(controlSettings);
 
- VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, controlSettings.DefaultBackground());
+ VERIFY_ARE_EQUAL(til::color{ 0xff0c0c0c }, til::color{ controlSettings.DefaultBackground() });
  });
 
  TestOnUIThread([&page]() {
@@ -1467,7 +1467,7 @@ namespace TerminalAppLocalTests
  VERIFY_IS_NOT_NULL(controlSettings);
 
  Log::Comment(L"Color should be changed to the preview");
- VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, controlSettings.DefaultBackground());
+ VERIFY_ARE_EQUAL(til::color{ 0xff000000 }, til::color{ controlSettings.DefaultBackground() });
  });
 
  TestOnUIThread([&page]() {
@@ -1484,7 +1484,7 @@ namespace TerminalAppLocalTests
  VERIFY_IS_NOT_NULL(controlSettings);
 
  Log::Comment(L"Color should be changed to the preview");
- VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, controlSettings.DefaultBackground());
+ VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, til::color{ controlSettings.DefaultBackground() });
  });
 
  TestOnUIThread([&page]() {
@@ -1503,7 +1503,7 @@ namespace TerminalAppLocalTests
  VERIFY_IS_NOT_NULL(controlSettings);
 
  Log::Comment(L"Color should be changed");
- VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, controlSettings.DefaultBackground());
+ VERIFY_ARE_EQUAL(til::color{ 0xffFAFAFA }, til::color{ controlSettings.DefaultBackground() });
  });
  Log::Comment(L"Sleep to let events propagate");
  Sleep(250);

src/cascadia/LocalTests_TerminalApp/pch.h

@@ -56,6 +56,8 @@ Author(s):
 #include <winrt/windows.applicationmodel.core.h>
 
 #include <winrt/Microsoft.Terminal.TerminalConnection.h>
+#include <winrt/Microsoft.Terminal.Core.h>
+#include <winrt/Microsoft.Terminal.Control.h>
 #include <winrt/Microsoft.Terminal.Settings.Model.h>
 
 #include <winrt/Microsoft.UI.Xaml.Controls.h>

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -5,6 +5,7 @@
 #include "App.h"
 
 #include "TerminalPage.h"
+#include "ScratchpadContent.h"
 #include "../WinRTUtils/inc/WtExeUtils.h"
 #include "../../types/inc/utils.hpp"
 #include "Utils.h"
@@ -1418,7 +1419,7 @@ namespace winrt::TerminalApp::implementation
  {
  if (const auto activePane{ activeTab->GetActivePane() })
  {
- _restartPaneConnection(activePane);
+ _restartPaneConnection(activePane->GetContent().try_as<TerminalApp::TerminalPaneContent>(), nullptr);
  }
  }
  args.Handled(true);
@@ -1433,6 +1434,25 @@ namespace winrt::TerminalApp::implementation
  }
  args.Handled(true);
  }
+
+ void TerminalPage::_HandleOpenScratchpad(const IInspectable& /*sender*/,
+ const ActionEventArgs& args)
+ {
+ if (Feature_ScratchpadPane::IsEnabled())
+ {
+ const auto& scratchPane{ winrt::make_self<ScratchpadContent>() };
+
+ // This is maybe a little wacky - add our key event handler to the pane
+ // we made. So that we can get actions for keys that the content didn't
+ // handle.
+ scratchPane->GetRoot().KeyDown({ this, &TerminalPage::_KeyDownHandler });
+
+ const auto resultPane = std::make_shared<Pane>(*scratchPane);
+ _SplitPane(_GetFocusedTabImpl(), SplitDirection::Automatic, 0.5f, resultPane);
+ args.Handled(true);
+ }
+ }
+
  void TerminalPage::_HandleOpenAbout(const IInspectable& /*sender*/,
  const ActionEventArgs& args)
  {

src/cascadia/TerminalApp/IPaneContent.idl

@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace TerminalApp
+{
+
+ runtimeclass BellEventArgs
+ {
+ Boolean FlashTaskbar { get; };
+ };
+
+ interface IPaneContent
+ {
+ Windows.UI.Xaml.FrameworkElement GetRoot();
+
+ Windows.Foundation.Size MinimumSize { get; };
+
+ String Title { get; };
+ UInt64 TaskbarState { get; };
+ UInt64 TaskbarProgress { get; };
+ Boolean ReadOnly { get; };
+
+ Microsoft.Terminal.Settings.Model.NewTerminalArgs GetNewTerminalArgs(Boolean asContent);
+
+ void Focus(Windows.UI.Xaml.FocusState reason);
+
+ void Close();
+
+ event Windows.Foundation.TypedEventHandler<IPaneContent, Object> CloseRequested;
+
+ event Windows.Foundation.TypedEventHandler<Object, Object> ConnectionStateChanged;
+ event Windows.Foundation.TypedEventHandler<IPaneContent, BellEventArgs> BellRequested;
+ event Windows.Foundation.TypedEventHandler<IPaneContent, Object> TitleChanged;
+ event Windows.Foundation.TypedEventHandler<IPaneContent, Object> TabColorChanged;
+ event Windows.Foundation.TypedEventHandler<IPaneContent, Object> TaskbarProgressChanged;
+ event Windows.Foundation.TypedEventHandler<IPaneContent, Object> ReadOnlyChanged;
+ event Windows.Foundation.TypedEventHandler<IPaneContent, Object> FocusRequested;
+ };
+
+
+ enum PaneSnapDirection
+ {
+ Width,
+ Height
+ };
+
+ interface ISnappable
+ {
+ Single SnapDownToGrid(PaneSnapDirection direction, Single sizeToSnap);
+ Windows.Foundation.Size GridUnitSize { get; };
+ };
+}