11_terminal: Make axzsh_is_widechar_terminal() safer

[ax-zsh.git] / core / 11_terminal / 11_terminal.zshrc

diff --git a/core/11_terminal/11_terminal.zshrc b/core/11_terminal/11_terminal.zshrc
index cbd5ec36378e8c481b5c433e59f6bc0322da90c1..86974038b9a8644ffb54160a98a1d3537470cdda 100644 (file)
--- a/core/11_terminal/11_terminal.zshrc
+++ b/core/11_terminal/11_terminal.zshrc
@@ -21,6 +21,19 @@ function axzsh_is_utf_terminal {
 }
 alias isutfenv=axzsh_is_utf_terminal
 
+# Check if terminal supports "wide" characters.
+# <https://unix.stackexchange.com/questions/184345/detect-how-much-of-unicode-my-terminal-supports-even-through-screen>
+function axzsh_is_widechar_terminal {
+       [[ -t 1 ]] || return 1
+       axzsh_is_utf_terminal || return 1
+       echo -ne "🍀\033[6n"
+       read -s -d\[ garbage
+       read -s -d R pos
+       echo -ne "\033[1K\r"
+       [[ "${pos#*;}" -eq 2 ]] || return 1
+       return 0
+}
+
 # Test for "modern" terminal
 function axzsh_is_modern_terminal {
        [[ "$TERM" = screen* ]] && return 0
@@ -98,9 +111,11 @@ function axzsh_terminal_title_preexec {
 
        axzsh_terminal_set_icon_title "$cmd"
 
-       [[ -z "$remote" ]] \
-               && axzsh_terminal_set_window_title "$LOGNAME@$SHORT_HOST$TITLE_ADD" \
-               || axzsh_terminal_set_window_title "$1"
+       if [[ -z "$remote" ]]; then
+               axzsh_terminal_set_window_title "$LOGNAME@$SHORT_HOST$TITLE_ADD"
+       else
+               axzsh_terminal_set_window_title "$1"
+       fi
 }
 
 preexec_functions+=(axzsh_terminal_title_preexec)