tooncher/controls.py: rename some variables

tooncher/controls.py

@@ -13,7 +13,7 @@ except ImportError:
 EXTENDED_CONTROLS_DEFAULT_TOGGLE_KEYSYM_NAME = 'grave'
 
 if Xlib:
-    EXTENDED_KEYBOARD_CONTROLS_DEFAULT_MAPPING = {
+    EXTENDED_CONTROLS_DEFAULT_KEYSYM_MAPPINGS = {
         XK.XK_w: XK.XK_Up,
         XK.XK_a: XK.XK_Left,
         XK.XK_s: XK.XK_Down,
@@ -65,14 +65,14 @@ class ExtendedControls:
         if self._toggle_keysym == X.NoSymbol:
             raise Exception("Extended keyboard controls toggle:"
                             + " Unknown keysym name '{}'".format(toggle_keysym_name))
-        keyboard_mapping = copy.deepcopy(
+        keysym_mappings = copy.deepcopy(
-            EXTENDED_KEYBOARD_CONTROLS_DEFAULT_MAPPING
+            EXTENDED_CONTROLS_DEFAULT_KEYSYM_MAPPINGS,
         )
-        if self._toggle_keysym in keyboard_mapping:
+        if self._toggle_keysym in keysym_mappings:
-            del keyboard_mapping[self._toggle_keysym]
+            del keysym_mappings[self._toggle_keysym]
             print("INFO Extended Controls:"
                   + " Ignoring mapping for toggle key '{}'".format(toggle_keysym_name))
-        self._keyboard_mapping = keyboard_mapping
+        self._keysym_mappings = keysym_mappings
         self._engine_window = None
         self._enabled = False
 
@@ -124,8 +124,8 @@ class ExtendedControls:
             if isinstance(xkeyevent, Xlib.protocol.event.KeyPress):
                 self.toggle()
         else:
-            if self.enabled and keysym_in in self._keyboard_mapping:
+            if self.enabled and keysym_in in self._keysym_mappings:
-                keysym_out = self._keyboard_mapping[keysym_in]
+                keysym_out = self._keysym_mappings[keysym_in]
             else:
                 keysym_out = keysym_in
             self._engine_window.send_event(type(xkeyevent)(
@@ -143,7 +143,7 @@ class ExtendedControls:
             ))
 
     def enable(self):
-        for keysym in self._keyboard_mapping.keys():
+        for keysym in self._keysym_mappings.keys():
             self._grab_key(
                 self._xdisplay.keysym_to_keycode(keysym),
             )
@@ -151,7 +151,7 @@ class ExtendedControls:
         print("INFO Enabled Extended Controls")
 
     def disable(self):
-        for keysym in self._keyboard_mapping.keys():
+        for keysym in self._keysym_mappings.keys():
             self._ungrab_key(
                 self._xdisplay.keysym_to_keycode(keysym),
             )