Skip to content

Fix: Resolve CJK Enhanced UI conflict in Windows nav mode #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
surfer0627 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Resolve CJK Enhanced UI conflict in Windows nav mode #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions addon/globalPlugins/numpadNavMode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,51 @@ class GlobalPlugin(globalPluginHandler.GlobalPlugin):
#: A dict of user assigned gestures, containing their values in G form
userGestures = {}

#: Gesture mappings used for CJK Enhanced UI compatibility.
CJK_COMPAT_GESTURES = (
("kb:numpad2", "kb:downarrow"),
("kb:shift+numpad2", "kb:shift+downarrow"),
("kb:numpad1", "kb:end"),
("kb:numpad3", "kb:pagedown"),
)

def _hasCjkAddon(self) -> bool:
"""Checks whether CJK Enhanced UI is running."""
for addon in addonHandler.getRunningAddons():
if addon.name == "CJKEnhancedUI":
return True
return False

def _setCjkCompat(self, enable: bool) -> None:
"""Applies or removes CJK compatibility gestures."""
if not self._hasCjkAddon():
log.debug("CJK Enhanced UI not found.")
return

for gesture, script in self.CJK_COMPAT_GESTURES:
if enable:
manager.userGestureMap.add(
gesture,
"globalPlugins.cjkEnhancedUI",
"GlobalPlugin",
script,
)
else:
try:
manager.userGestureMap.remove(
gesture,
"globalPlugins.cjkEnhancedUI",
"GlobalPlugin",
script,
)
except ValueError:
pass

if enable:
log.debug("Enabled CJK compatibility gestures.")
else:
log.debug("Disabled CJK compatibility gestures.")

def __init__(self):
"""Initializes the add-on by performing the following tasks:
- If the NVDA config is set to enter Windows nav mode on startup, we enter it here.
Expand Down Expand Up @@ -331,6 +376,8 @@ def _setWindowsNavMode(self) -> None:
manager.userGestureMap.add("kb(laptop):" + gFrag, *action, True)
manager.userGestureMap.add("kb:" + gFrag, action.mod, action.cls, None, True)

self._setCjkCompat(True)

def _setNVDANavMode(self) -> None:
"""A setMode() helper method, to put the numpad back in NVDA mode.
Overview: for each numpad gesture, check whether:
Expand Down Expand Up @@ -372,6 +419,8 @@ def _setNVDANavMode(self) -> None:
if gest not in currentGestures:
manager.userGestureMap.add(gest, *action, True)

self._setCjkCompat(False)

def handleConfigProfileSwitch(self):
if config.conf["numpadNavMode"]["profilesUseInitialNumlockState"]:
log.debug("Configured to adjust numlock based on profile, calling handleNumlockInitialState().")
Expand Down