02ac246807
## Summary of the Pull Request As a part of the Interactivity split, `TermControlAutomationPeer` had to be split into `TermControlAutomationPeer` (TCAP) and `InteractivityAutomationPeer` (IAP). Just about all of the functions in `InterativityAutomationPeer` operate by calling the non-XAML UIA Provider then wrapping the resulting `UIATextRange` into a XAML format (a `XamlUiaTextRange` [XUTR]). As a part of that XUTR constructor, we need a reference to the parent provider. We generally get that via `ProviderFromPeer()`, but IAP's `ProviderFromPeer()` returned null (presumably because IAP isn't in the UI tree, whereas TCAP is directly registered as the automation peer for the `TermControl`). It looks like some screen readers didn't care (like NVDA, though there may be a chance we just didn't encounter an issue just yet), but Narrator definitely did. The fix was to provide XUTR constructors the `ProviderFromPeer` from TCAP, _not_ IAP. To accomplish this, IAP now holds a weak reference to TCAP, and provides the `ProviderFromPeer` when needed. We can't cache this result because there is no guarantee that it won't change. Some miscellaneous changes include: - `TermControl::OnCreateAutomationPeer` now returns the existing auto peer instead of always creating a new one - `TCAP::WrapArrayOfTextRangeProviders` was removed as it was unused (normally, this would be directly affected by the main `ProviderFromPeer` change here) - `XUTR::GetEnclosingElement` is now hooked up to trace logging for debugging purposes ## References Introduced in #10051 Closes #11488 ## Validation Steps Performed ✅ Narrator scan mode now works (verified with character, word, and line navigation) ✅ NVDA movement still works (verified with word and line navigation)
231 lines
8.1 KiB
C++
231 lines
8.1 KiB
C++
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
#include "pch.h"
|
|
#include <UIAutomationCore.h>
|
|
#include <LibraryResources.h>
|
|
#include "TermControlAutomationPeer.h"
|
|
#include "TermControl.h"
|
|
#include "TermControlAutomationPeer.g.cpp"
|
|
|
|
#include "XamlUiaTextRange.h"
|
|
#include "../types/UiaTracing.h"
|
|
|
|
using namespace Microsoft::Console::Types;
|
|
using namespace winrt::Windows::UI::Xaml::Automation::Peers;
|
|
using namespace winrt::Windows::Graphics::Display;
|
|
|
|
namespace UIA
|
|
{
|
|
using ::ITextRangeProvider;
|
|
using ::SupportedTextSelection;
|
|
}
|
|
|
|
namespace XamlAutomation
|
|
{
|
|
using winrt::Windows::UI::Xaml::Automation::SupportedTextSelection;
|
|
using winrt::Windows::UI::Xaml::Automation::Provider::IRawElementProviderSimple;
|
|
using winrt::Windows::UI::Xaml::Automation::Provider::ITextRangeProvider;
|
|
}
|
|
|
|
namespace winrt::Microsoft::Terminal::Control::implementation
|
|
{
|
|
TermControlAutomationPeer::TermControlAutomationPeer(TermControl* owner,
|
|
const Core::Padding padding,
|
|
Control::InteractivityAutomationPeer impl) :
|
|
TermControlAutomationPeerT<TermControlAutomationPeer>(*owner), // pass owner to FrameworkElementAutomationPeer
|
|
_termControl{ owner },
|
|
_contentAutomationPeer{ impl }
|
|
{
|
|
UpdateControlBounds();
|
|
SetControlPadding(padding);
|
|
// Listen for UIA signalling events from the implementation. We need to
|
|
// be the one to actually raise these automation events, so they go
|
|
// through the UI tree correctly.
|
|
_contentAutomationPeer.SelectionChanged([this](auto&&, auto&&) { SignalSelectionChanged(); });
|
|
_contentAutomationPeer.TextChanged([this](auto&&, auto&&) { SignalTextChanged(); });
|
|
_contentAutomationPeer.CursorChanged([this](auto&&, auto&&) { SignalCursorChanged(); });
|
|
_contentAutomationPeer.ParentProvider(*this);
|
|
};
|
|
|
|
// Method Description:
|
|
// - Inform the interactivity layer about the bounds of the control.
|
|
// IControlAccessibilityInfo needs to know this information, but it cannot
|
|
// ask us directly.
|
|
// Arguments:
|
|
// - <none>
|
|
// Return Value:
|
|
// - <none>
|
|
void TermControlAutomationPeer::UpdateControlBounds()
|
|
{
|
|
// FrameworkElementAutomationPeer has this great GetBoundingRectangle
|
|
// method that's seemingly impossible to recreate just from the
|
|
// UserControl itself. Weird. But we can use it handily here!
|
|
_contentAutomationPeer.SetControlBounds(GetBoundingRectangle());
|
|
}
|
|
void TermControlAutomationPeer::SetControlPadding(const Core::Padding padding)
|
|
{
|
|
_contentAutomationPeer.SetControlPadding(padding);
|
|
}
|
|
|
|
// Method Description:
|
|
// - Signals the ui automation client that the terminal's selection has changed and should be updated
|
|
// Arguments:
|
|
// - <none>
|
|
// Return Value:
|
|
// - <none>
|
|
void TermControlAutomationPeer::SignalSelectionChanged()
|
|
{
|
|
UiaTracing::Signal::SelectionChanged();
|
|
auto dispatcher{ Dispatcher() };
|
|
if (!dispatcher)
|
|
{
|
|
return;
|
|
}
|
|
dispatcher.RunAsync(Windows::UI::Core::CoreDispatcherPriority::Normal, [weakThis{ get_weak() }]() {
|
|
if (auto strongThis{ weakThis.get() })
|
|
{
|
|
// The event that is raised when the text selection is modified.
|
|
strongThis->RaiseAutomationEvent(AutomationEvents::TextPatternOnTextSelectionChanged);
|
|
}
|
|
});
|
|
}
|
|
|
|
// Method Description:
|
|
// - Signals the ui automation client that the terminal's output has changed and should be updated
|
|
// Arguments:
|
|
// - <none>
|
|
// Return Value:
|
|
// - <none>
|
|
void TermControlAutomationPeer::SignalTextChanged()
|
|
{
|
|
UiaTracing::Signal::TextChanged();
|
|
auto dispatcher{ Dispatcher() };
|
|
if (!dispatcher)
|
|
{
|
|
return;
|
|
}
|
|
dispatcher.RunAsync(Windows::UI::Core::CoreDispatcherPriority::Normal, [weakThis{ get_weak() }]() {
|
|
if (auto strongThis{ weakThis.get() })
|
|
{
|
|
// The event that is raised when textual content is modified.
|
|
strongThis->RaiseAutomationEvent(AutomationEvents::TextPatternOnTextChanged);
|
|
}
|
|
});
|
|
}
|
|
|
|
// Method Description:
|
|
// - Signals the ui automation client that the cursor's state has changed and should be updated
|
|
// Arguments:
|
|
// - <none>
|
|
// Return Value:
|
|
// - <none>
|
|
void TermControlAutomationPeer::SignalCursorChanged()
|
|
{
|
|
UiaTracing::Signal::CursorChanged();
|
|
auto dispatcher{ Dispatcher() };
|
|
if (!dispatcher)
|
|
{
|
|
return;
|
|
}
|
|
dispatcher.RunAsync(Windows::UI::Core::CoreDispatcherPriority::Normal, [weakThis{ get_weak() }]() {
|
|
if (auto strongThis{ weakThis.get() })
|
|
{
|
|
// The event that is raised when the text was changed in an edit control.
|
|
// Do NOT fire a TextEditTextChanged. Generally, an app on the other side
|
|
// will expect more information. Though you can dispatch that event
|
|
// on its own, it may result in a nullptr exception on the other side
|
|
// because no additional information was provided. Crashing the screen
|
|
// reader.
|
|
strongThis->RaiseAutomationEvent(AutomationEvents::TextPatternOnTextSelectionChanged);
|
|
}
|
|
});
|
|
}
|
|
|
|
hstring TermControlAutomationPeer::GetClassNameCore() const
|
|
{
|
|
return L"TermControl";
|
|
}
|
|
|
|
AutomationControlType TermControlAutomationPeer::GetAutomationControlTypeCore() const
|
|
{
|
|
return AutomationControlType::Text;
|
|
}
|
|
|
|
hstring TermControlAutomationPeer::GetLocalizedControlTypeCore() const
|
|
{
|
|
return RS_(L"TerminalControl_ControlType");
|
|
}
|
|
|
|
Windows::Foundation::IInspectable TermControlAutomationPeer::GetPatternCore(PatternInterface patternInterface) const
|
|
{
|
|
switch (patternInterface)
|
|
{
|
|
case PatternInterface::Text:
|
|
return *this;
|
|
break;
|
|
default:
|
|
return nullptr;
|
|
}
|
|
}
|
|
|
|
AutomationOrientation TermControlAutomationPeer::GetOrientationCore() const
|
|
{
|
|
return AutomationOrientation::Vertical;
|
|
}
|
|
|
|
hstring TermControlAutomationPeer::GetNameCore() const
|
|
{
|
|
// fallback to title if profile name is empty
|
|
auto profileName = _termControl->GetProfileName();
|
|
if (profileName.empty())
|
|
{
|
|
return _termControl->Title();
|
|
}
|
|
return profileName;
|
|
}
|
|
|
|
hstring TermControlAutomationPeer::GetHelpTextCore() const
|
|
{
|
|
return _termControl->Title();
|
|
}
|
|
|
|
AutomationLiveSetting TermControlAutomationPeer::GetLiveSettingCore() const
|
|
{
|
|
return AutomationLiveSetting::Polite;
|
|
}
|
|
|
|
#pragma region ITextProvider
|
|
com_array<XamlAutomation::ITextRangeProvider> TermControlAutomationPeer::GetSelection()
|
|
{
|
|
return _contentAutomationPeer.GetSelection();
|
|
}
|
|
|
|
com_array<XamlAutomation::ITextRangeProvider> TermControlAutomationPeer::GetVisibleRanges()
|
|
{
|
|
return _contentAutomationPeer.GetVisibleRanges();
|
|
}
|
|
|
|
XamlAutomation::ITextRangeProvider TermControlAutomationPeer::RangeFromChild(XamlAutomation::IRawElementProviderSimple childElement)
|
|
{
|
|
return _contentAutomationPeer.RangeFromChild(childElement);
|
|
}
|
|
|
|
XamlAutomation::ITextRangeProvider TermControlAutomationPeer::RangeFromPoint(Windows::Foundation::Point screenLocation)
|
|
{
|
|
return _contentAutomationPeer.RangeFromPoint(screenLocation);
|
|
}
|
|
|
|
XamlAutomation::ITextRangeProvider TermControlAutomationPeer::DocumentRange()
|
|
{
|
|
return _contentAutomationPeer.DocumentRange();
|
|
}
|
|
|
|
XamlAutomation::SupportedTextSelection TermControlAutomationPeer::SupportedTextSelection()
|
|
{
|
|
return _contentAutomationPeer.SupportedTextSelection();
|
|
}
|
|
|
|
#pragma endregion
|
|
}
|