Updated the README somewhat.

AUTHORS

@@ -1,4 +1,4 @@
-Orca Authors
+Cthulhu Authors
 
 Marc Mulcahy
 Willie Walker

ChangeLog-pre-2.27.1

@@ -1867,7 +1867,7 @@
 
         * Release Cthulhu v2.24.0.  Somehow I forgot to mark this.
           The svn version is 4292 and can be found at the tag
-          of ORCA_24_0.
+          of CTHULHU_24_0.
 
 2008-09-20  Joanmarie Diggs <joanmarie.diggs@gmail.com>
 
@@ -5747,7 +5747,7 @@
         * src/cthulhu/app_gui_prefs.py:
           src/cthulhu/cthulhu_gui_prefs.py:
           src/cthulhu/cthulhu_state.py:
-          Fix breakage to ORCA_MODIFIER-Control-Space to bring up the
+          Fix breakage to CTHULHU_MODIFIER-Control-Space to bring up the
           application specific Cthulhu preferences dialog.
 
 2007-12-12  Willie Walker <william.walker@sun.com>
@@ -10456,7 +10456,7 @@
           Fix for bug #372273 - Add ability to configure app-specific
           settings via GUI.
 
-          Adjusted <ORCA MODIFIER>+Control+Space to now bring up
+          Adjusted <CTHULHU MODIFIER>+Control+Space to now bring up
           the application specific preferences dialog. The previous
           usage (reload user settings) is now gone.
 
@@ -12574,7 +12574,7 @@
 
 2007-01-07  Willie Walker <william.walker@sun.com>
 
-        * svn+ssh://wwalker@svn.gnome.org/svn/cthulhu/tags/ORCA_2_17_5:
+        * svn+ssh://wwalker@svn.gnome.org/svn/cthulhu/tags/CTHULHU_2_17_5:
         final prep for v2.17.5.  Everything below this line is included
         in v2.17.5 - many many thanks to all involved.
 
@@ -17730,7 +17730,7 @@
 
         * po/POTFILES.in: remove Gecko.py.
 
-        * configure.in: get the ORCA_SETUP_GLADE_DIR working better.
+        * configure.in: get the CTHULHU_SETUP_GLADE_DIR working better.
 
         * src/cthulhu/mag.py: minor attempt to follow the caret when it
         moves.
@@ -19296,7 +19296,7 @@
         * src/cthulhu/{default.py, gnomespeechfactory.py, cthulhu-setup.in,
         cthulhu.py, settings.py, speech.py}, src/cthulhu/scripts/Gecko.py:
         migrate voice defaults to setting.py.
-        NOTE: THIS REQUIRES YOU TO RERUN ORCA-SETUP.
+        NOTE: THIS REQUIRES YOU TO RERUN CTHULHU-SETUP.
 
         * src/cthulhu/*.py: use string constants to get settings (I got
         bit by a mispelling when using raw strings).
@@ -19335,7 +19335,7 @@
         src/cthulhu/scripts/{Gecko.py,metacity.py}: new speech structure
         done in collaboration with T.V. Raman of Google who donated
         code under the LGPL license.  NOTE: THIS REQUIRES YOU TO
-        RERUN ORCA-SETUP.
+        RERUN CTHULHU-SETUP.
 
 2005-11-14  Rich Burridge <rich.burridge@sun.com>
 
@@ -19359,7 +19359,7 @@
         src/cthulhu/scripts/Gecko.py, src/cthulhu/scripts/gaim.py,
         src/cthulhu/scripts/gcalctool.py, src/cthulhu/scripts/metacity.py: First
         pass at new speech system based on conversations with T.V. Raman.
-        NOTE: THIS REQUIRES YOU TO RERUN ORCA-SETUP.  If you don't cthulhu
+        NOTE: THIS REQUIRES YOU TO RERUN CTHULHU-SETUP.  If you don't cthulhu
         will fail on startup.
 
 2005-11-09  Mike Pedersen <michael.pedersen@sun.com>

HACKING

@@ -1,6 +1,6 @@
 Welcome to Cthulhu
 
-We are excited to have you here and welcome your contributions to the Cthulhu screen reader project! This project is a fork of Orca, with a focus on creating an open and collaborative community where contributions are encouraged.
+We are excited to have you here and welcome your contributions to the Cthulhu screen reader project! This project is a fork of Cthulhu, with a focus on creating an open and collaborative community where contributions are encouraged.
 
 
 How to Contribute

Makefile.am

@@ -44,7 +44,7 @@ dist-hook:
 		echo Creating ChangeLog && \
 		( cd "$(top_srcdir)" && \
 		  echo '# Generated by Makefile. Do not edit.'; echo; \
-		  $(top_srcdir)/missing --run git log --pretty=format:"%ai %an <%ae>%n%n        %s%n" --name-status ORCA_2_26_0.. ) > ChangeLog.tmp \
+		  $(top_srcdir)/missing --run git log --pretty=format:"%ai %an <%ae>%n%n        %s%n" --name-status CTHULHU_2_26_0.. ) > ChangeLog.tmp \
 		&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
 		|| ( rm -f ChangeLog.tmp ; \
 		echo Failed to generate ChangeLog >&2 ); \

NEWS

@@ -11255,7 +11255,7 @@ Firefox:
 
 * Fix for bug 445578 - Link preview information would be desirable for
   Firefox.  This is obtained when performing a "Where Am I" operation
-  (KP_Enter for desktop bindings, ORCA_MODIFIER+Return for laptop
+  (KP_Enter for desktop bindings, CTHULHU_MODIFIER+Return for laptop
   bindings).  Many thanks to new community member Scott Haeger for
   this functionality!
 
@@ -11439,7 +11439,7 @@ General Cthulhu:
   of tool tips
 
 * Fix for bug 372273 - Add ability to configure app-specific settings
-  via GUI. NOTE: Adjusted ORCA_MODIFIER+Control+Space to now bring
+  via GUI. NOTE: Adjusted CTHULHU_MODIFIER+Control+Space to now bring
   up the application-specific preferences dialog. The previous usage
   (reload user settings) is now gone.
 
@@ -11476,7 +11476,7 @@ Firefox:
   stylesheet results in bad behavior
 
 * Partial fix for bug 420540 - Firefox keyboard control wish list.
-  ORCA_MODIFIER+Z will now toggle the structural navigation keys
+  CTHULHU_MODIFIER+Z will now toggle the structural navigation keys
   on/off.
 
 * Fix for bug 422924 - Add more support for accessing HTML tables in
@@ -11493,8 +11493,8 @@ Firefox:
   of verbiage.  Therefore, these are all customizable settings.
 
 * Fix for bug 423427 - Need to add form field structural navigation in
-  Firefox.  ORCA_MODIFIER+Tab should move you to the next form field
-  and ORCA_MODIFIER+Shift+Tab should move you to the previous form
+  Firefox.  CTHULHU_MODIFIER+Tab should move you to the next form field
+  and CTHULHU_MODIFIER+Shift+Tab should move you to the previous form
   field.
 
 * Fix for bug 423435 - Cthulhu is too chatty when loading a page in

README.md

@@ -1,4 +1,4 @@
-# Cthulhu v45.3
+# Cthulhu 
 
 ## Introduction
 
@@ -11,20 +11,12 @@ technology service provider interface (AT-SPI), which is the primary
 assistive technology infrastructure for the Solaris and Linux
 operating environments.  Applications and toolkits supporting the
 AT-SPI include the GNOME GTK+ toolkit, the Java platform's Swing
-toolkit, OpenOffice/LibreOffice, Gecko, and WebKitGtk.  AT-SPI support
-for the KDE Qt toolkit is currently being pursued.
+toolkit, OpenOffice/LibreOffice, Gecko, WebKitGtk, and KDE Qt toolkit.
 
-See also <http://wiki.gnome.org/Projects/Cthulhu> for detailed information
-on Cthulhu, including how to run Cthulhu, how to communicate with the Cthulhu user
-community, and where to log bugs and feature requests.
 
 ## Dependencies
 
-Cthulhu v45.x is supported on GNOME 45.x only.  We highly suggest you
-use the latest releases of GNOME because they contain accessibility
-infrastructure and application bug fixes that help Cthulhu work better.
-
-Cthulhu also has the following dependencies:
+Cthulhu has the following dependencies:
 
 * Python 3         - Python platform
 * pygobject-3.0    - Python bindings for the GObject library
@@ -39,10 +31,10 @@ Cthulhu also has the following dependencies:
 * gstreamer-1.0    - GStreamer - Streaming media framework (optional)
 
 You are strongly encouraged to also have the latest stable versions
-of AT-SPI2 and ATK for the GNOME 45.x release.
+of AT-SPI2 and ATK.
 
 
-## NOTE FOR BRLTTY USERS:
+## Braille
 
 Cthulhu depends upon the Python bindings for BrlAPI available in BrlTTY v4.5
 or better.  You can determine if the Python bindings for BrlAPI are
@@ -66,10 +58,10 @@ learn mode, press "Escape."  Finally, the preferences dialog contains
 a "Key Bindings" tab that lists the keyboard binding for Cthulhu.
 
 For more information, see the Cthulhu documentation which is available
-within Cthulhu as well as at: <https://help.gnome.org/users/cthulhu/stable/>
+within Cthulhu.
 
 ## Scripting Cthulhu
 
 So, you want to write a script for Cthulhu?  The best thing to do is 
 start by looking at other scripts under the src/cthulhu/scripts/ hierarchy
-of the source tree.
+of the source tree. Cthulhu also has an excellent plugin system, more documentation and examples coming soon.

RELEASE-HOWTO

@@ -22,17 +22,17 @@ Make sure you are up to date:
 Update ./NEWS with changes from the last tagged release. You can use
 commands like the following:
 
-Detailed commits since the ORCA_40_BETA tag:
+Detailed commits since the CTHULHU_40_BETA tag:
 
-  git log ORCA_40_BETA..
+  git log CTHULHU_40_BETA..
 
 Short list of translation changes with author names and files:
 
-  git log ORCA_40_BETA.. --grep translation --pretty=format:"%s - %an" --name-only
+  git log CTHULHU_40_BETA.. --grep translation --pretty=format:"%s - %an" --name-only
 
 Quick-and-dirty formatted list of translation changes:
 
-  git log ORCA_40_BETA.. --grep translation --pretty=format:"%s,%an" --name-only |
+  git log CTHULHU_40_BETA.. --grep translation --pretty=format:"%s,%an" --name-only |
     awk -F/ '/\.(po|am)/ {gsub("(\.po|Makefile.am)", "", $NF); printf(",%s",$NF); next;}
     {gsub("(Updated* |Add(ed)* | translation| help)", "", $0); printf("\n%s",$0);}' |
     awk -F, '!seen[$0]++ {if (NF == 3) printf("  %-15s %-25s %s\n", $3, $1, $2);}' |
@@ -40,7 +40,7 @@ Quick-and-dirty formatted list of translation changes:
 
 Short list of non-translation commits:
 
-  git log ORCA_40_BETA.. --grep translation --invert-grep --pretty=format:" * %s%n"
+  git log CTHULHU_40_BETA.. --grep translation --invert-grep --pretty=format:" * %s%n"
 
 NOTE: You should also make sure the external dependencies listed in
 configure.ac and README are accurate.
@@ -56,8 +56,8 @@ COMMIT RELEASE CHANGES AND TAG THE RELEASE:
 
 git commit -a
 git push
-git tag -a -s ORCA_40_RC
-git push origin ORCA_40_RC
+git tag -a -s CTHULHU_40_RC
+git push origin CTHULHU_40_RC
 
 
 UPLOAD THE RELEASE:

TODO

@@ -1,4 +1,4 @@
-- Add Simple Orca Plugin System as native code for Cthulhu
+- Add Simple Cthulhu Plugin System as native code for Cthulhu
 - Merge in sleep mode.
 - Add in ocrdesktop code so that Cthulhu has native ocr support.
 - Get rid of build systems. My hope is git clone and run so long as requirements are satisfied.

distro-packages/Arch-Linux/PKGBUILD

@@ -35,8 +35,6 @@ makedepends=(
   itstool
   yelp-tools
 )
-groups=(gnome)
-_commit=9e77d1baf9bd24b78d7499ad9b2e8bb80c9a0c81  # tags/ORCA_45_1^0
 source=("git+https://git.stormux.org/storm/cthulhu.git")
 b2sums=('SKIP')
 

po/ast.po

@@ -2710,7 +2710,7 @@ msgstr ""
 "DENGUNA GARANTÍA; ensin denguna implicación de garantía de COMERCIABILIDÁ o CALIDÁ PA DENGÚN PROPÓSITU PARTICULAR. Consulta la Llicencia Pública Xeneral Reducida GNU pa más\n"
 "detalles.\n"
 "\n"
-"Tendríes de recibir una copia de la Llicencia Pública Xeneral Reducida de GNU xuntu con ORCA, de lo contrario, escribi a la Free Software Foundation, Inc, Franklin\n"
+"Tendríes de recibir una copia de la Llicencia Pública Xeneral Reducida de GNU xuntu con CTHULHU, de lo contrario, escribi a la Free Software Foundation, Inc, Franklin\n"
 "Street, Fifth Floor, Boston, MA 02110-1301, EE. UU."
 
 #. DESCRIP

po/es.po

@@ -1,6 +1,6 @@
 # translation of cthulhu.HEAD.po to Español
 # Traducción de Cthulhu al Español
-# This file is distributed under the same license as the ORCA package.
+# This file is distributed under the same license as the CTHULHU package.
 # Copyright (C) 2005 GNOME Foundation.
 # 
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004, 2006.
@@ -15099,7 +15099,7 @@ msgstr ""
 #~ "detalles.\n"
 #~ "\n"
 #~ "Debería haber recibido una copia de la Licencia Pública General Reducida "
-#~ "de GNU junto con ORCA, de lo contrario, escriba a la Free Software "
+#~ "de GNU junto con CTHULHU, de lo contrario, escriba a la Free Software "
 #~ "Foundation, Inc, \n"
 #~ "Franklin Street, Fifth Floor, Boston, MA 02110-1301, EE. UU."
 

po/sq.po

@@ -1,6 +1,6 @@
 # Përkthimi i cthulhu.HEAD në shqip.
 # Copyright (C) 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the ORCA package.
+# This file is distributed under the same license as the CTHULHU package.
 #
 # Laurent Dhima <laurenti@alblinux.net>, 2007.
 msgid ""

src/cthulhu/action_presenter.py

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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."""