diff options
| author | hut <hut@lavabit.com> | 2010-02-18 21:58:37 +0100 |
|---|---|---|
| committer | hut <hut@lavabit.com> | 2010-03-09 14:40:22 +0100 |
| commit | ea3b13663ea3bbf42cd3472750ee7e00e9093ca4 (patch) | |
| tree | 6dfc99b936a28d6e47c473c9a100cb97fb003c6e /ranger | |
| parent | 13ecffe7ffa5c80cd69d55419f230c97d06ab23e (diff) | |
| download | ranger-ea3b13663ea3bbf42cd3472750ee7e00e9093ca4.tar.gz | |
keyparser: allow passive actions (for hints, show bookmarks)
Diffstat (limited to 'ranger')
| -rw-r--r-- | ranger/container/keymap.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ranger/container/keymap.py b/ranger/container/keymap.py index 70faa0d0..23f26448 100644 --- a/ranger/container/keymap.py +++ b/ranger/container/keymap.py @@ -18,6 +18,7 @@ from inspect import isfunction, getargspec from ranger.ext.tree import Tree MAX_ALIAS_RECURSION = 20 +PASSIVE_ACTION = 9003 DIRKEY = 9001 ANYKEY = 9002 FUNC = 'func' @@ -207,8 +208,8 @@ class KeyBuffer(object): return True def _do_eval_command(self, key): + assert isinstance(self.tree_pointer, dict), self.tree_pointer try: - assert isinstance(self.tree_pointer, dict), self.tree_pointer self.tree_pointer = self.tree_pointer[key] except TypeError: print(self.tree_pointer) @@ -230,6 +231,11 @@ class KeyBuffer(object): self.failure = True return None else: + if isinstance(self.tree_pointer, dict): + try: + self.command = self.tree_pointer[PASSIVE_ACTION] + except (KeyError, TypeError): + self.command = None self._try_to_finish() def _try_to_finish(self, rec=MAX_ALIAS_RECURSION): @@ -274,10 +280,12 @@ class KeyBuffer(object): return self.command if self.failure: break + return self.command key_map = { 'dir': DIRKEY, 'any': ANYKEY, + 'psv': PASSIVE_ACTION, 'cr': ord("\n"), 'enter': ord("\n"), 'space': ord(" "), |