Remove input previewing. We can necro later. It's too hacky

microsoft · Aug 2, 2023 · 7c3fd2a · 7c3fd2a
1 parent 1720905
commit 7c3fd2a
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 64 deletions.
diff --git a/src/cascadia/TerminalApp/ActionPreviewHandlers.cpp b/src/cascadia/TerminalApp/ActionPreviewHandlers.cpp
@@ -50,7 +50,6 @@ namespace winrt::TerminalApp::implementation
         {
         case ShortcutAction::SetColorScheme:
         case ShortcutAction::AdjustOpacity:
-        case ShortcutAction::SendInput:
         {
             _RunRestorePreviews();
             break;
@@ -141,23 +140,6 @@ namespace winrt::TerminalApp::implementation
         });
     }
 
-    void TerminalPage::_PreviewSendInput(const Settings::Model::SendInputArgs& args)
-    {
-        const auto backup = _restorePreviewFuncs.empty();
-
-        _ApplyToActiveControls([&](const auto& control) {
-            const auto& str{ args.Input() };
-            control.PreviewInput(str);
-
-            if (backup)
-            {
-                _restorePreviewFuncs.emplace_back([=]() {
-                    // On dismiss:
-                    control.PreviewInput(L"");
-                });
-            }
-        });
-    }
     void TerminalPage::_PreviewAction(const Settings::Model::ActionAndArgs& args)
     {
         switch (args.Action())
@@ -168,9 +150,6 @@ namespace winrt::TerminalApp::implementation
         case ShortcutAction::AdjustOpacity:
             _PreviewAdjustOpacity(args.Args().try_as<AdjustOpacityArgs>());
             break;
-        case ShortcutAction::SendInput:
-            _PreviewSendInput(args.Args().try_as<SendInputArgs>());
-            break;
         }
 
         // GH#9818 Other ideas for actions that could be preview-able:

diff --git a/src/cascadia/TerminalApp/TerminalPage.h b/src/cascadia/TerminalApp/TerminalPage.h
@@ -485,7 +485,6 @@ namespace winrt::TerminalApp::implementation
         void _RunRestorePreviews();
         void _PreviewColorScheme(const Microsoft::Terminal::Settings::Model::SetColorSchemeArgs& args);
         void _PreviewAdjustOpacity(const Microsoft::Terminal::Settings::Model::AdjustOpacityArgs& args);
-        void _PreviewSendInput(const Microsoft::Terminal::Settings::Model::SendInputArgs& args);
 
         winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs _lastPreviewedAction{ nullptr };
         std::vector<std::function<void()>> _restorePreviewFuncs{};

diff --git a/src/cascadia/TerminalControl/TSFInputControl.cpp b/src/cascadia/TerminalControl/TSFInputControl.cpp
@@ -438,29 +438,4 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     {
     }
 
-    void TSFInputControl::ManuallyDisplayText(const winrt::hstring& text)
-    {
-        _focused = !text.empty();
-        Canvas().Visibility(text.empty() ? Visibility::Collapsed : Visibility::Visible);
-
-        _inputBuffer.clear();
-        _activeTextStart = 0;
-        _inComposition = false;
-
-        // HACK trim off leading DEL chars.
-        std::wstring_view view{ text };
-        const auto strBegin = view.find_first_not_of(L"\x7f");
-
-        // What we actually want to display is the text that would remain after
-        // accounting for the leading backspaces. So trim off the leading
-        // backspaces, AND and equal number of "real" characters.
-        if (strBegin != std::wstring::npos)
-        {
-            view = view.substr(strBegin * 2);
-        }
-
-        TextBlock().Text(view);
-        TextBlock().UpdateLayout();
-        TryRedrawCanvas();
-    }
 }
diff --git a/src/cascadia/TerminalControl/TSFInputControl.h b/src/cascadia/TerminalControl/TSFInputControl.h
@@ -40,8 +40,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         void ClearBuffer();
         void TryRedrawCanvas();
 
-        void ManuallyDisplayText(const winrt::hstring& text);
-
         void Close();
 
         // -------------------------------- WinRT Events ---------------------------------

diff --git a/src/cascadia/TerminalControl/TSFInputControl.idl b/src/cascadia/TerminalControl/TSFInputControl.idl
@@ -31,9 +31,6 @@ namespace Microsoft.Terminal.Control
         void ClearBuffer();
         void TryRedrawCanvas();
 
-        void ManuallyDisplayText(String text);
-
-
         void Close();
     }
 }
diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp
@@ -525,9 +525,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
     // - <none>
     void TermControl::SendInput(const winrt::hstring& wstr)
     {
-        // Dismiss any previewed input.
-        PreviewInput(L"");
-
         // only broadcast if there's an actual listener. Saves the overhead of some object creation.
         if (_StringSentHandlers)
         {
@@ -3447,11 +3444,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         return _core.OwningHwnd();
     }
 
-    void TermControl::PreviewInput(const winrt::hstring& text)
-    {
-        TSFInputControl().ManuallyDisplayText(text);
-    }
-
     void TermControl::AddMark(const Control::ScrollMark& mark)
     {
         _core.AddMark(mark);

diff --git a/src/cascadia/TerminalControl/TermControl.h b/src/cascadia/TerminalControl/TermControl.h
@@ -51,8 +51,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
         Windows::Foundation::Size MinimumSize();
         float SnapDimensionToGrid(const bool widthOrHeight, const float dimension);
 
-        void PreviewInput(const winrt::hstring& text);
-
         Windows::Foundation::Point CursorPositionInDips();
 
         void WindowVisibilityChanged(const bool showOrHide);

diff --git a/src/cascadia/TerminalControl/TermControl.idl b/src/cascadia/TerminalControl/TermControl.idl
@@ -121,8 +121,6 @@ namespace Microsoft.Terminal.Control
         // opacity set by the settings should call this instead.
         Double BackgroundOpacity { get; };
 
-        void PreviewInput(String text);
-
         Boolean DisplayCursorWhileBlurred;
 
         Windows.UI.Xaml.Media.Brush BackgroundBrush { get; };