sforman
/
Thun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partial harmonize key commands. 

Fix bug cut instead of copy.
This commit is contained in:
Simon Forman 2018-07-14 18:25:12 -07:00
parent 504981e551
commit 9ea0157969
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
joy/gui/main.py
View File

@ -98,12 +98,10 @@ def init_text(t, title, filename):
def key_bindings(*args): def key_bindings(*args):
print dedent(''' print dedent('''
Ctrl-Enter - Run the selection as Joy code. Ctrl-Enter - Run the selection as Joy code.
F1 - Reset and show (if hidden) the log. F1 - Reset and show (if hidden) the log.
Esc - Like F1 but also clears the stack. Esc - Like F1 but also clears the stack.
F5 - Copy the selection to text on the stack. ...
Shift-F5 - As F5 but cuts the selection.
F6 - Paste as text from top of stack.
Shift-F6 - As F6 but pops the item.
F12 - print a list of all command words, or right-click "words". F12 - print a list of all command words, or right-click "words".
''') ''')
return args return args
@ -164,9 +162,9 @@ def load_stack():
tb = TEXT_BINDINGS.copy() tb = TEXT_BINDINGS.copy()
tb.update({ tb.update({
'<Shift-F5>': lambda tv: tv.cut, '<F4>': lambda tv: tv.cut,
'<F5>': lambda tv: tv.copy_selection_to_stack, '<F3>': lambda tv: tv.copy_selection_to_stack,
'<Shift-F6>': lambda tv: tv.pastecut, # '<F-->': lambda tv: tv.pastecut,
'<F6>': lambda tv: tv.copyto, '<F6>': lambda tv: tv.copyto,
}) })
@ -210,9 +208,22 @@ init_text(t, 'Joy - ' + JOY_HOME, JOY_FN)
GLOBAL_COMMANDS = { GLOBAL_COMMANDS = {
'<F5>': 'swap',
'<F6>': 'dup',
'<Shift-F5>': 'roll<',
'<Shift-F6>': 'roll>',
'<F7>': 'over',
'<Shift-F7>': 'tuck',
'<Shift-F3>': 'parse',
'<F12>': 'words', '<F12>': 'words',
'<F1>': 'reset_log show_log', '<F1>': 'reset_log show_log',
'<Escape>': 'clear reset_log show_log', '<Escape>': 'clear reset_log show_log',
'<Control-Delete>': 'pop',
'<Control-Shift-Delete>': 'popd',
} }
for event, command in GLOBAL_COMMANDS.items(): for event, command in GLOBAL_COMMANDS.items():
t.bind_all(event, lambda _, _command=command: w.interpret(_command)) t.bind_all(event, lambda _, _command=command: w.interpret(_command))

4
joy/gui/mousebindings.py
View File

@ -104,8 +104,8 @@ class MouseBindingsMixin:
self.dothis = self.cancel self.dothis = self.cancel
else: else:
#left-middle-interclick - cut selection to stack #left-middle-interclick - copy selection to stack
self.dothis = self.cut self.dothis = self.copy_selection_to_stack
elif self.B3_DOWN : elif self.B3_DOWN :
self.unhighlight_command() self.unhighlight_command()