Merge pull request #362 from izzygomez/izzygomez/fix-powerline-window-status

Fix tmux-powerline window status elements rendering & updating.

Author: erikw

AUTHORS

@@ -42,3 +42,4 @@ Drew Daniels <[email protected]>
 Danfeng Shan <[email protected]>
 Abraham Nuñez <[email protected]>
 Gavin Kondrath <[email protected]>
+Izzy Gomez <[email protected]>

README.md

@@ -220,17 +220,6 @@ tmux source-file ~/.tmux.conf
 ### Multiple lines in bash or no powerline in zsh using iTerm (macOS)
 If your tmux looks like [this](https://github.com/erikw/tmux-powerline/issues/125) then you may have to in iTerm uncheck [Unicode East Asian Ambiguous characters are wide] in Preferences -> Settings -> Advanced.
 
-
-### Changing the theme variables does not have effect
-After changing the theme's settings e.g.
-* `TMUX_POWERLINE_DEFAULT_*GROUND_COLOR`
-* `TMUX_POWERLINE_WINDOW_STATUS_FORMAT`
-* etc.
-
-nothing happens.
-
-This is a known issue, see #322 & #336 for details. Workaround: reload the theme change by creating a new tmux session.
-
 # Hacking
 This project can only gain positively from contributions. Fork today and make your own enhancements and segments to share back! If you'd like, add your name and E-mail to AUTHORS before making a pull request so you can get some credit for your work :-)
 

config/defaults.sh

@@ -11,5 +11,7 @@ export TMUX_POWERLINE_STATUS_JUSTIFICATION_DEFAULT="centre"
 export TMUX_POWERLINE_STATUS_LEFT_LENGTH_DEFAULT=60
 export TMUX_POWERLINE_STATUS_RIGHT_LENGTH_DEFAULT=90
 
+export TMUX_POWERLINE_WINDOW_STATUS_SEPARATOR_DEFAULT=""
+
 export TMUX_POWERLINE_MUTE_LEFT_KEYBINDING_DEFAULT=
 export TMUX_POWERLINE_MUTE_RIGHT_KEYBINDING_DEFAULT=

lib/arg_processing.sh

@@ -1,9 +1,9 @@
 #! Check script arguments.
 
-check_arg_side() {
-	local side="$1"
-	if ! [[ "$side" ==  "left" || "$side" == "right" || "$side" == "init" ]]; then
-		echo "Argument must be the side to handle {left, right} or {init} and not \"${side}\"."
+check_arg_segment() {
+	local segment="$1"
+	if ! [[ "$segment" ==  "left" || "$segment" == "right" || "$segment" == "window-current-format" || "$segment" == "window-format" ]]; then
+		echo "Argument must be the side to handle {left, right}, or {window-current-format, window-format}, not \"${segment}\"."
     	exit 1
 	fi
 }

lib/config_file.sh

@@ -35,6 +35,10 @@ process_settings() {
 		export TMUX_POWERLINE_STATUS_RIGHT_LENGTH="${TMUX_POWERLINE_STATUS_RIGHT_LENGTH_DEFAULT}"
 	fi
 
+	if [ -z "$TMUX_POWERLINE_WINDOW_STATUS_SEPARATOR" ]; then
+		export TMUX_POWERLINE_WINDOW_STATUS_SEPARATOR="${TMUX_POWERLINE_WINDOW_STATUS_SEPARATOR_DEFAULT}"
+	fi
+
 	if [ -z "$TMUX_POWERLINE_MUTE_LEFT_KEYBINDING" ]; then
 		export TMUX_POWERLINE_MUTE_LEFT_KEYBINDING="${TMUX_POWERLINE_MUTE_LEFT_KEYBINDING_DEFAULT}"
 	fi
@@ -51,6 +55,18 @@ process_settings() {
 		source "${TMUX_POWERLINE_DIR_THEMES}/${TMUX_POWERLINE_THEME}.sh"
 	fi
 
+	# Set the default status bar colors to the theme's default colors. This section is here because it needs to be after the theme is sourced.
+	if [ -z "$TMUX_POWERLINE_STATUS_STYLE" ]; then
+		local bg_color
+		local fg_color
+
+		fg_color=$(__normalize_color "$TMUX_POWERLINE_DEFAULT_FOREGROUND_COLOR")
+		bg_color=$(__normalize_color "$TMUX_POWERLINE_DEFAULT_BACKGROUND_COLOR")
+
+		export TMUX_POWERLINE_STATUS_STYLE="fg=$fg_color,bg=$bg_color"
+	fi
+
+
 }
 
 generate_default_config() {
@@ -87,6 +103,9 @@ generate_default_config() {
 	# The maximum length of the right status bar.
 	export TMUX_POWERLINE_STATUS_RIGHT_LENGTH="${TMUX_POWERLINE_STATUS_RIGHT_LENGTH_DEFAULT}"
 
+	# The separator to use between windows on the status bar.
+	export TMUX_POWERLINE_WINDOW_STATUS_SEPARATOR=""
+
 	# Uncomment these if you want to enable tmux bindings for muting (hiding) one of the status bars.
 	# E.g. this example binding would mute the left status bar when pressing <prefix> followed by Ctrl-[
 	#export TMUX_POWERLINE_MUTE_LEFT_KEYBINDING="C-["

lib/powerline.sh

@@ -1,6 +1,6 @@
 # Library functions
 
-print_powerline() {
+print_powerline_side() {
 	local side="$1"
 	local upper_side
 
@@ -18,28 +18,7 @@ print_powerline() {
 	__process_powerline
 }
 
-format() {
-	local type="$1"
-	local bg_color
-	local fg_color
-
-	bg_color=$(__normalize_color "$TMUX_POWERLINE_DEFAULT_BACKGROUND_COLOR")
-	fg_color=$(__normalize_color "$TMUX_POWERLINE_DEFAULT_FOREGROUND_COLOR")
-
-	case $type in
-		inverse)
-			echo "fg=$bg_color,bg=$fg_color,nobold,noitalics,nounderscore"
-			;;
-		regular)
-			echo "fg=$fg_color,bg=$bg_color,nobold,noitalics,nounderscore"
-			;;
-		*)
-			;;
-	esac
-}
-
-# Prettifies the window-status segments.
-init_powerline() {
+print_powerline_window_status_current_format() {
 	if [ -z "$TMUX_POWERLINE_WINDOW_STATUS_CURRENT" ]; then
 		TMUX_POWERLINE_WINDOW_STATUS_CURRENT=(
 			"#[$(format inverse)]" \
@@ -52,12 +31,10 @@ init_powerline() {
 		)
 	fi
 
-	if [ -z "$TMUX_POWERLINE_WINDOW_STATUS_STYLE" ]; then
-		TMUX_POWERLINE_WINDOW_STATUS_STYLE=(
-			"$(format regular)"
-		)
-	fi
+	printf '%s' "${TMUX_POWERLINE_WINDOW_STATUS_CURRENT[@]}"
+}
 
+print_powerline_window_status_format() {
 	if [ -z "$TMUX_POWERLINE_WINDOW_STATUS_FORMAT" ]; then
 		TMUX_POWERLINE_WINDOW_STATUS_FORMAT=(
 			"#[$(format regular)]" \
@@ -67,16 +44,27 @@ init_powerline() {
 		)
 	fi
 
+	printf '%s' "${TMUX_POWERLINE_WINDOW_STATUS_FORMAT[@]}"
+}
+
+format() {
+	local type="$1"
 	local bg_color
 	local fg_color
 
 	bg_color=$(__normalize_color "$TMUX_POWERLINE_DEFAULT_BACKGROUND_COLOR")
 	fg_color=$(__normalize_color "$TMUX_POWERLINE_DEFAULT_FOREGROUND_COLOR")
 
-	tmux set-option -g window-status-current-format "$(printf '%s' "${TMUX_POWERLINE_WINDOW_STATUS_CURRENT[@]}")"
-	tmux set-option -g window-status-format "$(printf '%s' "${TMUX_POWERLINE_WINDOW_STATUS_FORMAT[@]}")"
-	tmux set-option -g window-status-style "$(printf '%s' "${TMUX_POWERLINE_WINDOW_STATUS_STYLE[@]}")"
-	tmux set-option -g status-style "fg=$fg_color,bg=$bg_color"
+	case $type in
+		inverse)
+			echo "fg=$bg_color,bg=$fg_color,nobold,noitalics,nounderscore"
+			;;
+		regular)
+			echo "fg=$fg_color,bg=$bg_color,nobold,noitalics,nounderscore"
+			;;
+		*)
+			;;
+	esac
 }
 
 __process_segment_defaults() {

main.tmux

@@ -15,19 +15,22 @@ process_settings
 tmux set-option -g status "$TMUX_POWERLINE_STATUS_VISIBILITY"
 tmux set-option -g status-interval "$TMUX_POWERLINE_STATUS_INTERVAL"
 tmux set-option -g status-justify "$TMUX_POWERLINE_STATUS_JUSTIFICATION"
+tmux set-option -g status-style "$TMUX_POWERLINE_STATUS_STYLE"
 
 tmux set-option -g status-left-length $TMUX_POWERLINE_STATUS_LEFT_LENGTH
 tmux set-option -g status-right-length $TMUX_POWERLINE_STATUS_RIGHT_LENGTH
 
 tmux set-option -g status-left "#(${TMUX_POWERLINE_DIR_HOME}/powerline.sh left)"
 tmux set-option -g status-right "#(${TMUX_POWERLINE_DIR_HOME}/powerline.sh right)"
 
+tmux set-option -g window-status-current-format "#(${TMUX_POWERLINE_DIR_HOME}/powerline.sh window-current-format)"
+tmux set-option -g window-status-format "#(${TMUX_POWERLINE_DIR_HOME}/powerline.sh window-format)"
+tmux set-option -g window-status-separator "$TMUX_POWERLINE_WINDOW_STATUS_SEPARATOR"
+
 if [ -n "$TMUX_POWERLINE_MUTE_LEFT_KEYBINDING" ]; then
 	tmux bind "$TMUX_POWERLINE_MUTE_LEFT_KEYBINDING" run "$TMUX_POWERLINE_DIR_HOME/mute_powerline.sh left"
 fi
 
 if [ -n "$TMUX_POWERLINE_MUTE_RIGHT_KEYBINDING" ]; then
 	tmux bind "$TMUX_POWERLINE_MUTE_RIGHT_KEYBINDING" run "$TMUX_POWERLINE_DIR_HOME/mute_powerline.sh right"
 fi
-
-tmux set-hook -g session-created "run-shell '${TMUX_POWERLINE_DIR_HOME}/powerline.sh init'"

mute_powerline.sh

@@ -7,5 +7,5 @@ source "${TMUX_POWERLINE_DIR_LIB}/muting.sh"
 source "${TMUX_POWERLINE_DIR_LIB}/arg_processing.sh"
 
 side="$1"
-check_arg_side "$side"
+check_arg_segment "$side"
 toggle_powerline_mute_status "$side"

powerline.sh

@@ -6,11 +6,13 @@ source "${TMUX_POWERLINE_DIR_HOME}/lib/headers.sh"
 
 if ! powerline_muted "$1"; then
 	process_settings
-	check_arg_side "$1"
-	if [ $1 == "init" ]; then
-		init_powerline
+	check_arg_segment "$1"
+	if [ $1 == "window-current-format" ]; then
+		print_powerline_window_status_current_format
+	elif [ $1 == "window-format" ]; then
+		print_powerline_window_status_format
 	else
-		print_powerline "$1"
+		print_powerline_side "$1"
 	fi
 fi
 

themes/bubble.sh

@@ -57,14 +57,15 @@ TMUX_POWERLINE_SEPARATOR_RIGHT_BOLD=""
 TMUX_POWERLINE_SEPARATOR_RIGHT_THIN=""
 TMUX_POWERLINE_SEPARATOR_THIN="|"
 
+# See Color formatting section below for details on what colors can be used here.
 TMUX_POWERLINE_DEFAULT_BACKGROUND_COLOR=${TMUX_POWERLINE_DEFAULT_BACKGROUND_COLOR:-$thm_bg}
 TMUX_POWERLINE_DEFAULT_FOREGROUND_COLOR=${TMUX_POWERLINE_DEFAULT_FOREGROUND_COLOR:-$thm_fg}
 TMUX_POWERLINE_SEG_AIR_COLOR=$("${TMUX_POWERLINE_DIR_HOME}/segments/air_color.sh")
 
 TMUX_POWERLINE_DEFAULT_LEFTSIDE_SEPARATOR=${TMUX_POWERLINE_DEFAULT_LEFTSIDE_SEPARATOR:-$TMUX_POWERLINE_SEPARATOR_RIGHT_BOLD}
 TMUX_POWERLINE_DEFAULT_RIGHTSIDE_SEPARATOR=${TMUX_POWERLINE_DEFAULT_RIGHTSIDE_SEPARATOR:-$TMUX_POWERLINE_SEPARATOR_LEFT_BOLD}
 
-# See man tmux.conf for additional formatting options for the status line.
+# See `man tmux` for additional formatting options for the status line.
 # The `format regular` and `format inverse` functions are provided as conveinences
 
 if [ -z $TMUX_POWERLINE_WINDOW_STATUS_CURRENT ]; then
@@ -97,10 +98,12 @@ fi
 
 # Format: segment_name background_color foreground_color [non_default_separator] [separator_background_color] [separator_foreground_color] [spacing_disable] [separator_disable]
 #
-# * background_color and foreground_color. Formats:
-#   * Named colors (chech man page of tmux for complete list) e.g. black, red, green, yellow, blue, magenta, cyan, white
-#   * a hexadecimal RGB string e.g. #ffffff
-#   * 'default' for the defalt tmux color.
+# * background_color and foreground_color. Color formatting (see `man tmux` for complete list):
+#   * Named colors, e.g. black, red, green, yellow, blue, magenta, cyan, white
+#   * Hexadecimal RGB string e.g. #ffffff
+#   * 'default' for the default tmux color.
+#   * 'terminal' for the terminal's default background/foreground color
+#   * The numbers 0-255 for the 256-color palette. Run `tmux-powerline/color-palette.sh` to see the colors.
 # * non_default_separator - specify an alternative character for this segment's separator
 # * separator_background_color - specify a unique background color for the separator
 # * separator_foreground_color - specify a unique foreground color for the separator