fix powerbutton bug in holding code

Author: antheas

src/hhd/plugins/powerbutton/__init__.py

@@ -49,10 +49,10 @@ def autodetect(existing: Sequence[HHDPlugin]) -> Sequence[HHDPlugin]:
     if len(existing):
         return existing
 
-    from .base import get_config, DEFAULT_DEVICE
+    from .const import get_config, get_default_config
 
     cfg = get_config()
     if not cfg:
-        return [PowerbuttondPlugin(DEFAULT_DEVICE)]
+        return [PowerbuttondPlugin(get_default_config())]
 
     return [PowerbuttondPlugin(cfg)]

src/hhd/plugins/powerbutton/base.py

@@ -11,7 +11,7 @@
 
 from hhd.utils import Context, expanduser
 
-from .const import DEFAULT_DEVICE, SUPPORTED_DEVICES, PowerButtonConfig
+from .const import PowerButtonConfig
 
 logger = logging.getLogger(__name__)
 
@@ -109,17 +109,6 @@ def register_hold_button(b: PowerButtonConfig) -> evdev.InputDevice | None:
     return None
 
 
-def get_config() -> PowerButtonConfig | None:
-    with open("/sys/devices/virtual/dmi/id/product_name") as f:
-        prod = f.read().strip()
-
-    for d in SUPPORTED_DEVICES:
-        if d.prod_name == prod:
-            return d
-
-    return None
-
-
 def run_steam_shortpress(perms: Context):
     return run_steam_command("steam://shortpowerpress", perms)
 
@@ -232,6 +221,8 @@ def power_button_timer(cfg: PowerButtonConfig, perms: Context, should_exit: Even
                         dev = None
                 logger.info(f"Waiting for steam to launch.")
                 while not is_steam_gamescope_running(perms):
+                    if should_exit.is_set():
+                        return
                     sleep(STEAM_WAIT_DELAY)
 
             if not dev:

src/hhd/plugins/powerbutton/const.py

@@ -64,7 +64,21 @@ class PowerButtonConfig(NamedTuple):
     ),
 ]
 
-DEFAULT_DEVICE: PowerButtonConfig = PBC("uknown", "NA", "hold_emitted")
+
+def get_config() -> PowerButtonConfig | None:
+    with open("/sys/devices/virtual/dmi/id/product_name") as f:
+        prod = f.read().strip()
+
+    for d in SUPPORTED_DEVICES:
+        if d.prod_name == prod:
+            return d
+
+    return None
+
+
+def get_default_config():
+    # Prepare for per-manufacturer customization
+    return PBC("uknown", "NA", "hold_emitted")
 
 
 # Legion go