Refactor user config handling and update default hotkey to Ctrl+L

Author: timothywarner

build.bat

@@ -7,6 +7,15 @@ echo PawGate Build Script
 echo ========================================
 echo.
 
+REM Remove user config so builds always start from bundled defaults
+set "CONFIG_FILE=%USERPROFILE%\.pawgate\config\config.json"
+if exist "%CONFIG_FILE%" (
+    del /f /q "%CONFIG_FILE%"
+    echo Removed user config at %CONFIG_FILE%
+) else (
+    echo No user config to remove at %CONFIG_FILE%
+)
+
 REM Use venv if it exists, otherwise use system Python
 if exist ".venv\Scripts\python.exe" (
     set "PYTHON=.venv\Scripts\python.exe"

resources/config/config.json

@@ -1 +1 @@
-{ "hotkey": "ctrl+b", "opacity": 0.3, "notificationsEnabled": false }
+{ "hotkey": "ctrl+l", "opacity": 0.3, "notificationsEnabled": false }

run_build.py

@@ -1,7 +1,22 @@
 """Run PyInstaller build for PawGate."""
+import os
 import subprocess
 import sys
-import os
+
+from src.util.path_util import get_config_path
+
+
+def delete_user_config() -> None:
+    """Remove the user config file so each build starts clean."""
+    config_path = get_config_path()
+    if os.path.exists(config_path):
+        os.remove(config_path)
+        print(f"Removed user config: {config_path}")
+    else:
+        print(f"No user config found at: {config_path}")
+
+
+delete_user_config()
 
 os.chdir(r'C:\github\pawgate')
 

src/config/config.py

@@ -44,8 +44,9 @@
 BUNDLED_CONFIG_FILE = os.path.join("resources", "config", "config.json")
 
 # Default hotkey if config is missing or invalid
-# WHY Ctrl+B: "B" stands for "Block", is easy to reach, and avoids common shortcuts
-DEFAULT_HOTKEY = "ctrl+b"
+# WHY Ctrl+L: Easy to reach, avoids common system shortcuts (unlike Win+L),
+# and maps well to "lock" in PawGate's context.
+DEFAULT_HOTKEY = "ctrl+l"
 
 
 def should_use_bundled_config():

src/main.py

@@ -220,6 +220,18 @@ def _get_hotkey_keys(self) -> list[str]:
                 hotkey_keys.append(key)
         return hotkey_keys
 
+    def _get_hotkey_scan_codes(self) -> set[int]:
+        """Return the scan codes for the configured hotkey (including modifier variants)."""
+        scan_codes: set[int] = set()
+        for key_name in self._get_hotkey_keys():
+            try:
+                for code in keyboard.key_to_scan_codes(key_name):
+                    scan_codes.add(code)
+            except Exception:
+                # If keyboard cannot resolve a key name on this layout, skip it.
+                continue
+        return scan_codes
+
     def lock_keyboard(self) -> None:
         """
         Block ALL keyboard input using comprehensive scan code blocking.
@@ -258,9 +270,15 @@ def lock_keyboard(self) -> None:
         """
         self.blocked_keys.clear()
 
+        # Determine scan codes used by the unlock hotkey so we do NOT block them.
+        hotkey_scan_codes = self._get_hotkey_scan_codes()
+
         # Block full scan code range (0-255) to cover all keyboards including
         # multimedia keys, F13-F24, and regional/international layouts
         for i in range(256):
+            if i in hotkey_scan_codes:
+                # Skip blocking the unlock hotkey scan codes so the hotkey still works.
+                continue
             try:
                 keyboard.block_key(i)
                 self.blocked_keys.add(i)
@@ -273,6 +291,8 @@ def lock_keyboard(self) -> None:
         # Block extended scan codes that Windows uses for brightness/backlight controls.
         # These live outside the 0-255 range and need explicit handling.
         for extended_code in EXTENDED_SCAN_CODES:
+            if extended_code in hotkey_scan_codes:
+                continue
             try:
                 keyboard.block_key(extended_code)
                 self.blocked_keys.add(extended_code)