Changeset 233

Timestamp:

01/04/07 03:46:43 (5 years ago)

Author:

mg

Message:

Allow up to two keys bound to the same action.

Location:

trunk

Files:

• NEWS.txt (modified) (1 diff)
• src/pyspacewar/ui.py (modified) (8 diffs)

trunk/NEWS.txt

@@ -4 +4 @@
   - Bugfix: after remapping the controls the old keys used to continue to
     perform the same actions.
+  - Allow up to two keys bound to the same action.
 
 December 25, 2006: Released version 0.9.3: the Christmas release.

trunk/src/pyspacewar/ui.py

@@ -129 +129 @@
 
     """
-    for action, key in controls.items():
-        text = text.replace(action, key_name(key))
+    for action, keys in controls.items():
+        text = text.replace(action, key_name(keys[0]))
     return text
 
@@ -1165 +1165 @@
         """Handle any keys that are pressed."""
         for key, (handler, args) in self._keymap_repeat.items():
-            key = self.ui.controls.get(key, key)
-            if pressed[key]:
-                handler(*args)
+            for key in self.ui.controls.get(key, [key]):
+                if key is not None and pressed[key]:
+                    handler(*args)
 
     def handle_mouse_press(self, event):
@@ -1488 +1488 @@
     """Mode: controls menu."""
 
+    def init(self):
+        MenuMode.init(self)
+        self.on_key(K_BACKSPACE, self.clear_item)
+        self.on_key(K_DELETE, self.clear_item)
+        self.on_key(K_KP_PERIOD, self.clear_item)
+
     def items(self, label, items):
         return ([(label, )] +
-                [(title + '\t' + key_name(self.ui.controls[action]),
+                [(title + '\t' + ', '.join(map(key_name,
+                                               self.ui.controls[action])),
                   self.set_control, title, action)
                  for title, action in items])
@@ -1523 +1530 @@
         """Change a control"""
         self.ui.ui_mode = WaitingForControlMode(self.ui, action, key)
+
+    def clear_item(self):
+        """Clear the selected menu item."""
+        action = self.menu_items[self.menu.selected_item][1:]
+        if action:
+            handler = action[0]
+            args = action[1:]
+            if handler == self.set_control:
+                title, action = args
+                self.ui.set_control(action, None)
+                self.reinit_menu()
 
 
@@ -1767 +1785 @@
     def __init__(self):
         self.rng = random.Random()
-        self.controls = dict(DEFAULT_CONTROLS)
-        self.rev_controls = dict([(value, key)
-                                  for (key, value) in self.controls.items()])
-        assert len(self.controls) == len(self.rev_controls)
+        self.controls = {}
+        for action in DEFAULT_CONTROLS:
+            self.controls[action] = [None]
+        self.rev_controls = {}
+        for action, key in DEFAULT_CONTROLS.items():
+            self.set_control(action, key)
 
     def load_settings(self, filename=None):
@@ -1789 +1809 @@
         for action in self.controls:
             key = config.get('controls', action)
-            try:
-                key = int(key)
-            except ValueError:
-                key = None
-            self.set_control(action, key)
+            if key:
+                # clear all current keys first
+                self.set_control(action, None)
+            for key in key.split():
+                try:
+                    key = int(key)
+                except ValueError:
+                    key = None
+                self.set_control(action, key)
 
     def save_settings(self, filename=None):
@@ -1814 +1838 @@
                    str(self.show_missile_trails))
         config.add_section('controls')
-        for action, key in self.controls.items():
-            config.set('controls', action, key)
+        for action, keys in self.controls.items():
+            config.set('controls', action, ' '.join(map(str, keys)))
         return config
 
@@ -2150 +2174 @@
         """Change a key mapping"""
         if key in self.rev_controls:
-            # key was previously bound to something else
             old_action = self.rev_controls[key]
-            self.controls[old_action] = None
-        old_key = self.controls[action]
-        if old_key:
-            # some other key was previously bound to this action
-            del self.rev_controls[old_key]
-        self.controls[action] = key
+            self.controls[old_action].remove(key)
+            if not self.controls[old_action]:
+                self.controls[old_action] = [None]
+        keys = self.controls[action]
+        if len(keys) > 1 or key is None or keys == [None]:
+            for old_key in keys:
+                if old_key is not None:
+                    del self.rev_controls[old_key]
+            self.controls[action] = []
+        self.controls[action].append(key)
         if key is not None:
             self.rev_controls[key] = action