Switch to the I-beam cursor when hovering over the terminal

.github/actions/spell-check/whitelist/whitelist.txt

@@ -1075,6 +1075,7 @@ IAction
 IApi
 IApplication
 IBase
+IBeam
 icacls
 iccex
 icch

src/cascadia/TerminalControl/TermControl.cpp

@@ -70,7 +70,9 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         _lastMouseClickTimestamp{},
         _lastMouseClickPos{},
         _selectionNeedsToBeCopied{ false },
-        _searchBox{ nullptr }
+        _searchBox{ nullptr },
+        _textCursor{ Windows::UI::Core::CoreCursorType::IBeam, 0 },
+        _pointerCursor{ Windows::UI::Core::CoreCursorType::Arrow, 0 }
     {
         _EnsureStaticInitialization();
         InitializeComponent();
@@ -588,6 +590,12 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
 
         auto inputFn = std::bind(&TermControl::_SendInputToConnection, this, std::placeholders::_1);
         _terminal->SetWriteInputCallback(inputFn);
+        _terminal->SetMouseModeChangedCallback([weakThis = get_weak()]() {
+            if (auto strongThis{ weakThis.get() })
+            {
+                strongThis->_TerminalMouseModeChanged();
+            }
+        });
 
         _SwapChainRoutine();
 
@@ -714,6 +722,11 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
             e.OriginalKey() == VirtualKey::RightWindows)
 
         {
+            if (!_closing && e.OriginalKey() == VirtualKey::Shift)
+            {
+                // If the user presses or releases shift, check whether we're in mouse mode and the cursor needs updating
+                _TerminalMouseModeChanged();
+            }
             e.Handled(true);
             return;
         }
@@ -765,6 +778,23 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         e.Handled(handled);
     }
 
+    void TermControl::_KeyUpHandler(winrt::Windows::Foundation::IInspectable const& /*sender*/,
+                                    Input::KeyRoutedEventArgs const& e)
+    {
+        // If the current focused element is a child element of searchbox,
+        // we do not send this event up to terminal
+        if (_searchBox && _searchBox->ContainsFocus())
+        {
+            return;
+        }
+
+        if (!_closing && e.OriginalKey() == VirtualKey::Shift)
+        {
+            // If the user presses or releases shift, check whether we're in mouse mode and the cursor needs updating
+            _TerminalMouseModeChanged();
+        }
+    }
+
     // Method Description:
     // - Send this particular key event to the terminal.
     //   See Terminal::SendKeyEvent for more information.
@@ -888,6 +918,18 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         return _terminal->IsTrackingMouseInput();
     }
 
+    // Method Description:
+    // - Handles changes in mouse mode state
+    winrt::fire_and_forget TermControl::_TerminalMouseModeChanged()
+    {
+        co_await Dispatcher();
+        if (_oldCursor) // if we have an active cursor transition
+        {
+            auto coreWindow = Window::Current().CoreWindow();
+            coreWindow.PointerCursor(_CanSendVTMouseInput() ? _pointerCursor : _textCursor);
+        }
+    }
+
     // Method Description:
     // - handle a mouse click event. Begin selection process.
     // Arguments:
@@ -1147,6 +1189,45 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         args.Handled(true);
     }
 
+    // Method Description:
+    // - Event handler for the PointerEntered event. We use this for cursor manipulation.
+    // Arguments:
+    // - sender: the XAML element responding to the pointer input
+    // - args: event data
+    void TermControl::_PointerEnteredHandler(Windows::Foundation::IInspectable const& /*sender*/,
+                                             Input::PointerRoutedEventArgs const& /*args*/)
+    {
+        if (_closing)
+        {
+            return;
+        }
+
+        auto coreWindow = Window::Current().CoreWindow();
+        _oldCursor = coreWindow.PointerCursor();
+
+        if (_terminal->IsTrackingMouseInput())
+        {
+            return;
+        }
+
+        coreWindow.PointerCursor(_textCursor);
+    }
+
+    // Method Description:
+    // - Event handler for the PointerExited event. We use this for cursor manipulation.
+    // Arguments:
+    // - sender: the XAML element responding to the pointer input
+    // - args: event data
+    void TermControl::_PointerExitedHandler(Windows::Foundation::IInspectable const& /*sender*/,
+                                            Input::PointerRoutedEventArgs const& /*args*/)
+    {
+        if (auto oldCursor{ std::exchange(_oldCursor, std::nullopt) })
+        {
+            auto coreWindow = Window::Current().CoreWindow();
+            coreWindow.PointerCursor(*oldCursor);
+        }
+    }
+
     // Method Description:
     // - Event handler for the PointerWheelChanged event. This is raised in
     //   response to mouse wheel changes. Depending upon what modifier keys are

src/cascadia/TerminalControl/TermControl.h

@@ -167,6 +167,10 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
 
         winrt::Windows::UI::Xaml::Controls::SwapChainPanel::LayoutUpdated_revoker _layoutUpdatedRevoker;
 
+        std::optional<winrt::Windows::UI::Core::CoreCursor> _oldCursor; // when we toggle the cursor, we have to save it here to restore it
+        winrt::Windows::UI::Core::CoreCursor _textCursor;
+        winrt::Windows::UI::Core::CoreCursor _pointerCursor;
+
         void _ApplyUISettings();
         void _InitializeBackgroundBrush();
         winrt::fire_and_forget _BackgroundColorChanged(const uint32_t color);
@@ -175,10 +179,13 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         void _SetFontSize(int fontSize);
         void _TappedHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::TappedRoutedEventArgs const& e);
         void _KeyDownHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e);
+        void _KeyUpHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e);
         void _CharacterHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::CharacterReceivedRoutedEventArgs const& e);
         void _PointerPressedHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
         void _PointerMovedHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
         void _PointerReleasedHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
+        void _PointerEnteredHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
+        void _PointerExitedHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
         void _MouseWheelHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs const& e);
         void _ScrollbarChangeHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Controls::Primitives::RangeBaseValueChangedEventArgs const& e);
         void _GotFocusHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);
@@ -216,6 +223,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         bool _TrySendKeyEvent(const WORD vkey, const WORD scanCode, ::Microsoft::Terminal::Core::ControlKeyStates modifiers);
         bool _TrySendMouseEvent(Windows::UI::Input::PointerPoint const& point);
         bool _CanSendVTMouseInput();
+        winrt::fire_and_forget _TerminalMouseModeChanged();
 
         const COORD _GetTerminalPosition(winrt::Windows::Foundation::Point cursorPosition);
         const unsigned int _NumberOfClicks(winrt::Windows::Foundation::Point clickPos, Timestamp clickTime);

src/cascadia/TerminalControl/TermControl.xaml

@@ -19,6 +19,7 @@
     Tapped="_TappedHandler"
     PointerWheelChanged="_MouseWheelHandler"
     PreviewKeyDown="_KeyDownHandler"
+    KeyUp="_KeyUpHandler"
     CharacterReceived="_CharacterHandler"
     GotFocus="_GotFocusHandler"
     LostFocus="_LostFocusHandler">
@@ -43,7 +44,9 @@
                                 CompositionScaleChanged="_SwapChainScaleChanged"
                                 PointerPressed="_PointerPressedHandler"
                                 PointerMoved="_PointerMovedHandler"
-                                PointerReleased="_PointerReleasedHandler" />
+                                PointerReleased="_PointerReleasedHandler"
+                                PointerEntered="_PointerEnteredHandler"
+                                PointerExited="_PointerExitedHandler" />
 
                 <!-- Putting this in a grid w/ the SwapChainPanel
                 ensures that it's always aligned w/ the scrollbar -->

src/cascadia/TerminalCore/Terminal.cpp

@@ -791,3 +791,12 @@ bool Terminal::IsCursorBlinkingAllowed() const noexcept
     const auto& cursor = _buffer->GetCursor();
     return cursor.IsBlinkingAllowed();
 }
+
+// Routine Description:
+// - Sets up the callback for mouse input mode changes
+// Parameters:
+// - mouseModeChangedCallback: the callback
+void Terminal::SetMouseModeChangedCallback(std::function<void()> mouseModeChangedCallback) noexcept
+{
+    _terminalInput->SetMouseModeChangedCallback(std::move(mouseModeChangedCallback));
+}

src/cascadia/TerminalCore/Terminal.hpp

@@ -172,6 +172,7 @@ class Microsoft::Terminal::Core::Terminal final :
 
     void SetCursorOn(const bool isOn) noexcept;
     bool IsCursorBlinkingAllowed() const noexcept;
+    void SetMouseModeChangedCallback(std::function<void()> mouseModeChangedCallback) noexcept;
 
 #pragma region TextSelection
     // These methods are defined in TerminalSelection.cpp

src/terminal/input/mouseInputState.cpp

@@ -47,6 +47,15 @@ void TerminalInput::EnableDefaultTracking(const bool enable) noexcept
     _mouseInputState.trackingMode = enable ? TrackingMode::Default : TrackingMode::None;
     _mouseInputState.lastPos = { -1, -1 }; // Clear out the last saved mouse position & button.
     _mouseInputState.lastButton = 0;
+
+    if (_mouseModeChangedCallback)
+    {
+        try
+        {
+            _mouseModeChangedCallback();
+        }
+        CATCH_LOG();
+    }
 }
 
 // Routine Description:
@@ -63,6 +72,15 @@ void TerminalInput::EnableButtonEventTracking(const bool enable) noexcept
     _mouseInputState.trackingMode = enable ? TrackingMode::ButtonEvent : TrackingMode::None;
     _mouseInputState.lastPos = { -1, -1 }; // Clear out the last saved mouse position & button.
     _mouseInputState.lastButton = 0;
+
+    if (_mouseModeChangedCallback)
+    {
+        try
+        {
+            _mouseModeChangedCallback();
+        }
+        CATCH_LOG();
+    }
 }
 
 // Routine Description:
@@ -79,6 +97,15 @@ void TerminalInput::EnableAnyEventTracking(const bool enable) noexcept
     _mouseInputState.trackingMode = enable ? TrackingMode::AnyEvent : TrackingMode::None;
     _mouseInputState.lastPos = { -1, -1 }; // Clear out the last saved mouse position & button.
     _mouseInputState.lastButton = 0;
+
+    if (_mouseModeChangedCallback)
+    {
+        try
+        {
+            _mouseModeChangedCallback();
+        }
+        CATCH_LOG();
+    }
 }
 
 // Routine Description:
@@ -113,3 +140,12 @@ void TerminalInput::UseMainScreenBuffer() noexcept
 {
     _mouseInputState.inAlternateBuffer = false;
 }
+
+// Routine Description:
+// - Sets up the callback for mouse input mode changes
+// Parameters:
+// - mouseModeChangedCallback: the callback
+void TerminalInput::SetMouseModeChangedCallback(std::function<void()> mouseModeChangedCallback) noexcept
+{
+    _mouseModeChangedCallback = std::move(mouseModeChangedCallback);
+}

src/terminal/input/terminalInput.hpp

@@ -60,10 +60,13 @@ namespace Microsoft::Console::VirtualTerminal
         void EnableAlternateScroll(const bool enable) noexcept;
         void UseAlternateScreenBuffer() noexcept;
         void UseMainScreenBuffer() noexcept;
+
+        void SetMouseModeChangedCallback(std::function<void()> mouseModeChangedCallback) noexcept;
 #pragma endregion
 
     private:
         std::function<void(std::deque<std::unique_ptr<IInputEvent>>&)> _pfnWriteEvents;
+        std::function<void()> _mouseModeChangedCallback;
 
         // storage location for the leading surrogate of a utf-16 surrogate pair
         std::optional<wchar_t> _leadingSurrogate;