mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 22:28:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow defining aliases for more general actions, not just kittens

Browse Source 
Fixes #4260
This commit is contained in:
Kovid Goyal
2021-11-22 19:52:43 +05:30
parent 727c69ffdd
commit aa4fa4cc85
16 changed files with 370 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kitty_tests/__init__.py
View File

@@ -69,11 +69,12 @@ class Callbacks:
def on_mouse_event(self, event):
ev = MouseEvent(**event)
action = self.opts.mousemap.get(ev)
if action is None:
actions = self.opts.mousemap.get(ev)
if not actions:
return False
self.current_mouse_button = ev.button
getattr(self, action.func)(*action.args)
for action in actions:
getattr(self, action.func)(*action.args)
self.current_mouse_button = 0
return True
@@ -115,8 +116,8 @@ class BaseTest(TestCase):
if options:
final_options.update(options)
options = Options(merge_result_dicts(defaults._asdict(), final_options))
finalize_keys(options)
finalize_mouse_mappings(options)
finalize_keys(options, {})
finalize_mouse_mappings(options, {})
set_options(options)
return options

17
kitty_tests/options.py
View File

@@ -31,9 +31,10 @@ class TestConfParsing(BaseTest):
return ans
def keys_for_func(opts, name):
for key, action in opts.keymap.items():
if action.func == name:
yield key
for key, actions in opts.keymap.items():
for action in actions:
if action.func == name:
yield key
opts = p('font_size 11.37', 'clear_all_shortcuts y', 'color23 red')
self.ae(opts.font_size, 11.37)
@@ -51,8 +52,16 @@ class TestConfParsing(BaseTest):
self.ae(opts.pointer_shape_when_grabbed, defaults.pointer_shape_when_grabbed)
opts = p('env A=1', 'env B=x$A', 'env C=', 'env D', 'clear_all_shortcuts y', 'kitten_alias a b --moo', 'map f1 kitten a')
self.ae(opts.env, {'A': '1', 'B': 'x1', 'C': '', 'D': DELETE_ENV_VAR})
ka = tuple(opts.keymap.values())[0]
ka = tuple(opts.keymap.values())[0][0]
self.ae(ka.func, 'kitten')
self.ae(ka.args, ('b', '--moo'))
opts = p('clear_all_shortcuts y', 'action_alias la launch --moo', 'map f1 la')
ka = tuple(opts.keymap.values())[0][0]
self.ae(ka.func, 'launch')
self.ae(ka.args, ('--moo',))
opts = p('clear_all_shortcuts y', 'action_alias la launch --moo', 'map f1 combine : new_window : la ')
ka = tuple(opts.keymap.values())[0]
self.ae((ka[0].func, ka[1].func), ('new_window', 'launch'))
opts = p('kitty_mod alt')
self.ae(opts.kitty_mod, to_modifiers('alt'))
self.ae(next(keys_for_func(opts, 'next_layout')).mods, opts.kitty_mod)