feat(modules): extract common functionality between normal and selected window

This commit is contained in:
Valentin Uveges 2023-08-09 09:50:03 +03:00
parent 08c0aaa5b4
commit 480eebcb62
3 changed files with 71 additions and 86 deletions

View file

@ -3,8 +3,7 @@ show_window_current_format() {
local color="$thm_orange"
local background="$thm_bg"
local text
local window_format
local fill="$(get_tmux_option "@catppuccin_window_current_color_fill" "number")" # number, all, none
if [[ $window_format_style == "directory" ]]
then
@ -16,45 +15,7 @@ show_window_current_format() {
text="#W"
fi
if [[ $window_color_fill == "all" ]]
then
local show_left_separator="#[fg=$color,bg=$background,nobold,nounderscore,noitalics]$window_left_separator"
local show_icon="#[fg=$background,bg=$color]$icon"
local show_middle_separator="#[fg=$background,bg=$color,nobold,nounderscore,noitalics]$window_middle_separator"
local show_text="#[fg=$background,bg=$color]$text"
local show_right_separator="#[fg=$color,bg=$background]$window_right_separator"
local current_window_format=$( build_window_format "$icon" "$color" "$background" "$text" "$fill" )
fi
if [[ $window_color_fill == "number" ]]
then
local show_icon="#[fg=$background,bg=$color]$icon"
local show_middle_separator="#[fg=$color,bg=$background,nobold,nounderscore,noitalics]$window_middle_separator"
local show_text="#[fg=$thm_fg,bg=$background]$text"
if [[ $window_icon_position == "right" ]]
then
local show_left_separator="#[fg=$background,bg=$background,nobold,nounderscore,noitalics]$window_left_separator"
local show_right_separator="#[fg=$color,bg=$background]$window_right_separator"
fi
if [[ $window_icon_position == "left" ]]
then
local show_right_separator="#[fg=$background,bg=$background,nobold,nounderscore,noitalics]$window_right_separator"
local show_left_separator="#[fg=$color,bg=$background]$window_left_separator"
fi
fi
if [[ $window_icon_position == "right" ]]
then
window_format="$show_left_separator$show_text$show_middle_separator$show_icon$show_right_separator"
fi
if [[ $window_icon_position == "left" ]]
then
window_format="$show_left_separator$show_icon$show_middle_separator$show_text$show_right_separator"
fi
echo $window_format
echo "$current_window_format"
}

View file

@ -1,9 +1,9 @@
show_window_format() {
local icon="#I"
local color="$thm_blue"
local background="$thm_gray"
local text
local window_format
local fill="$(get_tmux_option "@catppuccin_window_color_fill" "number")" # number, all, none
if [[ $window_format_style == "directory" ]]
then
@ -14,46 +14,8 @@ show_window_format() {
then
text="#W"
fi
local current_window_format=$( build_window_format "$icon" "$color" "$background" "$text" "$fill")
if [[ $window_color_fill == "all" ]]
then
local show_left_separator="#[fg=$thm_gray,bg=$thm_bg,nobold,nounderscore,noitalics]$window_left_separator"
local show_icon="#[fg=$thm_fg,bg=$thm_gray]$icon"
local show_middle_separator="#[fg=$thm_fg,bg=$thm_gray,nobold,nounderscore,noitalics]$window_middle_separator"
local show_text="#[fg=$thm_fg,bg=$thm_gray]$text"
local show_right_separator="#[fg=$thm_gray,bg=$thm_bg]$window_right_separator"
fi
if [[ $window_color_fill == "number" ]]
then
local show_icon="#[fg=$thm_bg,bg=$color]$icon"
local show_middle_separator="#[fg=$color,bg=$thm_gray,nobold,nounderscore,noitalics]$window_middle_separator"
local show_text="#[fg=$thm_fg,bg=$thm_gray]$text"
if [[ $window_icon_position == "right" ]]
then
local show_left_separator="#[fg=$thm_gray,bg=$thm_bg,nobold,nounderscore,noitalics]$window_left_separator"
local show_right_separator="#[fg=$color,bg=$thm_bg]$window_right_separator"
fi
if [[ $window_icon_position == "left" ]]
then
local show_right_separator="#[fg=$thm_gray,bg=$thm_bg,nobold,nounderscore,noitalics]$window_right_separator"
local show_left_separator="#[fg=$color,bg=$thm_bg]$window_left_separator"
fi
fi
if [[ $window_icon_position == "right" ]]
then
window_format="$show_left_separator$show_text$show_middle_separator$show_icon$show_right_separator"
fi
if [[ $window_icon_position == "left" ]]
then
window_format="$show_left_separator$show_icon$show_middle_separator$show_text$show_right_separator"
fi
echo $window_format
echo "$current_window_format"
}