extended controls refactor: rename engine_window -> primary_engine_window

tooncher/actions.py

@@ -13,10 +13,10 @@ class SelectGagAction:
         self._factor_y = factor_y
 
     def execute(self, extended_controls, xkeyevent):
-        engine_geometry = extended_controls._engine_window.get_geometry()
+        engine_geometry = extended_controls.primary_engine_window.get_geometry()
         smaller_dimension = min(engine_geometry.width, engine_geometry.height)
         attr = dict(
-            window=extended_controls.engine_window,
+            window=extended_controls.primary_engine_window,
             detail=self._button,
             state=xkeyevent.state,
             event_x=int(engine_geometry.width / 2
@@ -36,7 +36,7 @@ class SelectGagAction:
             e = Xlib.protocol.event.ButtonPress(**attr)
         else:
             e = Xlib.protocol.event.ButtonRelease(**attr)
-        extended_controls.engine_window.send_event(e)
+        extended_controls.primary_engine_window.send_event(e)
 
 
 class TargetEngine:
@@ -75,7 +75,7 @@ class RewriteKeyEventAction:
         )
         if self._target_engine & TargetEngine.Primary:
             self._send_event(
-                target_window=extended_controls.engine_window,
+                target_window=extended_controls.primary_engine_window,
                 **defaults,
             )
         if self._target_engine & TargetEngine.NonPrimary:

tooncher/controls.py

@@ -121,7 +121,7 @@ class ExtendedControls:
         self._keysym_mappings[self._toggle_keysym] \
             = ToggleExtendedControlsAction()
         self._default_action = ForwardKeyEventAction()
-        self._engine_window = None
+        self._primary_engine_window = None
         self._other_engine_windows = None
         self._active_key_registry = {}
         self._enabled = False
@@ -135,8 +135,8 @@ class ExtendedControls:
         return self._xdisplay
 
     @property
-    def engine_window(self):
-        return self._engine_window
+    def primary_engine_window(self):
+        return self._primary_engine_window
 
     def _wait_for_engine_window(self, timeout_seconds=20, search_interval_seconds=2):
         start_epoch = time.time()
@@ -152,8 +152,8 @@ class ExtendedControls:
         return None
 
     def run(self):
-        self._engine_window = self._wait_for_engine_window()
-        if not self._engine_window:
+        self._primary_engine_window = self._wait_for_engine_window()
+        if not self._primary_engine_window:
             raise Exception('Could not find the game\'s window.')
         self._grab_key(
             self._xdisplay.keysym_to_keycode(self._toggle_keysym),
@@ -218,7 +218,7 @@ class ExtendedControls:
             self.enable()
 
     def _grab_key(self, keycode):
-        self._engine_window.grab_key(
+        self.primary_engine_window.grab_key(
             keycode,
             X.AnyModifier,
             # owner_events
@@ -230,13 +230,13 @@ class ExtendedControls:
         )
 
     def _ungrab_key(self, keycode):
-        self._engine_window.ungrab_key(keycode, X.AnyModifier)
+        self.primary_engine_window.ungrab_key(keycode, X.AnyModifier)
 
     def find_other_engine_windows(self):
         return x_find_window(
             self.xdisplay.screen().root,
             lambda w: w.get_wm_name() == TOONTOWN_WINDOW_NAME
-                    and w.id != self.engine_window.id,
+                    and w.id != self.primary_engine_window.id,
         )
 
     @property