storm/cthulhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More cleanup, changing references to orca to cthulhu instead.

Browse Source
This commit is contained in:
Storm Dragon
2024-10-20 21:11:35 -04:00
parent 68766b7643
commit bc660dc217
58 changed files with 242 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cthulhu/action_presenter.py
+1 -1
View File
@@ -81,7 +81,7 @@ class ActionPresenter:
keybindings.KeyBinding(
"a",
keybindings.defaultModifierMask,
keybindings.ORCA_SHIFT_MODIFIER_MASK,
keybindings.CTHULHU_SHIFT_MODIFIER_MASK,
self._handlers.get("show_actions_menu")))
return bindings
src/cthulhu/bookmarks.py
+5 -5
View File
@@ -95,21 +95,21 @@ class Bookmarks:
keybindings.KeyBinding(
"b",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("goToNextBookmark")))
bindings.add(
keybindings.KeyBinding(
"b",
keybindings.defaultModifierMask,
keybindings.ORCA_SHIFT_MODIFIER_MASK,
keybindings.CTHULHU_SHIFT_MODIFIER_MASK,
self._handlers.get("goToPrevBookmark")))
bindings.add(
keybindings.KeyBinding(
"b",
keybindings.defaultModifierMask,
keybindings.ORCA_ALT_MODIFIER_MASK,
keybindings.CTHULHU_ALT_MODIFIER_MASK,
self._handlers.get("saveBookmarks")))
for i in range(6):
@@ -117,14 +117,14 @@ class Bookmarks:
keybindings.KeyBinding(
str(i + 1),
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("goToBookmark")))
bindings.add(
keybindings.KeyBinding(
str(i + 1),
keybindings.defaultModifierMask,
keybindings.ORCA_ALT_MODIFIER_MASK,
keybindings.CTHULHU_ALT_MODIFIER_MASK,
self._handlers.get("addBookmark")))
return bindings
src/cthulhu/caret_navigation.py
+2 -2
View File
@@ -144,7 +144,7 @@ class CaretNavigation:
keybindings.KeyBinding(
"F12",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("toggle_enabled")))
bindings.add(
@@ -229,7 +229,7 @@ class CaretNavigation:
_settings_manager = settings_manager.getManager()
enabled = not _settings_manager.getSetting('caretNavigationEnabled')
if enabled:
string = messages.CARET_CONTROL_ORCA
string = messages.CARET_CONTROL_CTHULHU
else:
string = messages.CARET_CONTROL_APP
src/cthulhu/chat.py
+2 -2
View File
@@ -308,7 +308,7 @@ class Chat:
#
self.messageKeys = \
["F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9"]
self.messageKeyModifier = keybindings.ORCA_MODIFIER_MASK
self.messageKeyModifier = keybindings.CTHULHU_MODIFIER_MASK
self.inputEventHandlers = {}
self.setupInputEventHandlers()
self.keyBindings = self.getKeyBindings()
@@ -387,7 +387,7 @@ class Chat:
keybindings.KeyBinding(
messageKey,
self.messageKeyModifier,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self.inputEventHandlers["reviewMessage"]))
return keyBindings
src/cthulhu/cmdnames.py
+1 -1
View File
@@ -457,7 +457,7 @@ TOGGLE_SPEECH_VERBOSITY = _("Toggle speech verbosity level")
# Translators: this string is associated with the keyboard shortcut to quit
# Cthulhu.
QUIT_ORCA = _("Quit the screen reader")
QUIT_CTHULHU = _("Quit the screen reader")
# Translators: the preferences configuration dialog is the dialog that allows
# users to set their preferences for Cthulhu.
src/cthulhu/common_keyboardmap.py
+9 -9
View File
@@ -32,26 +32,26 @@ from . import keybindings
# Storing values
defaultModifierMask = keybindings.defaultModifierMask
ORCA_MODIFIER_MASK = keybindings.ORCA_MODIFIER_MASK
CTHULHU_MODIFIER_MASK = keybindings.CTHULHU_MODIFIER_MASK
NO_MODIFIER_MASK = keybindings.NO_MODIFIER_MASK
ORCA_SHIFT_MODIFIER_MASK = keybindings.ORCA_SHIFT_MODIFIER_MASK
ORCA_CTRL_MODIFIER_MASK = keybindings.ORCA_CTRL_MODIFIER_MASK
ORCA_ALT_MODIFIER_MASK = keybindings.ORCA_ALT_MODIFIER_MASK
ORCA_CTRL_ALT_MODIFIER_MASK = keybindings.ORCA_CTRL_ALT_MODIFIER_MASK
CTHULHU_SHIFT_MODIFIER_MASK = keybindings.CTHULHU_SHIFT_MODIFIER_MASK
CTHULHU_CTRL_MODIFIER_MASK = keybindings.CTHULHU_CTRL_MODIFIER_MASK
CTHULHU_ALT_MODIFIER_MASK = keybindings.CTHULHU_ALT_MODIFIER_MASK
CTHULHU_CTRL_ALT_MODIFIER_MASK = keybindings.CTHULHU_CTRL_ALT_MODIFIER_MASK
SHIFT_ALT_MODIFIER_MASK = keybindings.SHIFT_ALT_MODIFIER_MASK
keymap = (
("space", defaultModifierMask, ORCA_MODIFIER_MASK,
("space", defaultModifierMask, CTHULHU_MODIFIER_MASK,
"preferencesSettingsHandler"),
("space", defaultModifierMask, ORCA_CTRL_MODIFIER_MASK,
("space", defaultModifierMask, CTHULHU_CTRL_MODIFIER_MASK,
"appPreferencesSettingsHandler"),
("BackSpace", defaultModifierMask, ORCA_MODIFIER_MASK,
("BackSpace", defaultModifierMask, CTHULHU_MODIFIER_MASK,
"bypassNextCommandHandler"),
("q", defaultModifierMask, ORCA_MODIFIER_MASK,
("q", defaultModifierMask, CTHULHU_MODIFIER_MASK,
"shutdownHandler"),
src/cthulhu/cthulhu.py
+42 -42
View File
@@ -132,7 +132,7 @@ OBJECT_NAVIGATOR = "object-navigator"
SAY_ALL = "say-all"
def getActiveModeAndObjectOfInterest():
tokens = ["ORCA: Active mode:", cthulhu_state.activeMode,
tokens = ["CTHULHU: Active mode:", cthulhu_state.activeMode,
"Object of interest:", cthulhu_state.objOfInterest]
debug.printTokens(debug.LEVEL_INFO, tokens, True)
return cthulhu_state.activeMode, cthulhu_state.objOfInterest
@@ -150,42 +150,42 @@ def emitRegionChanged(obj, startOffset=None, endOffset=None, mode=None):
try:
obj.emit("mode-changed::" + mode, 1, "")
except Exception:
msg = "ORCA: Exception emitting mode-changed notification"
msg = "CTHULHU: Exception emitting mode-changed notification"
debug.printMessage(debug.LEVEL_INFO, msg, True)
if mode != cthulhu_state.activeMode:
tokens = ["ORCA: Switching active mode from", cthulhu_state.activeMode, "to", mode]
tokens = ["CTHULHU: Switching active mode from", cthulhu_state.activeMode, "to", mode]
debug.printTokens(debug.LEVEL_INFO, tokens, True)
cthulhu_state.activeMode = mode
try:
tokens = ["ORCA: Region of interest:", obj, "(", startOffset, ")", endOffset]
tokens = ["CTHULHU: Region of interest:", obj, "(", startOffset, ")", endOffset]
debug.printTokens(debug.LEVEL_INFO, tokens, True)
obj.emit("region-changed", startOffset, endOffset)
except Exception:
msg = "ORCA: Exception emitting region-changed notification"
msg = "CTHULHU: Exception emitting region-changed notification"
debug.printMessage(debug.LEVEL_INFO, msg, True)
if obj != cthulhu_state.objOfInterest:
tokens = ["ORCA: Switching object of interest from", cthulhu_state.objOfInterest, "to", obj]
tokens = ["CTHULHU: Switching object of interest from", cthulhu_state.objOfInterest, "to", obj]
debug.printTokens(debug.LEVEL_INFO, tokens, True)
cthulhu_state.objOfInterest = obj
def setActiveWindow(frame, app=None, alsoSetLocusOfFocus=False, notifyScript=False):
tokens = ["ORCA: Request to set active window to", frame]
tokens = ["CTHULHU: Request to set active window to", frame]
if app is not None:
tokens.extend(["in", app])
debug.printTokens(debug.LEVEL_INFO, tokens, True)
if frame == cthulhu_state.activeWindow:
msg = "ORCA: Setting activeWindow to existing activeWindow"
msg = "CTHULHU: Setting activeWindow to existing activeWindow"
debug.printMessage(debug.LEVEL_INFO, msg, True)
elif frame is None:
cthulhu_state.activeWindow = None
else:
real_app, real_frame = AXObject.find_real_app_and_window_for(frame, app)
if real_frame != frame:
tokens = ["ORCA: Correcting active window to", real_frame, "in", real_app]
tokens = ["CTHULHU: Correcting active window to", real_frame, "in", real_app]
debug.printTokens(debug.LEVEL_INFO, tokens, True)
cthulhu_state.activeWindow = real_frame
else:
@@ -208,7 +208,7 @@ def setLocusOfFocus(event, obj, notifyScript=True, force=False):
"""
if not force and obj == cthulhu_state.locusOfFocus:
msg = "ORCA: Setting locusOfFocus to existing locusOfFocus"
msg = "CTHULHU: Setting locusOfFocus to existing locusOfFocus"
debug.printMessage(debug.LEVEL_INFO, msg, True)
return
@@ -222,13 +222,13 @@ def setLocusOfFocus(event, obj, notifyScript=True, force=False):
oldFocus = None
if obj is None:
msg = "ORCA: New locusOfFocus is null (being cleared)"
msg = "CTHULHU: New locusOfFocus is null (being cleared)"
debug.printMessage(debug.LEVEL_INFO, msg, True)
cthulhu_state.locusOfFocus = None
return
if cthulhu_state.activeScript:
tokens = ["ORCA: Active script is:", cthulhu_state.activeScript]
tokens = ["CTHULHU: Active script is:", cthulhu_state.activeScript]
debug.printTokens(debug.LEVEL_INFO, tokens, True)
if cthulhu_state.activeScript.utilities.isZombie(obj):
tokens = ["ERROR: New locusOfFocus (", obj, ") is zombie. Not updating."]
@@ -239,7 +239,7 @@ def setLocusOfFocus(event, obj, notifyScript=True, force=False):
debug.printTokens(debug.LEVEL_INFO, tokens, True)
return
tokens = ["ORCA: Changing locusOfFocus from", oldFocus, "to", obj, ". Notify:", notifyScript]
tokens = ["CTHULHU: Changing locusOfFocus from", oldFocus, "to", obj, ". Notify:", notifyScript]
debug.printTokens(debug.LEVEL_INFO, tokens, True)
cthulhu_state.locusOfFocus = obj
@@ -247,7 +247,7 @@ def setLocusOfFocus(event, obj, notifyScript=True, force=False):
return
if not cthulhu_state.activeScript:
msg = "ORCA: Cannot notify active script because there isn't one"
msg = "CTHULHU: Cannot notify active script because there isn't one"
debug.printMessage(debug.LEVEL_INFO, msg, True)
return
@@ -299,7 +299,7 @@ def deviceChangeHandler(deviceManager, device):
so we have to re-apply"""
source = device.get_source()
if source == Gdk.InputSource.KEYBOARD:
msg = "ORCA: Keyboard change detected, re-creating the xmodmap"
msg = "CTHULHU: Keyboard change detected, re-creating the xmodmap"
debug.printMessage(debug.LEVEL_INFO, msg, True)
_createCthulhuXmodmap()
@@ -409,7 +409,7 @@ def _restoreXmodmap(keyList=[]):
to restore the entire saved xmodmap.
"""
msg = "ORCA: Attempting to restore original xmodmap"
msg = "CTHULHU: Attempting to restore original xmodmap"
debug.printMessage(debug.LEVEL_INFO, msg, True)
global _capsLockCleared
@@ -418,7 +418,7 @@ def _restoreXmodmap(keyList=[]):
stdin=subprocess.PIPE, stdout=None, stderr=None)
p.communicate(_originalXmodmap)
msg = "ORCA: Original xmodmap restored"
msg = "CTHULHU: Original xmodmap restored"
debug.printMessage(debug.LEVEL_INFO, msg, True)
def setKeyHandling(new):
@@ -433,7 +433,7 @@ def loadUserSettings(script=None, inputEvent=None, skipReloadMessage=False):
Returns True to indicate the input event has been consumed.
"""
debug.printMessage(debug.LEVEL_INFO, 'ORCA: Loading User Settings', True)
debug.printMessage(debug.LEVEL_INFO, 'CTHULHU: Loading User Settings', True)
global _userSettings
@@ -473,7 +473,7 @@ def loadUserSettings(script=None, inputEvent=None, skipReloadMessage=False):
_settingsManager.loadAppSettings(script)
if _settingsManager.getSetting('enableSpeech'):
msg = 'ORCA: About to enable speech'
msg = 'CTHULHU: About to enable speech'
debug.printMessage(debug.LEVEL_INFO, msg, True)
try:
speech.init()
@@ -482,20 +482,20 @@ def loadUserSettings(script=None, inputEvent=None, skipReloadMessage=False):
except Exception:
debug.printException(debug.LEVEL_SEVERE)
else:
msg = 'ORCA: Speech is not enabled in settings'
msg = 'CTHULHU: Speech is not enabled in settings'
debug.printMessage(debug.LEVEL_INFO, msg, True)
if _settingsManager.getSetting('enableBraille'):
msg = 'ORCA: About to enable braille'
msg = 'CTHULHU: About to enable braille'
debug.printMessage(debug.LEVEL_INFO, msg, True)
try:
braille.init(_processBrailleEvent)
except Exception:
debug.printException(debug.LEVEL_WARNING)
msg = 'ORCA: Could not initialize connection to braille.'
msg = 'CTHULHU: Could not initialize connection to braille.'
debug.printMessage(debug.LEVEL_WARNING, msg, True)
else:
msg = 'ORCA: Braille is not enabled in settings'
msg = 'CTHULHU: Braille is not enabled in settings'
debug.printMessage(debug.LEVEL_INFO, msg, True)
@@ -526,7 +526,7 @@ def loadUserSettings(script=None, inputEvent=None, skipReloadMessage=False):
cthulhuApp.getSignalManager().emitSignal('load-setting-completed')
debug.printMessage(debug.LEVEL_INFO, 'ORCA: User Settings Loaded', True)
debug.printMessage(debug.LEVEL_INFO, 'CTHULHU: User Settings Loaded', True)
return True
@@ -641,12 +641,12 @@ def init():
module has already been initialized.
"""
debug.printMessage(debug.LEVEL_INFO, 'ORCA: Initializing', True)
debug.printMessage(debug.LEVEL_INFO, 'CTHULHU: Initializing', True)
global _initialized
if _initialized and _settingsManager.isScreenReaderServiceEnabled():
debug.printMessage(debug.LEVEL_INFO, 'ORCA: Already initialized', True)
debug.printMessage(debug.LEVEL_INFO, 'CTHULHU: Already initialized', True)
return False
# Do not hang on initialization if we can help it.
@@ -667,14 +667,14 @@ def init():
if a11yAppSettings:
a11yAppSettings.connect('changed', onEnabledChanged)
debug.printMessage(debug.LEVEL_INFO, 'ORCA: Initialized', True)
debug.printMessage(debug.LEVEL_INFO, 'CTHULHU: Initialized', True)
return True
def start():
"""Starts Cthulhu."""
debug.printMessage(debug.LEVEL_INFO, 'ORCA: Starting', True)
debug.printMessage(debug.LEVEL_INFO, 'CTHULHU: Starting', True)
if not _initialized:
init()
@@ -698,10 +698,10 @@ def start():
devmanager.connect("device-removed", deviceChangeHandler)
Gdk.notify_startup_complete()
msg = 'ORCA: Startup complete notification made'
msg = 'CTHULHU: Startup complete notification made'
debug.printMessage(debug.LEVEL_INFO, msg, True)
debug.printMessage(debug.LEVEL_INFO, 'ORCA: Starting Atspi main event loop', True)
debug.printMessage(debug.LEVEL_INFO, 'CTHULHU: Starting Atspi main event loop', True)
Atspi.event_main()
def die(exitCode=1):
@@ -730,7 +730,7 @@ def shutdown(script=None, inputEvent=None):
was never initialized.
"""
debug.printMessage(debug.LEVEL_INFO, 'ORCA: Shutting down', True)
debug.printMessage(debug.LEVEL_INFO, 'CTHULHU: Shutting down', True)
global _initialized
@@ -769,9 +769,9 @@ def shutdown(script=None, inputEvent=None):
_initialized = False
_restoreXmodmap(_cthulhuModifiers)
debug.printMessage(debug.LEVEL_INFO, 'ORCA: Quitting Atspi main event loop', True)
debug.printMessage(debug.LEVEL_INFO, 'CTHULHU: Quitting Atspi main event loop', True)
Atspi.event_quit()
debug.printMessage(debug.LEVEL_INFO, 'ORCA: Shutdown complete', True)
debug.printMessage(debug.LEVEL_INFO, 'CTHULHU: Shutdown complete', True)
return True
@@ -780,7 +780,7 @@ def shutdownOnSignal(signum, frame):
global exitCount
signalString = f'({signal.strsignal(signum)})'
msg = f"ORCA: Shutting down and exiting due to signal={signum} {signalString}"
msg = f"CTHULHU: Shutting down and exiting due to signal={signum} {signalString}"
debug.printMessage(debug.LEVEL_INFO, msg, True)
# Well...we'll try to exit nicely, but if we keep getting called,
@@ -818,7 +818,7 @@ def shutdownOnSignal(signum, frame):
def crashOnSignal(signum, frame):
signalString = f'({signal.strsignal(signum)})'
msg = f"ORCA: Shutting down and exiting due to signal={signum} {signalString}"
msg = f"CTHULHU: Shutting down and exiting due to signal={signum} {signalString}"
debug.printMessage(debug.LEVEL_SEVERE, msg, True)
debug.printStack(debug.LEVEL_SEVERE)
_restoreXmodmap(_cthulhuModifiers)
@@ -831,7 +831,7 @@ def main():
an exit code of 0 means normal completion and an exit code of 50
means Cthulhu exited because of a hang."""
msg = f"ORCA: Launching version {cthulhu_platform.version}"
msg = f"CTHULHU: Launching version {cthulhu_platform.version}"
if cthulhu_platform.revision:
msg += f" (rev {cthulhu_platform.revision})"
@@ -859,13 +859,13 @@ def main():
signal.signal(signal.SIGQUIT, shutdownOnSignal)
signal.signal(signal.SIGSEGV, crashOnSignal)
debug.printMessage(debug.LEVEL_INFO, "ORCA: Enabling accessibility (if needed).", True)
debug.printMessage(debug.LEVEL_INFO, "CTHULHU: Enabling accessibility (if needed).", True)
if not _settingsManager.isAccessibilityEnabled():
_settingsManager.setAccessibility(True)
debug.printMessage(debug.LEVEL_INFO, "ORCA: Initializing.", True)
debug.printMessage(debug.LEVEL_INFO, "CTHULHU: Initializing.", True)
init()
debug.printMessage(debug.LEVEL_INFO, "ORCA: Initialized.", True)
debug.printMessage(debug.LEVEL_INFO, "CTHULHU: Initialized.", True)
script = cthulhu_state.activeScript
cthulhuApp.getSignalManager().emitSignal('start-application-completed')
@@ -883,7 +883,7 @@ def main():
_scriptManager.setActiveScript(script, "Launching.")
focusedObject = AXUtilities.get_focused_object(window)
tokens = ["ORCA: Focused object is:", focusedObject]
tokens = ["CTHULHU: Focused object is:", focusedObject]
debug.printTokens(debug.LEVEL_INFO, tokens, True)
if focusedObject:
setLocusOfFocus(None, focusedObject)
@@ -892,11 +892,11 @@ def main():
_scriptManager.setActiveScript(script, "Found focused object.")
try:
msg = "ORCA: Starting ATSPI registry."
msg = "CTHULHU: Starting ATSPI registry."
debug.printMessage(debug.LEVEL_INFO, msg, True)
start() # waits until we stop the registry
except Exception:
msg = "ORCA: Exception starting ATSPI registry."
msg = "CTHULHU: Exception starting ATSPI registry."
debug.printMessage(debug.LEVEL_SEVERE, msg, True)
die(EXIT_CODE_HANG)
return 0
src/cthulhu/cthulhu_bin.py.in
+1 -1
View File
@@ -272,7 +272,7 @@ def main():
cthulhu.showPreferencesGUI()
if otherCthulhus():
print(messages.CLI_OTHER_ORCAS_ERROR)
print(messages.CLI_OTHER_CTHULHUS_ERROR)
return 1
debug.printMessage(debug.LEVEL_INFO, "INFO: About to launch Cthulhu.", True)
src/cthulhu/cthulhu_gui_prefs.py
+5 -5
View File
@@ -2878,7 +2878,7 @@ class CthulhuSetupGUI(cthulhu_gtkbuilder.GtkBuilderWrapper):
cthulhuMods = settings.cthulhuModifierKeys
if eventString in cthulhuMods:
self._capturedKey = ['', keybindings.ORCA_MODIFIER_MASK, 0]
self._capturedKey = ['', keybindings.CTHULHU_MODIFIER_MASK, 0]
return False
modifierKeys = ['Alt_L', 'Alt_R', 'Control_L', 'Control_R',
@@ -2894,9 +2894,9 @@ class CthulhuSetupGUI(cthulhu_gtkbuilder.GtkBuilderWrapper):
return True
string, modifiers, clickCount = self._capturedKey
isCthulhuModifier = modifiers & keybindings.ORCA_MODIFIER_MASK
isCthulhuModifier = modifiers & keybindings.CTHULHU_MODIFIER_MASK
if isCthulhuModifier:
eventState |= keybindings.ORCA_MODIFIER_MASK
eventState |= keybindings.CTHULHU_MODIFIER_MASK
self._capturedKey = [eventString, eventState, clickCount + 1]
return True
@@ -2918,7 +2918,7 @@ class CthulhuSetupGUI(cthulhu_gtkbuilder.GtkBuilderWrapper):
if not keyName or keyName in ["Return", "Escape"]:
return False
isCthulhuModifier = modifiers & keybindings.ORCA_MODIFIER_MASK
isCthulhuModifier = modifiers & keybindings.CTHULHU_MODIFIER_MASK
if keyName in ["Delete", "BackSpace"] and not isCthulhuModifier:
editable.set_text("")
self._presentMessage(messages.KB_DELETED)
@@ -2983,7 +2983,7 @@ class CthulhuSetupGUI(cthulhu_gtkbuilder.GtkBuilderWrapper):
mods = mods & Gdk.ModifierType.MODIFIER_MASK
if mods & (1 << Atspi.ModifierType.SHIFTLOCK) \
and mods & keybindings.ORCA_MODIFIER_MASK:
and mods & keybindings.CTHULHU_MODIFIER_MASK:
mods ^= (1 << Atspi.ModifierType.SHIFTLOCK)
treeModel.set(myiter,
src/cthulhu/cthulhu_platform.py.in
+1 -1
View File
@@ -26,7 +26,7 @@ __date__ = "$Date$"
__copyright__ = "Copyright (c) 2005-2008 Sun Microsystems Inc."
__license__ = "LGPL"
# $ORCA_VERSION
# $CTHULHU_VERSION
#
version = "@VERSION@"
src/cthulhu/date_and_time_presenter.py
+2 -2
View File
@@ -79,7 +79,7 @@ class DateAndTimePresenter:
keybindings.KeyBinding(
"t",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("presentTimeHandler"),
1))
@@ -87,7 +87,7 @@ class DateAndTimePresenter:
keybindings.KeyBinding(
"t",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("presentDateHandler"),
2))
src/cthulhu/desktop_keyboardmap.py
+7 -7
View File
@@ -32,13 +32,13 @@ from . import keybindings
# Storing values
defaultModifierMask = keybindings.defaultModifierMask
ORCA_MODIFIER_MASK = keybindings.ORCA_MODIFIER_MASK
CTHULHU_MODIFIER_MASK = keybindings.CTHULHU_MODIFIER_MASK
NO_MODIFIER_MASK = keybindings.NO_MODIFIER_MASK
ORCA_SHIFT_MODIFIER_MASK = keybindings.ORCA_SHIFT_MODIFIER_MASK
CTHULHU_SHIFT_MODIFIER_MASK = keybindings.CTHULHU_SHIFT_MODIFIER_MASK
keymap = (
("KP_Divide", defaultModifierMask, ORCA_MODIFIER_MASK,
("KP_Divide", defaultModifierMask, CTHULHU_MODIFIER_MASK,
"routePointerToItemHandler"),
# We want the user to be able to combine modifiers with the
@@ -46,10 +46,10 @@ keymap = (
# do not "care" about the modifiers -- unless it's the Cthulhu
# modifier.
#
("KP_Divide", ORCA_MODIFIER_MASK, NO_MODIFIER_MASK,
("KP_Divide", CTHULHU_MODIFIER_MASK, NO_MODIFIER_MASK,
"leftClickReviewItemHandler"),
("KP_Multiply", ORCA_MODIFIER_MASK, NO_MODIFIER_MASK,
("KP_Multiply", CTHULHU_MODIFIER_MASK, NO_MODIFIER_MASK,
"rightClickReviewItemHandler"),
("KP_Add", defaultModifierMask, NO_MODIFIER_MASK,
@@ -58,9 +58,9 @@ keymap = (
("KP_Delete", defaultModifierMask, NO_MODIFIER_MASK,
"findHandler"),
("KP_Delete", defaultModifierMask, ORCA_MODIFIER_MASK,
("KP_Delete", defaultModifierMask, CTHULHU_MODIFIER_MASK,
"findNextHandler"),
("KP_Delete", defaultModifierMask, ORCA_SHIFT_MODIFIER_MASK,
("KP_Delete", defaultModifierMask, CTHULHU_SHIFT_MODIFIER_MASK,
"findPreviousHandler"),
)
src/cthulhu/flat_review_presenter.py
+29 -29
View File
@@ -320,7 +320,7 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"KP_Home",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewHomeHandler")))
bindings.add(
@@ -365,7 +365,7 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"KP_Page_Up",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewEndHandler")))
bindings.add(
@@ -379,7 +379,7 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"KP_Left",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewAboveHandler")))
bindings.add(
@@ -410,7 +410,7 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"KP_Begin",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewCurrentAccessibleHandler")))
bindings.add(
@@ -424,7 +424,7 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"KP_Right",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewBelowHandler")))
bindings.add(
@@ -438,7 +438,7 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"KP_End",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewEndOfLineHandler")))
bindings.add(
@@ -511,14 +511,14 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"p",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("toggleFlatReviewModeHandler")))
bindings.add(
keybindings.KeyBinding(
"semicolon",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("flatReviewSayAllHandler"),
2))
@@ -526,21 +526,21 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"u",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewPreviousLineHandler")))
bindings.add(
keybindings.KeyBinding(
"u",
keybindings.defaultModifierMask,
keybindings.ORCA_CTRL_MODIFIER_MASK,
keybindings.CTHULHU_CTRL_MODIFIER_MASK,
self._handlers.get("reviewHomeHandler")))
bindings.add(
keybindings.KeyBinding(
"i",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewCurrentLineHandler"),
1))
@@ -548,7 +548,7 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"i",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewSpellCurrentLineHandler"),
2))
@@ -556,7 +556,7 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"i",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewPhoneticCurrentLineHandler"),
3))
@@ -564,35 +564,35 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"o",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewNextLineHandler")))
bindings.add(
keybindings.KeyBinding(
"o",
keybindings.defaultModifierMask,
keybindings.ORCA_CTRL_MODIFIER_MASK,
keybindings.CTHULHU_CTRL_MODIFIER_MASK,
self._handlers.get("reviewEndHandler")))
bindings.add(
keybindings.KeyBinding(
"j",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewPreviousItemHandler")))
bindings.add(
keybindings.KeyBinding(
"j",
keybindings.defaultModifierMask,
keybindings.ORCA_CTRL_MODIFIER_MASK,
keybindings.CTHULHU_CTRL_MODIFIER_MASK,
self._handlers.get("reviewAboveHandler")))
bindings.add(
keybindings.KeyBinding(
"k",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewCurrentItemHandler"),
1))
@@ -600,7 +600,7 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"k",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewSpellCurrentItemHandler"),
2))
@@ -608,7 +608,7 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"k",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewPhoneticCurrentItemHandler"),
3))
@@ -616,42 +616,42 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"k",
keybindings.defaultModifierMask,
keybindings.ORCA_CTRL_MODIFIER_MASK,
keybindings.CTHULHU_CTRL_MODIFIER_MASK,
self._handlers.get("reviewCurrentAccessibleHandler")))
bindings.add(
keybindings.KeyBinding(
"l",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewNextItemHandler")))
bindings.add(
keybindings.KeyBinding(
"l",
keybindings.defaultModifierMask,
keybindings.ORCA_CTRL_MODIFIER_MASK,
keybindings.CTHULHU_CTRL_MODIFIER_MASK,
self._handlers.get("reviewBelowHandler")))
bindings.add(
keybindings.KeyBinding(
"m",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewPreviousCharacterHandler")))
bindings.add(
keybindings.KeyBinding(
"m",
keybindings.defaultModifierMask,
keybindings.ORCA_CTRL_MODIFIER_MASK,
keybindings.CTHULHU_CTRL_MODIFIER_MASK,
self._handlers.get("reviewEndOfLineHandler")))
bindings.add(
keybindings.KeyBinding(
"comma",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewCurrentCharacterHandler"),
1))
@@ -659,7 +659,7 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"comma",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewSpellCurrentCharacterHandler"),
2))
@@ -667,7 +667,7 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"comma",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewUnicodeCurrentCharacterHandler"),
3))
@@ -675,7 +675,7 @@ class FlatReviewPresenter:
keybindings.KeyBinding(
"period",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("reviewNextCharacterHandler")))
bindings.add(
src/cthulhu/input_event.py
+4 -4
View File
@@ -309,7 +309,7 @@ class KeyboardEvent(InputEvent):
and not KeyboardEvent.lastCthulhuModifierAlone:
doubleEvent = self._getDoubleClickCandidate()
if doubleEvent and \
doubleEvent.modifiers & keybindings.ORCA_MODIFIER_MASK:
doubleEvent.modifiers & keybindings.CTHULHU_MODIFIER_MASK:
# this is the second event of a double-click, and sticky Cthulhu
# affected the first, so copy over the modifiers to the second
KeyboardEvent.cthulhuStickyModifiers = doubleEvent.modifiers
@@ -395,7 +395,7 @@ class KeyboardEvent(InputEvent):
KeyboardEvent.cthulhuModifierPressed = False
if KeyboardEvent.cthulhuModifierPressed:
self.modifiers |= keybindings.ORCA_MODIFIER_MASK
self.modifiers |= keybindings.CTHULHU_MODIFIER_MASK
if KeyboardEvent.stickyKeys:
# apply all recorded sticky modifiers
@@ -482,7 +482,7 @@ class KeyboardEvent(InputEvent):
if self.modifiers & keybindings.CTRL_MODIFIER_MASK \
or self.modifiers & keybindings.ALT_MODIFIER_MASK \
or self.modifiers & keybindings.ORCA_MODIFIER_MASK:
or self.modifiers & keybindings.CTHULHU_MODIFIER_MASK:
return False
return True
@@ -627,7 +627,7 @@ class KeyboardEvent(InputEvent):
if cthulhu_state.bypassNextCommand:
return False
return self.modifiers & keybindings.ORCA_MODIFIER_MASK
return self.modifiers & keybindings.CTHULHU_MODIFIER_MASK
def isKeyPadKeyWithNumlockOn(self):
"""Return True if this is a key pad key with numlock on."""
src/cthulhu/keybindings.py
+10 -10
View File
@@ -43,19 +43,19 @@ from .cthulhu_i18n import _
_keysymsCache = {}
_keycodeCache = {}
MODIFIER_ORCA = 8
MODIFIER_CTHULHU = 8
NO_MODIFIER_MASK = 0
ALT_MODIFIER_MASK = 1 << Atspi.ModifierType.ALT
CTRL_MODIFIER_MASK = 1 << Atspi.ModifierType.CONTROL
ORCA_MODIFIER_MASK = 1 << MODIFIER_ORCA
ORCA_ALT_MODIFIER_MASK = (1 << MODIFIER_ORCA |
CTHULHU_MODIFIER_MASK = 1 << MODIFIER_CTHULHU
CTHULHU_ALT_MODIFIER_MASK = (1 << MODIFIER_CTHULHU |
1 << Atspi.ModifierType.ALT)
ORCA_CTRL_MODIFIER_MASK = (1 << MODIFIER_ORCA |
CTHULHU_CTRL_MODIFIER_MASK = (1 << MODIFIER_CTHULHU |
1 << Atspi.ModifierType.CONTROL)
ORCA_CTRL_ALT_MODIFIER_MASK = (1 << MODIFIER_ORCA |
CTHULHU_CTRL_ALT_MODIFIER_MASK = (1 << MODIFIER_CTHULHU |
1 << Atspi.ModifierType.CONTROL |
1 << Atspi.ModifierType.ALT)
ORCA_SHIFT_MODIFIER_MASK = (1 << MODIFIER_ORCA |
CTHULHU_SHIFT_MODIFIER_MASK = (1 << MODIFIER_CTHULHU |
1 << Atspi.ModifierType.SHIFT)
SHIFT_MODIFIER_MASK = 1 << Atspi.ModifierType.SHIFT
SHIFT_ALT_MODIFIER_MASK = (1 << Atspi.ModifierType.SHIFT |
@@ -71,7 +71,7 @@ NON_LOCKING_MODIFIER_MASK = (1 << Atspi.ModifierType.SHIFT |
1 << Atspi.ModifierType.CONTROL |
1 << Atspi.ModifierType.META2 |
1 << Atspi.ModifierType.META3 |
1 << MODIFIER_ORCA)
1 << MODIFIER_CTHULHU)
defaultModifierMask = NON_LOCKING_MODIFIER_MASK
def getKeycode(keysym):
@@ -137,7 +137,7 @@ def getModifierNames(mods):
"""
text = ""
if mods & ORCA_MODIFIER_MASK:
if mods & CTHULHU_MODIFIER_MASK:
if settings.keyboardLayout == settings.GENERAL_KEYBOARD_LAYOUT_DESKTOP:
# Translators: this is presented in a GUI to represent the
# "insert" key when used as the Cthulhu modifier.
@@ -280,12 +280,12 @@ class KeyBinding:
if not self.keycode:
self.keycode = getKeycode(self.keysymstring)
if self.modifiers & ORCA_MODIFIER_MASK:
if self.modifiers & CTHULHU_MODIFIER_MASK:
device = cthulhu_state.device
if device is None:
return ret
modList = []
otherMods = self.modifiers & ~ORCA_MODIFIER_MASK
otherMods = self.modifiers & ~CTHULHU_MODIFIER_MASK
numLockMod = device.get_modifier(getKeycode("Num_Lock"))
lockedMods = device.get_locked_modifiers()
numLockOn = lockedMods & numLockMod
src/cthulhu/laptop_keyboardmap.py
+10 -10
View File
@@ -32,14 +32,14 @@ from . import keybindings
# Storing values
defaultModifierMask = keybindings.defaultModifierMask
ORCA_MODIFIER_MASK = keybindings.ORCA_MODIFIER_MASK
CTHULHU_MODIFIER_MASK = keybindings.CTHULHU_MODIFIER_MASK
NO_MODIFIER_MASK = keybindings.NO_MODIFIER_MASK
ORCA_SHIFT_MODIFIER_MASK = keybindings.ORCA_SHIFT_MODIFIER_MASK
ORCA_CTRL_MODIFIER_MASK = keybindings.ORCA_CTRL_MODIFIER_MASK
CTHULHU_SHIFT_MODIFIER_MASK = keybindings.CTHULHU_SHIFT_MODIFIER_MASK
CTHULHU_CTRL_MODIFIER_MASK = keybindings.CTHULHU_CTRL_MODIFIER_MASK
keymap = (
("9", defaultModifierMask, ORCA_MODIFIER_MASK,
("9", defaultModifierMask, CTHULHU_MODIFIER_MASK,
"routePointerToItemHandler"),
# We want the user to be able to combine modifiers with the
@@ -48,22 +48,22 @@ keymap = (
# modifier).
#
("7", ORCA_MODIFIER_MASK, ORCA_MODIFIER_MASK,
("7", CTHULHU_MODIFIER_MASK, CTHULHU_MODIFIER_MASK,
"leftClickReviewItemHandler"),
("8", ORCA_MODIFIER_MASK, ORCA_MODIFIER_MASK,
("8", CTHULHU_MODIFIER_MASK, CTHULHU_MODIFIER_MASK,
"rightClickReviewItemHandler"),
("semicolon", defaultModifierMask, ORCA_MODIFIER_MASK,
("semicolon", defaultModifierMask, CTHULHU_MODIFIER_MASK,
"sayAllHandler", 1),
("bracketleft", defaultModifierMask, ORCA_MODIFIER_MASK,
("bracketleft", defaultModifierMask, CTHULHU_MODIFIER_MASK,
"findHandler"),
("bracketright", defaultModifierMask, ORCA_MODIFIER_MASK,
("bracketright", defaultModifierMask, CTHULHU_MODIFIER_MASK,
"findNextHandler"),
("bracketright", defaultModifierMask, ORCA_CTRL_MODIFIER_MASK,
("bracketright", defaultModifierMask, CTHULHU_CTRL_MODIFIER_MASK,
"findPreviousHandler"),
)
src/cthulhu/learn_mode_presenter.py
+1 -1
View File
@@ -94,7 +94,7 @@ class LearnModePresenter:
keybindings.KeyBinding(
"h",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("enterLearnModeHandler")))
return bindings
src/cthulhu/liveregions.py
+2 -2
View File
@@ -168,7 +168,7 @@ class LiveRegionManager:
keybindings.KeyBinding(
"backslash",
keybindings.defaultModifierMask,
keybindings.ORCA_SHIFT_MODIFIER_MASK,
keybindings.CTHULHU_SHIFT_MODIFIER_MASK,
self.inputEventHandlers.get("monitorLiveRegions")))
for key in ["F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9"]:
@@ -176,7 +176,7 @@ class LiveRegionManager:
keybindings.KeyBinding(
key,
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self.inputEventHandlers.get("reviewLiveAnnouncement")))
return keyBindings
src/cthulhu/messages.py
+4 -4
View File
@@ -162,7 +162,7 @@ CARET_CONTROL_APP = _("The application is controlling the caret.")
# itself controls how the arrow keys move the caret around HTML content. It's
# often broken, so Cthulhu needs to provide its own support. As such, Cthulhu offers
# the user the ability to toggle which application is controlling the caret.
CARET_CONTROL_ORCA = _("The screen reader is controlling the caret.")
CARET_CONTROL_CTHULHU = _("The screen reader is controlling the caret.")
# Translators: this is the name of a cell in a spreadsheet.
CELL = _("Cell %s")
@@ -250,7 +250,7 @@ CLI_SETTINGS_MANAGER_ERROR = \
# Translators: This message is presented to the user when he/she tries to launch
# Cthulhu, but Cthulhu is already running.
CLI_OTHER_ORCAS_ERROR = \
CLI_OTHER_CTHULHUS_ERROR = \
_('Another screen reader process is already running for this ' \
'session.\nRun “cthulhu --replace” to replace that ' \
'process with a new one.')
@@ -2291,10 +2291,10 @@ SPEECH_VERBOSITY_VERBOSE = C_("Speech", "Verbosity level: verbose")
SPOKEN_ELLIPSIS = _(" dot dot dot")
# Translators: This message is presented to the user when Cthulhu is launched.
START_ORCA = _("Cthulhu welcomes you.")
START_CTHULHU = _("Cthulhu welcomes you.")
# Translators: This message is presented to the user when Cthulhu is quit.
STOP_ORCA = _("Cthulhu lerks beneath the waves.")
STOP_CTHULHU = _("Cthulhu lerks beneath the waves.")
# Translators: This message means speech synthesis is not installed or working.
SPEECH_UNAVAILABLE = _("Speech is unavailable.")
src/cthulhu/object_navigator.py
+6 -6
View File
@@ -68,42 +68,42 @@ class ObjectNavigator:
keybindings.KeyBinding(
"Up",
keybindings.defaultModifierMask,
keybindings.ORCA_CTRL_MODIFIER_MASK,
keybindings.CTHULHU_CTRL_MODIFIER_MASK,
self._handlers.get("object_navigator_up")))
bindings.add(
keybindings.KeyBinding(
"Down",
keybindings.defaultModifierMask,
keybindings.ORCA_CTRL_MODIFIER_MASK,
keybindings.CTHULHU_CTRL_MODIFIER_MASK,
self._handlers.get("object_navigator_down")))
bindings.add(
keybindings.KeyBinding(
"Right",
keybindings.defaultModifierMask,
keybindings.ORCA_CTRL_MODIFIER_MASK,
keybindings.CTHULHU_CTRL_MODIFIER_MASK,
self._handlers.get("object_navigator_next")))
bindings.add(
keybindings.KeyBinding(
"Left",
keybindings.defaultModifierMask,
keybindings.ORCA_CTRL_MODIFIER_MASK,
keybindings.CTHULHU_CTRL_MODIFIER_MASK,
self._handlers.get("object_navigator_previous")))
bindings.add(
keybindings.KeyBinding(
"Return",
keybindings.defaultModifierMask,
keybindings.ORCA_CTRL_MODIFIER_MASK,
keybindings.CTHULHU_CTRL_MODIFIER_MASK,
self._handlers.get("object_navigator_perform_action")))
bindings.add(
keybindings.KeyBinding(
"s",
keybindings.defaultModifierMask,
keybindings.ORCA_CTRL_MODIFIER_MASK,
keybindings.CTHULHU_CTRL_MODIFIER_MASK,
self._handlers.get("object_navigator_toggle_simplify")))
return bindings
src/cthulhu/plugin_system_manager.py
+2 -2
View File
@@ -49,7 +49,7 @@ class PluginType(IntEnum):
class PluginSystemManager():
"""Orca Plugin Manager to handle a set of plugins.
"""Cthulhu Plugin Manager to handle a set of plugins.
Attributes:
DEFAULT_LOADERS (tuple): Default loaders used by the plugin manager. For
possible values see
@@ -469,7 +469,7 @@ class APIHelper():
currModifierMask = keybindings.NO_MODIFIER_MASK
if cthulhuKey:
currModifierMask = currModifierMask | 1 << keybindings.MODIFIER_ORCA
currModifierMask = currModifierMask | 1 << keybindings.MODIFIER_CTHULHU
if shiftKey:
currModifierMask = currModifierMask | 1 << Atspi.ModifierType.SHIFT
if altKey:
src/cthulhu/plugins/ByeCthulhu/ByeCthulhu.py
+2 -2
View File
@@ -7,7 +7,7 @@ from gi.repository import Peas
import time
class ByeOrca(GObject.Object, Peas.Activatable, plugin.Plugin):
class ByeCthulhu(GObject.Object, Peas.Activatable, plugin.Plugin):
#__gtype_name__ = 'ByeCthulhu'
object = GObject.Property(type=GObject.Object)
@@ -24,4 +24,4 @@ class ByeOrca(GObject.Object, Peas.Activatable, plugin.Plugin):
messages = app.getDynamicApiManager().getAPI('Messages')
activeScript = app.getDynamicApiManager().getAPI('CthulhuState').activeScript
activeScript.presentationInterrupt()
activeScript.presentMessage(messages.STOP_ORCA, resetStyles=False)
activeScript.presentMessage(messages.STOP_CTHULHU, resetStyles=False)
src/cthulhu/plugins/ByeCthulhu/Makefile.am
+2 -2
View File
@@ -1,7 +1,7 @@
orca_python_PYTHON = \
cthulhu_python_PYTHON = \
__init__.py \
ByeCthulhu.plugin \
ByeCthulhu.py
orca_pythondir=$(pkgpythondir)/plugins/ByeCthulhu
cthulhu_pythondir=$(pkgpythondir)/plugins/ByeCthulhu
src/cthulhu/plugins/CapsLockHack/CapsLockHack.py
+5 -5
View File
@@ -58,16 +58,16 @@ class CapsLockHack(GObject.Object, Peas.Activatable, plugin.Plugin):
settings = API.app.getDynamicApiManager().getAPI('Settings')
time.sleep(3)
while self.isActive():
if "Caps_Lock" in settings.orcaModifierKeys \
or "Shift_Lock" in settings.orcaModifierKeys:
self.setCapsLockAsOrcaModifier(True)
if "Caps_Lock" in settings.cthulhuModifierKeys \
or "Shift_Lock" in settings.cthulhuModifierKeys:
self.setCapsLockAsCthulhuModifier(True)
capsLockCleared = True
elif capsLockCleared:
self.setCapsLockAsOrcaModifier(False)
self.setCapsLockAsCthulhuModifier(False)
capsLockCleared = False
time.sleep(1)
def setCapsLockAsOrcaModifier(self, enable):
def setCapsLockAsCthulhuModifier(self, enable):
originalXmodmap = None
lines = None
try:
src/cthulhu/plugins/CapsLockHack/Makefile.am
+2 -2
View File
@@ -1,7 +1,7 @@
orca_python_PYTHON = \
cthulhu_python_PYTHON = \
__init__.py \
CapsLockHack.plugin \
CapsLockHack.py
orca_pythondir=$(pkgpythondir)/plugins/CapsLockHack
cthulhu_pythondir=$(pkgpythondir)/plugins/CapsLockHack
src/cthulhu/plugins/Clipboard/Makefile.am
+2 -2
View File
@@ -1,7 +1,7 @@
orca_python_PYTHON = \
cthulhu_python_PYTHON = \
__init__.py \
Clipboard.plugin \
Clipboard.py
orca_pythondir=$(pkgpythondir)/plugins/Clipboard
cthulhu_pythondir=$(pkgpythondir)/plugins/Clipboard
src/cthulhu/plugins/Date/Makefile.am
+2 -2
View File
@@ -1,7 +1,7 @@
orca_python_PYTHON = \
cthulhu_python_PYTHON = \
__init__.py \
Date.plugin \
Date.py
orca_pythondir=$(pkgpythondir)/plugins/Date
cthulhu_pythondir=$(pkgpythondir)/plugins/Date
src/cthulhu/plugins/HelloCthulhu/HelloCthulhu.py
+1 -1
View File
@@ -20,4 +20,4 @@ class HelloCthulhu(GObject.Object, Peas.Activatable, plugin.Plugin):
API = self.object
def process(self, app):
messages = app.getDynamicApiManager().getAPI('Messages')
app.getDynamicApiManager().getAPI('CthulhuState').activeScript.presentMessage(messages.START_ORCA, resetStyles=False)
app.getDynamicApiManager().getAPI('CthulhuState').activeScript.presentMessage(messages.START_CTHULHU, resetStyles=False)
src/cthulhu/plugins/HelloCthulhu/Makefile.am
+2 -2
View File
@@ -1,7 +1,7 @@
orca_python_PYTHON = \
cthulhu_python_PYTHON = \
__init__.py \
HelloCthulhu.plugin \
HelloCthulhu.py
orca_pythondir=$(pkgpythondir)/plugins/HelloCthulhu
cthulhu_pythondir=$(pkgpythondir)/plugins/HelloCthulhu
src/cthulhu/plugins/HelloWorld/HelloWorld.plugin
+1 -1
View File
@@ -2,5 +2,5 @@
Module=HelloWorld
Loader=python3
Name=Hello World (python3)
Description=Test plugin for orca
Description=Test plugin for cthulhu
Authors=Chrys chrys@linux-a11y.org
src/cthulhu/plugins/HelloWorld/Makefile.am
+2 -2
View File
@@ -1,7 +1,7 @@
orca_python_PYTHON = \
cthulhu_python_PYTHON = \
__init__.py \
HelloWorld.plugin \
HelloWorld.py
orca_pythondir=$(pkgpythondir)/plugins/HelloWorld
cthulhu_pythondir=$(pkgpythondir)/plugins/HelloWorld
src/cthulhu/plugins/Makefile.am
+1 -1
View File
@@ -1,4 +1,4 @@
SUBDIRS = Clipboard HelloWorld SelfVoice Time MouseReview Date ByeCthulhu HelloCthulhu PluginManager CapsLockHack
orca_pythondir=$(pkgpythondir)/plugins
cthulhu_pythondir=$(pkgpythondir)/plugins
src/cthulhu/plugins/MouseReview/Makefile.am
+2 -2
View File
@@ -1,7 +1,7 @@
orca_python_PYTHON = \
cthulhu_python_PYTHON = \
__init__.py \
MouseReview.plugin \
MouseReview.py
orca_pythondir=$(pkgpythondir)/plugins/MouseReview
cthulhu_pythondir=$(pkgpythondir)/plugins/MouseReview
src/cthulhu/plugins/MouseReview/MouseReview.py
+3 -3
View File
@@ -1,4 +1,4 @@
# Mouse reviewer for Orca
# Mouse reviewer for Cthulhu
#
# Copyright 2008 Eitan Isaacson
# Copyright 2016 Igalia, S.L.
@@ -226,7 +226,7 @@ class _StringContext:
voice = self._script.speechGenerator.voice(obj=self._obj, string=self._string)
string = self._script.utilities.adjustForRepeats(self._string)
# TODO
#orca.emitRegionChanged(self._obj, self._start, self._end, orca.MOUSE_REVIEW)
#cthulhu.emitRegionChanged(self._obj, self._start, self._end, cthulhu.MOUSE_REVIEW)
emitRegionChanged(self._obj, self._start, self._end, "mouse-review")
@@ -398,7 +398,7 @@ class _ItemContext:
if self._obj and self._obj != prior._obj and not self._isInlineChild(prior):
priorObj = prior._obj or self._getContainer()
# TODO
#orca.emitRegionChanged(self._obj, mode=orca.MOUSE_REVIEW)
#cthulhu.emitRegionChanged(self._obj, mode=cthulhu.MOUSE_REVIEW)
emitRegionChanged(self._obj, mode="mouse-review")
self._script.presentObject(self._obj, priorObj=priorObj, inMouseReview=True)
src/cthulhu/plugins/PluginManager/Makefile.am
+2 -2
View File
@@ -1,8 +1,8 @@
orca_python_PYTHON = \
cthulhu_python_PYTHON = \
__init__.py \
PluginManager.plugin \
PluginManager.py \
PluginManagerUi.py
orca_pythondir=$(pkgpythondir)/plugins/PluginManager
cthulhu_pythondir=$(pkgpythondir)/plugins/PluginManager
src/cthulhu/plugins/SelfVoice/Makefile.am
+2 -2
View File
@@ -1,7 +1,7 @@
orca_python_PYTHON = \
cthulhu_python_PYTHON = \
__init__.py \
SelfVoice.plugin \
SelfVoice.py
orca_pythondir=$(pkgpythondir)/plugins/SelfVoice
cthulhu_pythondir=$(pkgpythondir)/plugins/SelfVoice
src/cthulhu/plugins/Time/Makefile.am
+2 -2
View File
@@ -1,7 +1,7 @@
orca_python_PYTHON = \
cthulhu_python_PYTHON = \
__init__.py \
Time.plugin \
Time.py
orca_pythondir=$(pkgpythondir)/plugins/Time
cthulhu_pythondir=$(pkgpythondir)/plugins/Time
src/cthulhu/script_utilities.py
+3 -3
View File
@@ -2942,7 +2942,7 @@ class Utilities:
return False
if len(event.event_string) != 1 \
or event.modifiers & keybindings.ORCA_CTRL_MODIFIER_MASK:
or event.modifiers & keybindings.CTHULHU_CTRL_MODIFIER_MASK:
return False
if AXUtilities.is_password_text(cthulhu_state.locusOfFocus):
@@ -4828,7 +4828,7 @@ class Utilities:
if mods & keybindings.CTRL_MODIFIER_MASK \
or mods & keybindings.SHIFT_MODIFIER_MASK \
or mods & keybindings.ALT_MODIFIER_MASK \
or mods & keybindings.ORCA_MODIFIER_MASK:
or mods & keybindings.CTHULHU_MODIFIER_MASK:
return False
return True
@@ -4997,7 +4997,7 @@ class Utilities:
if mods & keybindings.CTRL_MODIFIER_MASK \
or mods & keybindings.ALT_MODIFIER_MASK \
or mods & keybindings.ORCA_MODIFIER_MASK:
or mods & keybindings.CTHULHU_MODIFIER_MASK:
return False
return True
src/cthulhu/scripts/apps/soffice/script.py
+5 -5
View File
@@ -177,14 +177,14 @@ class Script(default.Script):
keybindings.KeyBinding(
"a",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self.inputEventHandlers["presentInputLineHandler"]))
keyBindings.add(
keybindings.KeyBinding(
"r",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self.inputEventHandlers["setDynamicColumnHeadersHandler"],
1))
@@ -192,7 +192,7 @@ class Script(default.Script):
keybindings.KeyBinding(
"r",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self.inputEventHandlers["clearDynamicColumnHeadersHandler"],
2))
@@ -200,7 +200,7 @@ class Script(default.Script):
keybindings.KeyBinding(
"c",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self.inputEventHandlers["setDynamicRowHeadersHandler"],
1))
@@ -208,7 +208,7 @@ class Script(default.Script):
keybindings.KeyBinding(
"c",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self.inputEventHandlers["clearDynamicRowHeadersHandler"],
2))
src/cthulhu/scripts/default.py
+2 -2
View File
@@ -202,7 +202,7 @@ class Script(script.Script):
self.inputEventHandlers["shutdownHandler"] = \
input_event.InputEventHandler(
cthulhu.quitCthulhu,
cmdnames.QUIT_ORCA)
cmdnames.QUIT_CTHULHU)
self.inputEventHandlers["preferencesSettingsHandler"] = \
input_event.InputEventHandler(
@@ -721,7 +721,7 @@ class Script(script.Script):
########################################################################
# #
# INPUT EVENT HANDLERS (AKA ORCA COMMANDS) #
# INPUT EVENT HANDLERS (AKA CTHULHU COMMANDS) #
# #
########################################################################
src/cthulhu/scripts/terminal/script_utilities.py
+1 -1
View File
@@ -223,7 +223,7 @@ class Utilities(script_utilities.Utilities):
return False
if len(event.event_string) != 1 \
or event.modifiers & keybindings.ORCA_CTRL_MODIFIER_MASK:
or event.modifiers & keybindings.CTHULHU_CTRL_MODIFIER_MASK:
return False
return True
src/cthulhu/scripts/web/script.py
+4 -4
View File
@@ -149,14 +149,14 @@ class Script(default.Script):
keybindings.KeyBinding(
"a",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self.inputEventHandlers.get("togglePresentationModeHandler")))
keyBindings.add(
keybindings.KeyBinding(
"a",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self.inputEventHandlers.get("enableStickyFocusModeHandler"),
2))
@@ -164,7 +164,7 @@ class Script(default.Script):
keybindings.KeyBinding(
"a",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self.inputEventHandlers.get("enableStickyBrowseModeHandler"),
3))
@@ -186,7 +186,7 @@ class Script(default.Script):
keybindings.KeyBinding(
key,
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self.inputEventHandlers.get("moveToMouseOverHandler")))
return keyBindings
src/cthulhu/speech_and_verbosity_manager.py
+3 -3
View File
@@ -231,21 +231,21 @@ class SpeechAndVerbosityManager:
keybindings.KeyBinding(
"s",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("toggleSilenceSpeechHandler")))
bindings.add(
keybindings.KeyBinding(
"v",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("toggleSpeechVerbosityHandler")))
bindings.add(
keybindings.KeyBinding(
"F11",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("toggleTableCellReadModeHandler")))
return bindings
src/cthulhu/speechdispatcherfactory.py
+1 -1
View File
@@ -276,7 +276,7 @@ class SpeechServer(speechserver.SpeechServer):
msg = (
f"SPEECH DISPATCHER: {prefix}\n"
f"ORCA rate {self._current_voice_properties.get(ACSS.RATE)}, "
f"CTHULHU rate {self._current_voice_properties.get(ACSS.RATE)}, "
f"pitch {self._current_voice_properties.get(ACSS.AVERAGE_PITCH)}, "
f"volume {self._current_voice_properties.get(ACSS.GAIN)}, "
f"language {self._get_language_and_dialect(family)[0]}, "
src/cthulhu/structural_navigation.py
+1 -1
View File
@@ -683,7 +683,7 @@ class StructuralNavigation:
keybindings.KeyBinding(
"z",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self.inputEventHandlers["toggleStructuralNavigationHandler"]))
for structuralNavigationObject in self.enabledObjects.values():
src/cthulhu/where_am_i_presenter.py
+12 -12
View File
@@ -120,14 +120,14 @@ class WhereAmIPresenter:
keybindings.KeyBinding(
"f",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("readCharAttributesHandler")))
bindings.add(
keybindings.KeyBinding(
"e",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("present_default_button")))
bindings.add(
@@ -141,7 +141,7 @@ class WhereAmIPresenter:
keybindings.KeyBinding(
"KP_Enter",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("getTitleHandler"),
1))
@@ -149,7 +149,7 @@ class WhereAmIPresenter:
keybindings.KeyBinding(
"KP_Enter",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("getStatusBarHandler"),
2))
@@ -180,7 +180,7 @@ class WhereAmIPresenter:
keybindings.KeyBinding(
"Up",
keybindings.defaultModifierMask,
keybindings.ORCA_SHIFT_MODIFIER_MASK,
keybindings.CTHULHU_SHIFT_MODIFIER_MASK,
self._handlers.get("whereAmISelectionHandler")))
return bindings
@@ -194,14 +194,14 @@ class WhereAmIPresenter:
keybindings.KeyBinding(
"f",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("readCharAttributesHandler")))
bindings.add(
keybindings.KeyBinding(
"e",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("present_default_button")))
bindings.add(
@@ -215,7 +215,7 @@ class WhereAmIPresenter:
keybindings.KeyBinding(
"slash",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("getTitleHandler"),
1))
@@ -223,7 +223,7 @@ class WhereAmIPresenter:
keybindings.KeyBinding(
"slash",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("getStatusBarHandler"),
2))
@@ -231,7 +231,7 @@ class WhereAmIPresenter:
keybindings.KeyBinding(
"Return",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("whereAmIBasicHandler"),
1))
@@ -239,7 +239,7 @@ class WhereAmIPresenter:
keybindings.KeyBinding(
"Return",
keybindings.defaultModifierMask,
keybindings.ORCA_MODIFIER_MASK,
keybindings.CTHULHU_MODIFIER_MASK,
self._handlers.get("whereAmIDetailedHandler"),
2))
@@ -254,7 +254,7 @@ class WhereAmIPresenter:
keybindings.KeyBinding(
"Up",
keybindings.defaultModifierMask,
keybindings.ORCA_SHIFT_MODIFIER_MASK,
keybindings.CTHULHU_SHIFT_MODIFIER_MASK,
self._handlers.get("whereAmISelectionHandler")))
return bindings