controls EXTENDED_CONTROLS_DEFAULT_KEYSYM_MAPPINGS: map actions instead of keysyms

tooncher/controls.py

@@ -15,10 +15,10 @@ EXTENDED_CONTROLS_DEFAULT_TOGGLE_KEYSYM_NAME = 'grave'
 
 if Xlib:
     EXTENDED_CONTROLS_DEFAULT_KEYSYM_MAPPINGS = {
-        XK.XK_w: XK.XK_Up,
-        XK.XK_a: XK.XK_Left,
-        XK.XK_s: XK.XK_Down,
-        XK.XK_d: XK.XK_Right,
+        XK.XK_w: RewriteKeyEventAction(keysym=XK.XK_Up),
+        XK.XK_a: RewriteKeyEventAction(keysym=XK.XK_Left),
+        XK.XK_s: RewriteKeyEventAction(keysym=XK.XK_Down),
+        XK.XK_d: RewriteKeyEventAction(keysym=XK.XK_Right),
     }
 
 
@@ -74,6 +74,7 @@ class ExtendedControls:
             print("INFO Extended Controls:"
                   + " Ignoring mapping for toggle key '{}'".format(toggle_keysym_name))
         self._keysym_mappings = keysym_mappings
+        self._default_action = ForwardKeyEventAction()
         self._engine_window = None
         self._enabled = False
 
@@ -131,11 +132,9 @@ class ExtendedControls:
         if keysym_in == self._toggle_keysym:
             action = ToggleExtendedControlsAction()
         elif self.enabled and keysym_in in self._keysym_mappings:
-            action = RewriteKeyEventAction(
-                keysym=self._keysym_mappings[keysym_in],
-            )
+            action = self._keysym_mappings[keysym_in]
         else:
-            action = ForwardKeyEventAction()
+            action = self._default_action
         action.execute(self, xkeyevent)
 
     def enable(self):