extended controls refactor RewriteKeyEventAction: rename target_engine -> target_engine_index, no longer bitmask

tooncher/actions.py

@@ -40,16 +40,16 @@ class SelectGagAction:
 
 
 class TargetEngine:
-    Primary = 1 << 0
-    NonPrimary = 1 << 1
-    All = Primary | NonPrimary
+    Primary = -1
+    NonPrimary = -2
+    All = -3
 
 
 class RewriteKeyEventAction:
 
-    def __init__(self, keysym=None, target_engine=TargetEngine.Primary):
+    def __init__(self, keysym=None, target_engine_index=TargetEngine.Primary):
         self._keysym = keysym
-        self._target_engine = target_engine
+        self._target_engine_index = target_engine_index
 
     @staticmethod
     def _send_event(event_template, keycode, target_window):
@@ -73,12 +73,12 @@ class RewriteKeyEventAction:
                 if self._keysym else xkeyevent.detail,
             event_template=xkeyevent,
         )
-        if self._target_engine & TargetEngine.Primary:
+        if self._target_engine_index in [TargetEngine.Primary, TargetEngine.All]:
             self._send_event(
                 target_window=extended_controls.primary_engine_window,
                 **defaults,
             )
-        if self._target_engine & TargetEngine.NonPrimary:
+        if self._target_engine_index in [TargetEngine.NonPrimary, TargetEngine.All]:
             for win in extended_controls.other_engine_windows:
                 self._send_event(target_window=win, **defaults)
 

tooncher/controls.py

@@ -24,31 +24,31 @@ if Xlib:
         XK.XK_v: RewriteKeyEventAction(keysym=XK.XK_Delete),
         XK.XK_i: RewriteKeyEventAction(
             keysym=XK.XK_Up,
-            target_engine=TargetEngine.NonPrimary,
+            target_engine_index=TargetEngine.NonPrimary,
         ),
         XK.XK_j: RewriteKeyEventAction(
             keysym=XK.XK_Left,
-            target_engine=TargetEngine.NonPrimary,
+            target_engine_index=TargetEngine.NonPrimary,
         ),
         XK.XK_k: RewriteKeyEventAction(
             keysym=XK.XK_Down,
-            target_engine=TargetEngine.NonPrimary,
+            target_engine_index=TargetEngine.NonPrimary,
         ),
         XK.XK_l: RewriteKeyEventAction(
             keysym=XK.XK_Right,
-            target_engine=TargetEngine.NonPrimary,
+            target_engine_index=TargetEngine.NonPrimary,
         ),
         XK.XK_slash: RewriteKeyEventAction(
             keysym=XK.XK_Control_L,
-            target_engine=TargetEngine.NonPrimary,
+            target_engine_index=TargetEngine.NonPrimary,
         ),
         XK.XK_n: RewriteKeyEventAction(
             keysym=XK.XK_Delete,
-            target_engine=TargetEngine.NonPrimary,
+            target_engine_index=TargetEngine.NonPrimary,
         ),
         XK.XK_space: RewriteKeyEventAction(
             keysym=XK.XK_Control_L,
-            target_engine=TargetEngine.All,
+            target_engine_index=TargetEngine.All,
         ),
         XK.XK_e: SelectGagAction(factor_x=0.038, factor_y=-0.047),  # elephant trunk
         XK.XK_f: SelectGagAction(factor_x=0.119, factor_y=-0.047),  # foghorn