[Funcs] more termcaps cleanup, more beautiful fallback

3 files changed, 25 insertions, 25 deletions

diff --git a/01_Functions.zsh b/01_Functions.zsh
index d942dab..0351b9e 100644
--- a/01_Functions.zsh
+++ b/01_Functions.zsh
@@ -102,15 +102,15 @@ preprint()
 	hbar=$T_
 	for i in {1..$((74 - ${#1} - 5))}
 	do
-		hbar=${hbar}$_t_q
+		hbar=${hbar}$_tq_
 	done
 	hbar=${hbar}$_T
 
 	if [ "$1" != "" ]
 	then
-		print -Pn "${C_}$my_color;1${_C}${hbar}$T_$_t_u$_T${C_}0;$my_color${_C} $1 ${C_}0;$my_color;1${_C}$T_$_t_t$_t_q$_T\r${C_}0${_C}"
+		print -Pn "${C_}$my_color;1${_C}${hbar}$T_$_tj_$_T${C_}0;$my_color${_C} $1 ${C_}0;$my_color;1${_C}$T_$_tm_$_tq_$_T\r${C_}0${_C}"
 	else
-		print -Pn "${C_}$my_color;1${_C}${hbar}$T_$_t_q$_t_q$_t_q$_t_q$_t_q$_T${C_}0${_C}"
+		print -Pn "${C_}$my_color;1${_C}${hbar}$T_$_tq_$_tq_$_tq_$_tq_$_tq_$_T${C_}0${_C}"
 	fi
 }
 
diff --git a/10_Environment.zsh b/10_Environment.zsh
index 1584c57..8ecc892 100644
--- a/10_Environment.zsh
+++ b/10_Environment.zsh
@@ -30,14 +30,14 @@ unset has_termcaps
 [ $TERM = "rxvt-unicode" -o $TERM = "screen" ] && has_termcaps="true"
 T_=${has_termcaps:+$termcap[as]}
 _T=${has_termcaps:+$termcap[ae]}
-_t_q=${${has_termcaps:+q}:--}
-_t_j=${${has_termcaps:+j}:-[}
-_t_k=${${has_termcaps:+k}:-[}
-_t_l=${${has_termcaps:+l}:-]}
-_t_m=${${has_termcaps:+m}:-]}
-_t_t=${${has_termcaps:+t}:-]}
-_t_u=${${has_termcaps:+u}:-[}
-_t_x=${${has_termcaps:+x}:-|}
+_tq_=${${has_termcaps:+"q"}:-"-"}
+_tj_=${${has_termcaps:+"j"}:-"'"}
+_tk_=${${has_termcaps:+"k"}:-"."}
+_tl_=${${has_termcaps:+"l"}:-","}
+_tm_=${${has_termcaps:+"m"}:-"\`"}
+_tt_=${${has_termcaps:+"t"}:-"]"}
+_tu_=${${has_termcaps:+"u"}:-"["}
+_tx_=${${has_termcaps:+"x"}:-"|"}
 
 # I hate kik00l0l colorized prompts, so I'm using a way to
 # give a dominant color for each part of the prompt, each of
diff --git a/12_Prompts.zsh b/12_Prompts.zsh
index 418e316..855fcbd 100644
--- a/12_Prompts.zsh
+++ b/12_Prompts.zsh
@@ -51,7 +51,7 @@ preexec ()
 	HBAR=$T_
 	for h in {1..$spaceleft}
 	do
-		HBAR=${HBAR}$_t_q
+		HBAR=${HBAR}$_tq_
 	done
 	HBAR=$HBAR$_T
 	redefine_prompt
@@ -67,12 +67,12 @@ preexec ()
 
 set_prompt_date()
 {
-	begin=${${1:+$_t_j}:-$_t_k}
-	end=${${1:+$_t_m}:-$_t_l}
+	begin=${${1:+$_tj_}:-$_tk_}
+	end=${${1:+$_tm_}:-$_tl_}
 
 	# Date
 	[ "$DEBUG" = "yes" ] && echo -n "	Date..."
-	DATE=$C_$prompt_colors[braces]$_C$T_"${begin}"$_T" "$C_$prompt_colors[date]$_C"%D{%a-%d-%b-%Y %H:%M:%S}"$C_$prompt_colors[braces]$_C" "$C_$prompt_colors[bar]$_C$T_"${end}$_t_q"$_T
+	DATE=$C_$prompt_colors[braces]$_C$T_"${begin}"$_T" "$C_$prompt_colors[date]$_C"%D{%a-%d-%b-%Y %H:%M:%S}"$C_$prompt_colors[braces]$_C" "$C_$prompt_colors[bar]$_C$T_"${end}$_tq_"$_T
 	DATEEXPAND=$(expand_text "$DATE")
 	DATESIZE=${#DATEEXPAND}
 	[ "$DEBUG" = "yes" ] && echo
@@ -83,7 +83,7 @@ update_prompt_elements()
 	# Error
 	[ "$DEBUG" = "yes" ] && echo -n "	Error code..."
 	ERRORSIZE=${#error}
-	ERROR="%(?;;"$C_$prompt_colors[bar]$_C$T_"$_t_q"$_T$C_$prompt_colors[error]$_C"%?)"
+	ERROR="%(?;;"$C_$prompt_colors[bar]$_C$T_"$_tq_"$_T$C_$prompt_colors[error]$_C"%?)"
 	[ "$DEBUG" = "yes" ] && echo
 
 	[ "$DEBUG" = "yes" ] && echo -n "	Term title..."
@@ -148,7 +148,7 @@ update_prompt_elements()
 			AGENTS=$AGENTS$C_$agent_colors[$AGENTCOLOR]$_C${GPG_AGENT_RUNNING:-$( [ $_is_multibyte_compliant ] && echo "⚡" || echo "G" )}
 		fi
 	fi
-	AGENTS=${AGENTS:+$C_$prompt_colors[bar]$_C$T_"$_t_q"$_T$AGENTS}
+	AGENTS=${AGENTS:+$C_$prompt_colors[bar]$_C$T_"$_tq_"$_T$AGENTS}
 	AGENTSSIZE=$(expand_text $AGENTS)
 	AGENTSSIZE=$#AGENTSSIZE
 	[ "$DEBUG" = "yes" ] && echo
@@ -196,7 +196,7 @@ update_prompt_elements()
 				battery[color]="uncharging"
 			fi
 		fi
-		BATTERY=$C_$prompt_colors[bar]$_C$T_"$_t_q"$_T$C_$battery_colors[$battery[color]]$_C"$battery[remains]"
+		BATTERY=$C_$prompt_colors[bar]$_C$T_"$_tq_"$_T$C_$battery_colors[$battery[color]]$_C"$battery[remains]"
 		unset battery
 
 		[ "$DEBUG" = "yes" ] && echo
@@ -212,7 +212,7 @@ update_prompt_elements()
 	HBAR=$T_
 	for h in {1..$spaceleft}
 	do
-		HBAR=$HBAR"$_t_q"
+		HBAR=$HBAR"$_tq_"
 	done
 	HBAR=$HBAR$_T
 	[ "$DEBUG" = "yes" ] && echo
@@ -343,21 +343,21 @@ then
 	echo -n $c_$prompt_colors[warning]$_c
 	#toilet -f bigmono9 "D1rTY Zsh.."
 
-	HBAR=$(for i in {1..13} ; echo -n $_t_q)
-	VBAR=$T_$_t_x$_T
+	HBAR=$(for i in {1..13} ; echo -n - "$_tq_")
+	VBAR=$T_$_tx_$_T
 
 	echo -n "	"
-	echo -n $T_$_t_l
+	echo -n $T_$_tl_
 	echo -n $HBAR
-	echo -n $_t_k$_T
+	echo -n $_tk_$_T
 	echo
 	echo "	$VBAR WARNING !!  $VBAR"
 	echo "	$VBAR D1rTY Zsh.. $VBAR"
 
 	echo -n "	"
-	echo -n $T_$_t_m
+	echo -n $T_$_tm_
 	echo -n $HBAR
-	echo -n $_t_j$_T
+	echo -n $_tj_$_T
 	echo
 	echo $c_$prompt_colors[none]$_c
 fi