Add support for non-UTF-8 encodings in caller's locale.
This commit is contained in:
parent
3a18c33f17
commit
702ff1ca91
@ -55,31 +55,54 @@ preexec_functions+=(omz_termsupport_preexec)
|
|||||||
|
|
||||||
# Keep Apple Terminal.app's current working directory updated
|
# Keep Apple Terminal.app's current working directory updated
|
||||||
# Based on this answer: http://superuser.com/a/315029
|
# Based on this answer: http://superuser.com/a/315029
|
||||||
|
# With extra fixes to handle multibyte chars and non-UTF-8 locales
|
||||||
|
|
||||||
if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
|
if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
|
||||||
|
|
||||||
|
# URL-encodes a string
|
||||||
|
# Outputs the encoded string on stdout
|
||||||
|
# Returns nonzero if encoding failed
|
||||||
|
function _omz_urlencode() {
|
||||||
|
local url_str=''
|
||||||
|
{
|
||||||
|
local str=$1
|
||||||
|
|
||||||
|
# URLs must use UTF-8 encoding; convert if required
|
||||||
|
local encoding=${LC_CTYPE/*./}
|
||||||
|
if [[ $encoding != UTF-8 ]]; then
|
||||||
|
str=$(iconv -f $encoding -t UTF-8)
|
||||||
|
if [[ $? != 0 ]]; then
|
||||||
|
echo "Error converting string from $encoding to UTF-8" >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Use LC_CTYPE=C to process text byte-by-byte
|
||||||
|
local i ch hexch LC_CTYPE=C
|
||||||
|
for ((i = 1; i <= ${#str}; ++i)); do
|
||||||
|
ch="$str[i]"
|
||||||
|
if [[ "$ch" =~ [/._~A-Za-z0-9-] ]]; then
|
||||||
|
url_str+="$ch"
|
||||||
|
else
|
||||||
|
hexch=$(printf "%02X" "'$ch")
|
||||||
|
url_str+="%$hexch"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
echo $url_str
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
# Emits the control sequence to notify Terminal.app of the cwd
|
# Emits the control sequence to notify Terminal.app of the cwd
|
||||||
function update_terminalapp_cwd() {
|
function update_terminalapp_cwd() {
|
||||||
# Identify the directory using a "file:" scheme URL, including
|
# Identify the directory using a "file:" scheme URL, including
|
||||||
# the host name to disambiguate local vs. remote paths.
|
# the host name to disambiguate local vs. remote paths.
|
||||||
|
|
||||||
# Percent-encode the pathname.
|
# Percent-encode the pathname.
|
||||||
local URL_PATH=''
|
local URL_PATH=$(_omz_urlencode $PWD)
|
||||||
{
|
[[ $? != 0 ]] && return 1
|
||||||
# Use LC_CTYPE=C to process text byte-by-byte.
|
|
||||||
local i ch hexch LC_CTYPE=C
|
|
||||||
for ((i = 1; i <= ${#PWD}; ++i)); do
|
|
||||||
ch="$PWD[i]"
|
|
||||||
if [[ "$ch" =~ [/._~A-Za-z0-9-] ]]; then
|
|
||||||
URL_PATH+="$ch"
|
|
||||||
else
|
|
||||||
hexch=$(printf "%02X" "'$ch")
|
|
||||||
URL_PATH+="%$hexch"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
local PWD_URL="file://$HOST$URL_PATH"
|
local PWD_URL="file://$HOST$URL_PATH"
|
||||||
printf '\e]7;%s\a' "$PWD_URL"
|
# Undocumented Terminal.app-specific control sequence
|
||||||
|
printf '\e]7;%s\a' $PWD_URL
|
||||||
}
|
}
|
||||||
|
|
||||||
# Use a precmd hook instead of a chpwd hook to avoid contaminating output
|
# Use a precmd hook instead of a chpwd hook to avoid contaminating output
|
||||||
|
Loading…
Reference in New Issue
Block a user