Merge 348d9ee into 737f7e1

LeonarddeR · web-flow · commit 3ed04af5912c · 2022-08-22T10:26:22.000+02:00
diff --git a/source/NVDAObjects/UIA/winConsoleUIA.py b/source/NVDAObjects/UIA/winConsoleUIA.py
@@ -1,20 +1,21 @@
 # A part of NonVisual Desktop Access (NVDA)
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
-# Copyright (C) 2019-2022 Bill Dengler
+# Copyright (C) 2019-2022 Bill Dengler, Leonard de Ruijter
 
 import ctypes
 import NVDAHelper
 import textInfos
 import textUtils
 import UIAHandler
-
+import speech
+import controlTypes
 from comtypes import COMError
 from diffHandler import prefer_difflib
 from logHandler import log
 from UIAHandler.utils import _getConhostAPILevel
 from UIAHandler.constants import WinConsoleAPILevel
-from . import UIATextInfo
+from . import UIA, UIATextInfo
 from ..behaviors import EnhancedTermTypedCharSupport, KeyboardHandlerBasedTypedCharSupport
 from ..window import Window
 
@@ -419,14 +420,11 @@ def findExtraOverlayClasses(obj, clsList):
 		clsList.append(consoleUIAWindow)
 
 
-class WinTerminalUIA(EnhancedTermTypedCharSupport):
-	def event_UIA_notification(self, **kwargs):
-		"""
-		In an upcoming terminal release, UIA notification events will be sent
-		to announce new text. Block these for now to avoid double-reporting of
-		text changes.
-		@note: In the longer term, NVDA should leverage these events in place
-		of the current LiveText strategy, as performance will likely be
-		significantly improved and #11002 can be completely mitigated.
-		"""
-		log.debugWarning(f"Notification event blocked to avoid double-report: {kwargs}")
+class WinTerminalUIA(UIA):
+	#: Override the role, which is controlTypes.Role.STATICTEXT by default.
+	role = controlTypes.Role.TERMINAL
+	#: New line text is announced using UIA notification events
+	announceNewLineText=False
+
+	def event_UIA_notification(self, notificationKind, notificationProcessing, displayString, activityId):
+		speech.speakText(displayString)
