mirror of
https://github.com/kovidgoyal/kitty.git
synced 2024-09-11 14:45:31 +03:00
More efficient encoding for cmdline in the prompt marking escape code
This commit is contained in:
parent
1e528fd299
commit
219e53826b
@ -458,10 +458,10 @@ to control its behavior, separated by semi-colons. They are::
|
||||
|
||||
kitty also optionally supports sending the cmdline going to be executed with ``<OSC>133;C`` as::
|
||||
|
||||
<OSC>133;C;cmdline=cmdline as space separated hex encoded text<ST>
|
||||
<OSC>133;C;cmdline=cmdline encoded by %q<ST>
|
||||
or
|
||||
<OSC>133;C;cmdline_url=cmdline as UTF-8 URL escaped text<ST>
|
||||
<OSC>133;C;cmdline_url=cmdline as UTF-8 URL %-escaped text<ST>
|
||||
|
||||
|
||||
Here, *space separated hex encoded text* means every unicode codepoint of the
|
||||
command line is encoded as 2-8 hex digits separated by spaces.
|
||||
Here, *encoded by %q* means the encoding produced by the %q format to printf in
|
||||
bash and similar shells.
|
||||
|
@ -115,6 +115,7 @@
|
||||
sanitize_for_bracketed_paste,
|
||||
sanitize_title,
|
||||
sanitize_url_for_dispay_to_user,
|
||||
shlex_split,
|
||||
)
|
||||
|
||||
MatchPatternType = Union[Pattern[str], Tuple[Pattern[str], Optional[Pattern[str]]]]
|
||||
@ -220,7 +221,7 @@ def compile_match_query(exp: str, is_simple: bool = True) -> MatchPatternType:
|
||||
def decode_cmdline(x: str) -> str:
|
||||
ctype, sep, val = x.partition('=')
|
||||
if ctype == 'cmdline':
|
||||
return ''.join(chr(int(x, 16)) for x in val.split())
|
||||
return next(shlex_split(val, True))
|
||||
if ctype == 'cmdline_url':
|
||||
from urllib.parse import unquote
|
||||
return unquote(val)
|
||||
|
@ -15,6 +15,7 @@
|
||||
from contextlib import contextmanager
|
||||
from functools import wraps
|
||||
from pty import CHILD, STDIN_FILENO, STDOUT_FILENO, fork
|
||||
from typing import Optional
|
||||
from unittest import TestCase
|
||||
|
||||
from kitty.config import finalize_keys, finalize_mouse_mappings
|
||||
@ -64,7 +65,7 @@ def set_color_table_color(self, code, data='') -> None:
|
||||
def color_profile_popped(self, x) -> None:
|
||||
pass
|
||||
|
||||
def cmd_output_marking(self, is_start: bool) -> None:
|
||||
def cmd_output_marking(self, is_start: Optional[bool], data: str = '') -> None:
|
||||
pass
|
||||
|
||||
def request_capabilities(self, q) -> None:
|
||||
|
@ -204,9 +204,7 @@ _ksi_main() {
|
||||
builtin printf "\e]2;%s%s\a" "${_ksi_prompt[hostname_prefix]@P}" "${_ksi_prompt[last_cmd]//[[:cntrl:]]}" # remove any control characters
|
||||
fi
|
||||
if [[ "${_ksi_prompt[mark]}" == "y" ]]; then
|
||||
builtin printf "\e]133;C;cmdline="
|
||||
for (( i=0; i<${#last_cmd}; i++ )); do builtin printf '%x ' "'${last_cmd:$i:1}"; done
|
||||
builtin printf "\a"
|
||||
builtin printf "\e]133;C;cmdline=%q\a" "$last_cmd"
|
||||
fi
|
||||
}
|
||||
if [[ "${_ksi_prompt[title]}" == "y" || "${_ksi_prompt[mark]}" ]]; then _ksi_prompt[ps0]+='$(_ksi_get_current_command)'; fi
|
||||
|
@ -215,9 +215,7 @@ _ksi_deferred_init() {
|
||||
# its preexec hook before us, we'll incorrectly mark its output as
|
||||
# belonging to the command (as if the user typed it into zle) rather
|
||||
# than command output.
|
||||
builtin print -nu "$_ksi_fd" '\e]133;C;cmdline='
|
||||
for (( i=0; i<${#1}; i++ )); do builtin print -nu "$_ksi_fd" -f '%x ' "'${1:$i:1}"; done
|
||||
builtin print -nu "$_ksi_fd" '\a'
|
||||
builtin print -nu "$_ksi_fd" -f '\e]133;C;cmdline=%q\a' "$1"
|
||||
(( _ksi_state = 1 ))
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user