Implement Word Navigation for Chinese Text

nvdaHelper/cppjieba/sconscript

@@ -35,6 +35,11 @@ sourceFiles = [
 	"cppjieba.def",
 ]
 
+env.AppendUnique(
+    CCFLAGS=['/wd4819'],
+    CXXFLAGS=['/wd4819'],
+)
+
 cppjiebaLib = env.SharedLibrary(target="cppjieba", source=sourceFiles)
 
 if not os.path.exists(outDir.Dir("dicts").get_abspath()) or not os.listdir(outDir.Dir("dicts").get_abspath()): # insure dicts installation happens only once and avoid a scons' warning

source/IAccessibleHandler/__init__.py

@@ -1,10 +1,12 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2006-2022 NV Access Limited, Łukasz Golonka, Leonard de Ruijter
+# Copyright (C) 2006-2025 NV Access Limited, Łukasz Golonka, Leonard de Ruijter
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
 import typing
 
+from winBindings import user32
+
 # F401 imported but unused. RelationType should be exposed from IAccessibleHandler, in future __all__
 # should be used to export it.
 from .types import RelationType  # noqa: F401
@@ -552,7 +554,7 @@ def winEventToNVDAEvent(  # noqa: C901
 			)
 		return None
 	# Make sure this window does not have a ghost window if possible
-	if NVDAObjects.window.GhostWindowFromHungWindow and NVDAObjects.window.GhostWindowFromHungWindow(window):
+	if user32._GhostWindowFromHungWindow is not None and user32._GhostWindowFromHungWindow(window):
 		if isMSAADebugLoggingEnabled():
 			log.debug(
 				f"Ghosted hung window. Dropping winEvent {getWinEventLogInfo(window, objectID, childID, eventID)}",
@@ -784,9 +786,9 @@ def processDesktopSwitchWinEvent(window, objectID, childID):
 		log.debug(
 			f"Processing desktopSwitch winEvent: {getWinEventLogInfo(window, objectID, childID)}",
 		)
-	hDesk = windll.user32.OpenInputDesktop(0, False, 0)
+	hDesk = user32.OpenInputDesktop(0, False, 0)
 	if hDesk != 0:
-		windll.user32.CloseDesktop(hDesk)
+		user32.CloseDesktop(hDesk)
 		core.callLater(200, _handleUserDesktop)
 	else:
 		# When hDesk == 0, the active desktop has changed.

source/IAccessibleHandler/internalWinEventHandler.py

@@ -1,17 +1,18 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2020 NV Access Limited
+# Copyright (C) 2020-2025 NV Access Limited
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
 """
 Provides a non-threaded (limited by GIL) Windows Event Hook and processing.
 """
 
-from ctypes import WINFUNCTYPE, c_int
+from ctypes import c_int
 
 from typing import Dict, Callable
 
 import core
+from winBindings.user32 import WINEVENTPROC
 import winUser
 from .utils import getWinEventLogInfo, isMSAADebugLoggingEnabled
 
@@ -185,7 +186,7 @@ def winEventCallback(handle, eventID, window, objectID, childID, threadID, times
 
 
 # Register internal object event with IAccessible
-cWinEventCallback = WINFUNCTYPE(None, c_int, c_int, c_int, c_int, c_int, c_int, c_int)(winEventCallback)
+cWinEventCallback = WINEVENTPROC(winEventCallback)
 # A list to store handles received from setWinEventHook, for use with unHookWinEvent
 winEventHookIDs = []
 

source/JABHandler.py

@@ -21,7 +21,6 @@
 	POINTER,
 	byref,
 	cdll,
-	windll,
 	CFUNCTYPE,
 	WinError,
 	create_string_buffer,
@@ -30,6 +29,7 @@
 from ctypes.wintypes import BOOL, HWND, WCHAR
 import time
 from winBindings.kernel32 import FreeLibrary
+from winBindings import user32
 import queueHandler
 from logHandler import log
 import winUser
@@ -1146,10 +1146,10 @@ def initialize():
 	):
 		enableBridge()
 	# Accept wm_copydata and any wm_user messages from other processes even if running with higher privileges
-	if not windll.user32.ChangeWindowMessageFilter(winUser.WM_COPYDATA, winUser.MSGFLT.ALLOW):
+	if not user32.ChangeWindowMessageFilter(winUser.WM_COPYDATA, winUser.MSGFLT.ALLOW):
 		raise WinError()
 	for msg in range(winUser.WM_USER + 1, 0xFFFF):
-		if not windll.user32.ChangeWindowMessageFilter(msg, winUser.MSGFLT.ALLOW):
+		if not user32.ChangeWindowMessageFilter(msg, winUser.MSGFLT.ALLOW):
 			raise WinError()
 	bridgeDll.Windows_run()
 	# Register java events

source/NVDAHelper/__init__.py

@@ -32,6 +32,7 @@
 	wstring_at,
 )
 
+from winBindings import user32
 import winBindings.oleaut32
 import winBindings.kernel32
 import winBindings.advapi32
@@ -774,11 +775,11 @@ def terminate(self):
 def initialize() -> None:
 	global _remoteLib, _remoteLoaderX86, _remoteLoaderAMD64, _remoteLoaderARM64
 	global lastLanguageID, lastLayoutString
-	hkl = c_ulong(windll.User32.GetKeyboardLayout(0)).value
+	hkl = user32.GetKeyboardLayout(0)
 	lastLanguageID = winUser.LOWORD(hkl)
 	KL_NAMELENGTH = 9
 	buf = create_unicode_buffer(KL_NAMELENGTH)
-	res = windll.User32.GetKeyboardLayoutNameW(buf)
+	res = user32.GetKeyboardLayoutName(buf)
 	if res:
 		lastLayoutString = buf.value
 	for name, func in [

source/NVDAObjects/IAccessible/MSHTML.py

@@ -1,6 +1,6 @@
 # NVDAObjects/MSHTML.py
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2006-2015 NV Access Limited, Aleksey Sadovoy
+# Copyright (C) 2006-2025 NV Access Limited, Aleksey Sadovoy
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
@@ -11,6 +11,7 @@
 import ctypes
 import ctypes.wintypes
 import contextlib
+from winBindings import user32
 import winUser
 import oleacc
 import UIAHandler
@@ -520,7 +521,7 @@ def kwargsFromSuper(cls, kwargs, relation=None):
 		elif isinstance(relation, tuple):
 			windowHandle = kwargs.get("windowHandle")
 			p = ctypes.wintypes.POINT(x=relation[0], y=relation[1])
-			ctypes.windll.user32.ScreenToClient(windowHandle, ctypes.byref(p))
+			user32.ScreenToClient(windowHandle, ctypes.byref(p))
 			# #3494: MSHTML's internal coordinates are always at a hardcoded DPI (usually 96) no matter the system DPI or zoom level.
 			xFactor, yFactor = getZoomFactorsFromHTMLDocument(HTMLNode.document)
 			try:

source/NVDAObjects/IAccessible/__init__.py

@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2006-2024 NV Access Limited, Babbage B.V., Cyrille Bougot
+# Copyright (C) 2006-2025 NV Access Limited, Babbage B.V., Cyrille Bougot
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
@@ -40,6 +40,7 @@
 import IAccessibleHandler
 import oleacc
 import JABHandler
+from winBindings import user32
 import winBindings.ole32
 import winUser
 import globalVars  # noqa: F401
@@ -715,6 +716,10 @@ def findOverlayClasses(self, clsList):
 			from . import webKit
 
 			webKit.findExtraOverlayClasses(self, clsList)
+		elif windowClassName == "wxWindowNR":
+			from . import wx as wxObjects
+
+			wxObjects.findExtraOverlayClasses(self, clsList)
 		elif windowClassName.startswith("Chrome_"):
 			from . import chromium
 
@@ -805,7 +810,7 @@ def __init__(  # noqa: C901
 			log.debugWarning("Resorting to WindowFromPoint on accLocation")
 			try:
 				left, top, width, height = IAccessibleObject.accLocation(0)
-				windowHandle = winUser.user32.WindowFromPoint(winUser.POINT(left, top))
+				windowHandle = user32.WindowFromPoint(winUser.POINT(left, top))
 			except COMError as e:
 				log.debugWarning("accLocation failed: %s" % e)
 		if not windowHandle:

source/NVDAObjects/IAccessible/winword.py

@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2006-2023 NV Access, Cyrille Bougot and other NVDA Contributors
+# Copyright (C) 2006-2025 NV Access, Cyrille Bougot and other NVDA Contributors
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
@@ -8,7 +8,7 @@
 import operator
 import uuid
 from logHandler import log
-import winUser
+from winBindings import user32
 import speech
 import controlTypes
 import config
@@ -586,8 +586,8 @@ def event_gainFocus(self):
 		document = next((x for x in self.children if isinstance(x, WordDocument)), None)
 		if document:
 			curThreadID = ctypes.windll.kernel32.GetCurrentThreadId()
-			winUser.user32.AttachThreadInput(curThreadID, document.windowThreadID, True)
-			winUser.user32.SetFocus(document.windowHandle)
-			winUser.user32.AttachThreadInput(curThreadID, document.windowThreadID, False)
+			user32.AttachThreadInput(curThreadID, document.windowThreadID, True)
+			user32.SetFocus(document.windowHandle)
+			user32.AttachThreadInput(curThreadID, document.windowThreadID, False)
 			if not document.WinwordWindowObject.active:
 				document.WinwordWindowObject.activate()

source/NVDAObjects/IAccessible/wx.py

@@ -0,0 +1,66 @@
+# A part of NonVisual Desktop Access (NVDA)
+# Copyright (C) 2025 NV Access Limited, Leonard de Ruijter
+# This file is covered by the GNU General Public License.
+# See the file COPYING for more details.
+
+"""Improvements for wxWidgets objects."""
+
+import api
+import eventHandler
+import winUser
+
+from . import IAccessible, getNVDAObjectFromEvent
+from logHandler import log
+import windowUtils
+from .. import NVDAObject
+
+
+def findExtraOverlayClasses(obj: IAccessible, clsList: list[NVDAObject]):
+	if obj.name == "wxWebView":
+		clsList.insert(0, WxWebView)
+
+
+class WxWebView(IAccessible):
+	def event_gainFocus(self) -> None:
+		super().event_gainFocus()
+		firstChild = self.firstChild
+		if not firstChild:
+			return
+		match firstChild.windowClassName:
+			case "Shell Embedding":
+				# This is an IE webview.
+				try:
+					obj = getNVDAObjectFromEvent(
+						windowUtils.findDescendantWindow(
+							firstChild.windowHandle,
+							className="Internet Explorer_Server",
+						),
+						winUser.OBJID_CLIENT,
+						winUser.CHILDID_SELF,
+					)
+					obj.setFocus()
+				except LookupError:
+					log.warning("Could not find Internet Explorer_Server in wxWebView")
+			case "Chrome_WidgetWin_0":
+				# This is a Edge WebView2 control.
+				# First focus might fail when the inner window is not yet created.
+				while not eventHandler.isPendingEvents("gainFocus"):
+					# Wait for the window and refocus when it is there.
+					try:
+						windowUtils.findDescendantWindow(
+							firstChild.windowHandle,
+							className="Chrome_RenderWidgetHostHWND",
+						)
+					except LookupError:
+						api.processPendingEvents()
+						continue
+					else:
+						# Suppress IAccessible focus event handling for the refocus below.
+						# This prevents duplicate or unwanted focus events of the Web View parent control,
+						# since we're actually interested in the focus event from the inner document that focus is propagated to.
+						self.shouldAllowIAccessibleFocusEvent = False
+						self.setFocus()
+						break
+
+			case _:
+				log.warning(f"Unexpected inner control in wxWebView: {firstChild.windowClassName}")

source/NVDAObjects/window/__init__.py

@@ -1,11 +1,13 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2006-2023 NV Access Limited, Babbage B.V., Bill Dengler, Cyrille Bougot
+# Copyright (C) 2006-2025 NV Access Limited, Babbage B.V., Bill Dengler, Cyrille Bougot
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
 import re
 import ctypes
 import ctypes.wintypes
+from winBindings import user32
+from winBindings.user32 import _GhostWindowFromHungWindow
 import winKernel
 import winUser
 from logHandler import log  # noqa: F401
@@ -23,16 +25,11 @@
 re_WindowsForms = re.compile(r"^WindowsForms[0-9]*\.(.*)\.app\..*$")
 re_ATL = re.compile(r"^ATL:(.*)$")
 
-try:
-	GhostWindowFromHungWindow = ctypes.windll.user32.GhostWindowFromHungWindow
-except AttributeError:
-	GhostWindowFromHungWindow = None
-
 
 def isUsableWindow(windowHandle):
-	if not ctypes.windll.user32.IsWindowVisible(windowHandle):
+	if not user32.IsWindowVisible(windowHandle):
 		return False
-	if GhostWindowFromHungWindow and ctypes.windll.user32.GhostWindowFromHungWindow(windowHandle):
+	if _GhostWindowFromHungWindow is not None and _GhostWindowFromHungWindow(windowHandle):
 		return False
 	return True
 
@@ -60,14 +57,6 @@ def __del__(self):
 		winKernel.closeHandle(self.processHandle)
 
 
-# We want to work with physical points.
-try:
-	# Windows >= Vista
-	_windowFromPoint = ctypes.windll.user32.WindowFromPhysicalPoint
-except AttributeError:
-	_windowFromPoint = ctypes.windll.user32.WindowFromPoint
-
-
 class Window(NVDAObject):
 	"""
 	An NVDAObject for a window
@@ -91,7 +80,7 @@ def getPossibleAPIClasses(cls, kwargs, relation=None):
 		if windowClassName == "#32769":
 			return
 		# If this window has a ghost window its too dangerous to try any higher APIs
-		if GhostWindowFromHungWindow and GhostWindowFromHungWindow(windowHandle):
+		if _GhostWindowFromHungWindow is not None and _GhostWindowFromHungWindow(windowHandle):
 			return
 		if windowClassName == "EXCEL7" and (relation == "focus" or isinstance(relation, tuple)):
 			from . import excel
@@ -169,7 +158,7 @@ def kwargsFromSuper(cls, kwargs, relation=None):
 				if threadInfo.hwndFocus:
 					windowHandle = threadInfo.hwndFocus
 		elif isinstance(relation, tuple):
-			windowHandle = _windowFromPoint(ctypes.wintypes.POINT(relation[0], relation[1]))
+			windowHandle = user32.WindowFromPhysicalPoint(ctypes.wintypes.POINT(relation[0], relation[1]))
 		if not windowHandle:
 			return False
 		kwargs["windowHandle"] = windowHandle
@@ -207,7 +196,7 @@ def _get_windowControlID(self):
 
 	def _get_location(self):
 		r = ctypes.wintypes.RECT()
-		ctypes.windll.user32.GetWindowRect(self.windowHandle, ctypes.byref(r))
+		user32.GetWindowRect(self.windowHandle, ctypes.byref(r))
 		return RectLTWH.fromCompatibleType(r)
 
 	def _get_displayText(self):
@@ -310,7 +299,7 @@ def _get_extendedWindowStyle(self):
 
 	def _get_isWindowUnicode(self):
 		if not hasattr(self, "_isWindowUnicode"):
-			self._isWindowUnicode = bool(ctypes.windll.user32.IsWindowUnicode(self.windowHandle))
+			self._isWindowUnicode = bool(user32.IsWindowUnicode(self.windowHandle))
 		return self._isWindowUnicode
 
 	def correctAPIForRelation(self, obj, relation=None):