From 5f9c551b7edced4ed72a4b9694998143f96589a3 Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Thu, 20 Jan 2022 11:33:26 -0600
Subject: [PATCH 1/2] this fixes it in a braindead way. Gonna try and clear
 some of this up though...

---
 src/cascadia/TerminalApp/App.xaml         | 2 +-
 src/cascadia/TerminalApp/TerminalPage.cpp | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/cascadia/TerminalApp/App.xaml b/src/cascadia/TerminalApp/App.xaml
index 251028dee8f..3a880ead372 100644
--- a/src/cascadia/TerminalApp/App.xaml
+++ b/src/cascadia/TerminalApp/App.xaml
@@ -21,7 +21,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <!--  Include the MUX Controls resources  -->
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"
-                                       ControlsResourcesVersion="Version1" />
+                                       ControlsResourcesVersion="Version2" />
                 <ResourceDictionary>
 
                     <!--
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index 4d0e4584054..cd86011483b 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -1991,6 +1991,11 @@ namespace winrt::TerminalApp::implementation
                     const auto focusedTab = _GetFocusedTabImpl();
                     // Do not warn about multi line pasting if the current tab has bracketed paste enabled.
                     warnMultiLine = warnMultiLine && !focusedTab->GetActiveTerminalControl().BracketedPasteEnabled();
+                    if (!warnLargeText && !warnMultiLine)
+                    {
+                        eventArgs.HandleClipboardData(text);
+                        co_return;
+                    }
                 }
 
                 // We have to initialize the dialog here to be able to change the text of the text block within it

From 685ea899ca9bcf3dd695f2a5650e5b399f9b34b7 Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Thu, 20 Jan 2022 12:13:01 -0600
Subject: [PATCH 2/2] much cleaner

---
 src/cascadia/TerminalApp/App.xaml                |  2 +-
 src/cascadia/TerminalApp/TerminalPage.cpp        | 16 +++-------------
 .../TerminalControl/ControlInteractivity.cpp     |  2 +-
 src/cascadia/TerminalControl/EventArgs.h         |  7 +++++--
 src/cascadia/TerminalControl/EventArgs.idl       |  1 +
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/cascadia/TerminalApp/App.xaml b/src/cascadia/TerminalApp/App.xaml
index 3a880ead372..251028dee8f 100644
--- a/src/cascadia/TerminalApp/App.xaml
+++ b/src/cascadia/TerminalApp/App.xaml
@@ -21,7 +21,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <!--  Include the MUX Controls resources  -->
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"
-                                       ControlsResourcesVersion="Version2" />
+                                       ControlsResourcesVersion="Version1" />
                 <ResourceDictionary>
 
                     <!--
diff --git a/src/cascadia/TerminalApp/TerminalPage.cpp b/src/cascadia/TerminalApp/TerminalPage.cpp
index cd86011483b..77b877f7cfb 100644
--- a/src/cascadia/TerminalApp/TerminalPage.cpp
+++ b/src/cascadia/TerminalApp/TerminalPage.cpp
@@ -1970,7 +1970,9 @@ namespace winrt::TerminalApp::implementation
                 }
             }
 
-            bool warnMultiLine = _settings.GlobalSettings().WarnAboutMultiLinePaste();
+            // If the requesting terminal is in bracketed paste mode, then we don't need to warn about a multi-line paste.
+            bool warnMultiLine = _settings.GlobalSettings().WarnAboutMultiLinePaste() &&
+                                 !eventArgs.BracketedPasteEnabled();
             if (warnMultiLine)
             {
                 const auto isNewLineLambda = [](auto c) { return c == L'\n' || c == L'\r'; };
@@ -1986,18 +1988,6 @@ namespace winrt::TerminalApp::implementation
             {
                 co_await winrt::resume_foreground(Dispatcher());
 
-                if (warnMultiLine)
-                {
-                    const auto focusedTab = _GetFocusedTabImpl();
-                    // Do not warn about multi line pasting if the current tab has bracketed paste enabled.
-                    warnMultiLine = warnMultiLine && !focusedTab->GetActiveTerminalControl().BracketedPasteEnabled();
-                    if (!warnLargeText && !warnMultiLine)
-                    {
-                        eventArgs.HandleClipboardData(text);
-                        co_return;
-                    }
-                }
-
                 // We have to initialize the dialog here to be able to change the text of the text block within it
                 FindName(L"MultiLinePasteDialog").try_as<WUX::Controls::ContentDialog>();
                 ClipboardText().Text(text);
diff --git a/src/cascadia/TerminalControl/ControlInteractivity.cpp b/src/cascadia/TerminalControl/ControlInteractivity.cpp
index 70c34674a8f..de992e1b379 100644
--- a/src/cascadia/TerminalControl/ControlInteractivity.cpp
+++ b/src/cascadia/TerminalControl/ControlInteractivity.cpp
@@ -174,7 +174,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         // clipboardDataHandler. This is called when the clipboard data is
         // loaded.
         auto clipboardDataHandler = std::bind(&ControlInteractivity::_sendPastedTextToConnection, this, std::placeholders::_1);
-        auto pasteArgs = winrt::make_self<PasteFromClipboardEventArgs>(clipboardDataHandler);
+        auto pasteArgs = winrt::make_self<PasteFromClipboardEventArgs>(clipboardDataHandler, _core->BracketedPasteEnabled());
 
         // send paste event up to TermApp
         _PasteFromClipboardHandlers(*this, *pasteArgs);
diff --git a/src/cascadia/TerminalControl/EventArgs.h b/src/cascadia/TerminalControl/EventArgs.h
index 27dc2c6473f..9f76c061cb3 100644
--- a/src/cascadia/TerminalControl/EventArgs.h
+++ b/src/cascadia/TerminalControl/EventArgs.h
@@ -53,14 +53,17 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     struct PasteFromClipboardEventArgs : public PasteFromClipboardEventArgsT<PasteFromClipboardEventArgs>
     {
     public:
-        PasteFromClipboardEventArgs(std::function<void(std::wstring_view)> clipboardDataHandler) :
-            m_clipboardDataHandler(clipboardDataHandler) {}
+        PasteFromClipboardEventArgs(std::function<void(std::wstring_view)> clipboardDataHandler, bool bracketedPasteEnabled) :
+            m_clipboardDataHandler(clipboardDataHandler),
+            _BracketedPasteEnabled{ bracketedPasteEnabled } {}
 
         void HandleClipboardData(hstring value)
         {
             m_clipboardDataHandler(value);
         };
 
+        WINRT_PROPERTY(bool, BracketedPasteEnabled, false);
+
     private:
         std::function<void(std::wstring_view)> m_clipboardDataHandler;
     };
diff --git a/src/cascadia/TerminalControl/EventArgs.idl b/src/cascadia/TerminalControl/EventArgs.idl
index dae093f51f8..f81a4153ba5 100644
--- a/src/cascadia/TerminalControl/EventArgs.idl
+++ b/src/cascadia/TerminalControl/EventArgs.idl
@@ -30,6 +30,7 @@ namespace Microsoft.Terminal.Control
     runtimeclass PasteFromClipboardEventArgs
     {
         void HandleClipboardData(String data);
+        Boolean BracketedPasteEnabled { get; };
     }
 
     runtimeclass OpenHyperlinkEventArgs