KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow ignoring failures when mapping remote control commands

Browse Source
This commit is contained in:
Kovid Goyal 2022-08-24 14:21:54 +05:30
parent 664dd29970
commit b5fa643c5d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/remote-control.rst
View File

@ -276,6 +276,12 @@ Then pressing the :kbd:`F1` key will set the active window margins to
:code:`30`. The syntax for what follows :ac:`remote_control` is exactly the same :code:`30`. The syntax for what follows :ac:`remote_control` is exactly the same
as the syntax for what follows :code:`kitty @` above. as the syntax for what follows :code:`kitty @` above.
If you wish to ignore errors from the command, prefix the command with an
``!``. For example, the following will not return an error when no windows
are matched::
map f1 !focus-window --match XXXXXX
.. note:: You do not need :opt:`allow_remote_control` to use these mappings, .. note:: You do not need :opt:`allow_remote_control` to use these mappings,
as they are not actual remote programs, but are simply a way to resuse the as they are not actual remote programs, but are simply a way to resuse the
remote control infrastructure via keybings. remote control infrastructure via keybings.

13
kitty/boss.py
View File

@ -578,8 +578,13 @@ class Boss:
PayloadGetter, command_for_name, parse_subcommand_cli PayloadGetter, command_for_name, parse_subcommand_cli
) )
from .remote_control import parse_rc_args from .remote_control import parse_rc_args
aa = list(args)
silent = False
if aa and aa[0].startswith('!'):
aa[0] = aa[0][1:]
silent = True
try: try:
global_opts, items = parse_rc_args(['@'] + list(args)) global_opts, items = parse_rc_args(['@'] + aa)
if not items: if not items:
return None return None
cmd = items[0] cmd = items[0]
@ -589,11 +594,17 @@ class Boss:
except SystemExit as e: except SystemExit as e:
raise Exception(str(e)) from e raise Exception(str(e)) from e
import types import types
try:
if isinstance(payload, types.GeneratorType): if isinstance(payload, types.GeneratorType):
for x in payload: for x in payload:
c.response_from_kitty(self, active_window, PayloadGetter(c, x if isinstance(x, dict) else {})) c.response_from_kitty(self, active_window, PayloadGetter(c, x if isinstance(x, dict) else {}))
return None return None
return c.response_from_kitty(self, active_window, PayloadGetter(c, payload if isinstance(payload, dict) else {})) return c.response_from_kitty(self, active_window, PayloadGetter(c, payload if isinstance(payload, dict) else {}))
except Exception as e:
if silent:
log_error(f'Failed to run remote_control mapping: {aa} with error: {e}')
return None
raise
def peer_message_received(self, msg_bytes: bytes, peer_id: int) -> Union[bytes, bool, None]: def peer_message_received(self, msg_bytes: bytes, peer_id: int) -> Union[bytes, bool, None]:
cmd_prefix = b'\x1bP@kitty-cmd' cmd_prefix = b'\x1bP@kitty-cmd'