mouse pressed fix

Author: IGalat

src/tapper/controller/mouse/mouse_api.py

@@ -6,8 +6,14 @@
 
 from tapper.controller.resource_controller import ResourceController
 from tapper.model import constants
+from tapper.model import mouse
 from tapper.state import keeper
 
+mouse_buttons_w_aliases = {
+    **mouse.button_aliases,
+    **{b: [b] for b in mouse.regular_buttons},
+}
+
 
 def is_near(current_x: int, current_y: int, x: int, y: int, precision: int) -> bool:
     return (current_x - x) ** 2 + (current_y - y) ** 2 <= precision**2
@@ -106,7 +112,7 @@ def _stop(self) -> None:
 
     def pressed(self, symbol: str) -> bool:
         """Is key held down. Not applicable to wheel."""
-        return symbol in self._state_keeper.pressed_keys
+        return mouse_buttons_w_aliases[symbol][0] in self._state_keeper.pressed_keys
 
     def toggled(self, symbol: str) -> bool:
         """Is key toggled. Not applicable to wheel."""

src/tapper/helper/_util/repeat_util.py

@@ -38,7 +38,6 @@ def _run_task(repeatable: Repeatable) -> None:
         kill_id=flow_control.kill_id,
     )
     for i in range(repeatable.max_repeats or 99999999999999):
-        print("iter ", i)
         if is_end_run(repeatable):
             running_repeatable = None
             return
@@ -83,10 +82,9 @@ def to_pressed_condition(symbol: str) -> Callable[[], bool]:
         device = tapper.kb  # type: ignore
     else:
         raise ValueError(f"Repeat while pressed: '{symbol}' not recognised.")
-    return (
-        lambda: device.pressed(symbol)
-        or symbol in initializer.keeper_pressed.pressed_keys  # type: ignore
-    )
+    return lambda: (
+        device.pressed(symbol) or symbol in initializer.keeper_pressed.pressed_keys
+    )  # type: ignore
 
 
 def toggle_run(repeatable: Repeatable) -> None: