Skip to content

Refactor and fix keybinding issue (fixes #447) #451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sebastinas merged 3 commits into from
Jan 22, 2015
Merged

Refactor and fix keybinding issue (fixes #447) #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51dbf41
Refactor and fix keybinding issue (fixes #447)
keyan Jan 21, 2015
4dbd59a
Make default keybinding reverse dictionary to interable
keyan Jan 21, 2015
fb46b60
Remove kill_line command which is duplicate of cut_to_buffer
keyan Jan 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions bpython/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ def loadini(struct, configfile):
'transpose_chars': 'C-t',
'clear_line': 'C-u',
'clear_screen': 'C-l',
'kill_line': 'C-k',
'clear_word': 'C-w',
'cut_to_buffer': 'C-k',
'delete': 'C-d',
Expand Down Expand Up @@ -104,6 +103,10 @@ def loadini(struct, configfile):
'list_above' : False,
'right_arrow_completion' : True,
}}

default_keys_to_commands = dict((value, key) for (key, value)
in defaults['keyboard'].iteritems())

fill_config_with_default_values(config, defaults)
if not config.read(config_path):
# No config file. If the user has it in the old place then complain
Expand All @@ -113,17 +116,17 @@ def loadini(struct, configfile):
"%s\n" % default_config_path())
sys.exit(1)

def get_key_no_doublebind(attr, already_used={}):
"""Clears any other configured keybindings using this key"""
key = config.get('keyboard', attr)
if key in already_used:
default = defaults['keyboard'][already_used[key]]
if default in already_used:
setattr(struct, '%s_key' % already_used[key], '')
else:
setattr(struct, '%s_key' % already_used[key], default)
already_used[key] = attr
return key

def get_key_no_doublebind(command):
default_commands_to_keys = defaults['keyboard']
requested_key = config.get('keyboard', command)
default_command = default_keys_to_commands[requested_key]

if default_commands_to_keys[default_command] == \
config.get('keyboard', default_command):
setattr(struct, '%s_key' % default_command, '')

return requested_key

struct.config_path = config_path

Expand Down Expand Up @@ -168,7 +171,6 @@ def get_key_no_doublebind(attr, already_used={}):
struct.transpose_chars_key = get_key_no_doublebind('transpose_chars')
struct.clear_line_key = get_key_no_doublebind('clear_line')
struct.clear_screen_key = get_key_no_doublebind('clear_screen')
struct.kill_line_key = get_key_no_doublebind('kill_line')
struct.exit_key = get_key_no_doublebind('exit')
struct.last_output_key = get_key_no_doublebind('last_output')
struct.edit_config_key = get_key_no_doublebind('edit_config')
Expand Down
2 changes: 1 addition & 1 deletion bpython/curtsiesfrontend/manual_readline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ def delete_line(cursor_offset, line):
def uppercase_next_word(cursor_offset, line):
return cursor_offset, line #TODO Not implemented

@edit_keys.on(config='kill_line_key')
@edit_keys.on(config='cut_to_buffer_key')
@kills_ahead
def delete_from_cursor_forward(cursor_offset, line):
return cursor_offset, line[:cursor_offset], line[cursor_offset:]
Expand Down