default toggle const now private

rescriptoon/__init__.py

@@ -34,7 +34,6 @@ from rescriptoon._actions import (
 )
 from rescriptoon._keys import keysym_to_label
 
-EXTENDED_CONTROLS_DEFAULT_TOGGLE_KEYSYM_NAME = "grave"
 TOONTOWN_WINDOW_NAME = "Toontown Rewritten"
 
 _KEYSYM_ACTION_MAPPINGS = {
@@ -99,19 +98,14 @@ def _x_wait_for_event(xdisplay, timeout_seconds):
 
 
 class Overlay:
-    def __init__(
-        self, toggle_keysym_name=EXTENDED_CONTROLS_DEFAULT_TOGGLE_KEYSYM_NAME,
-    ):
+    def __init__(self, toggle_keysym: int):
         self._xdisplay = Xlib.display.Display()
-        self._toggle_keysym = XK.string_to_keysym(toggle_keysym_name)
-        if self._toggle_keysym == X.NoSymbol:
-            raise ValueError(
-                "rescriptoon controls toggle:"
-                + " unknown keysym name '{}'".format(toggle_keysym_name)
-            )
+        self._toggle_keysym = toggle_keysym
         self._keysym_mappings = copy.deepcopy(_KEYSYM_ACTION_MAPPINGS)
         if self._toggle_keysym in self._keysym_mappings:
-            logging.warning("ignoring mapping for toggle key %s", toggle_keysym_name)
+            logging.warning(
+                "ignoring mapping for toggle key %s", keysym_to_label(toggle_keysym)
+            )
         self._keysym_mappings[self._toggle_keysym] = ToggleOverlayAction()
         self._active_key_registry = {}
         self._enabled = False

rescriptoon/_cli.py

@@ -19,8 +19,12 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 import argparse
 import logging
 
+from Xlib import X, XK
+
 import rescriptoon
 
+_DEFAULT_TOGGLE_KEYSYM_NAME = "grave"
+
 
 def main() -> None:
     logging.basicConfig(level=logging.DEBUG)
@@ -32,11 +36,16 @@ def main() -> None:
         "-t",
         metavar="KEYSYM_NAME",
         dest="toggle_keysym_name",
-        default=rescriptoon.EXTENDED_CONTROLS_DEFAULT_TOGGLE_KEYSYM_NAME,
+        default=_DEFAULT_TOGGLE_KEYSYM_NAME,
         help="key to turn extended keyboard controls on / off."
         + " any keysym name may be used"
         + " (see XStringToKeysym & X11/keysymdef.h, "
         + " default: %(default)s)",
     )
     args = argparser.parse_args()
-    rescriptoon.Overlay(toggle_keysym_name=args.toggle_keysym_name).run()
+    toggle_keysym = XK.string_to_keysym(args.toggle_keysym_name)
+    if toggle_keysym == X.NoSymbol:
+        raise ValueError(
+            "controls toggle: unknown keysym name '{}'".format(args.toggle_keysym_name)
+        )
+    rescriptoon.Overlay(toggle_keysym=toggle_keysym).run()