diff --git a/debian/changelog b/debian/changelog index 0061703e..12ad3676 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ byobu (4.48) unreleased; urgency=low - recommend run-one, MIR pending - use run-this-one to ensure that more than one apt-check doesn't get run simultaneously + * usr/bin/byobu-status, usr/lib/byobu/include/constants, + usr/lib/byobu/include/shutil, usr/share/byobu/profiles/tmux, + usr/share/byobu/profiles/tmuxrc: + - add background/foreground/accent/highlight configurability + for tmux profiles -- Dustin Kirkland Wed, 09 Nov 2011 17:54:11 -0600 diff --git a/usr/bin/byobu-status b/usr/bin/byobu-status index 8440350d..f4f3fc89 100755 --- a/usr/bin/byobu-status +++ b/usr/bin/byobu-status @@ -29,7 +29,7 @@ PKG="byobu" mkdir -p "$BYOBU_RUN_DIR/status.$BYOBU_BACKEND" "$BYOBU_RUN_DIR/.last.$BYOBU_BACKEND" # Source configurations -for i in "${BYOBU_PREFIX}/share/$PKG/status/status" "${BYOBU_PREFIX}/share/$PKG/status/statusrc" "$BYOBU_CONFIG_DIR/status" "$BYOBU_CONFIG_DIR/statusrc" "$BYOBU_CONFIG_DIR/color"; do +for i in "${BYOBU_PREFIX}/share/$PKG/status/status" "${BYOBU_PREFIX}/share/$PKG/status/statusrc" "$BYOBU_CONFIG_DIR/status" "$BYOBU_CONFIG_DIR/statusrc" "$BYOBU_CONFIG_DIR/color" "$BYOBU_CONFIG_DIR/color.tmux"; do [ -r "$i" ] && . "$i" done diff --git a/usr/lib/byobu/include/constants b/usr/lib/byobu/include/constants index 26fa2e04..9c6f8571 100755 --- a/usr/lib/byobu/include/constants +++ b/usr/lib/byobu/include/constants @@ -97,3 +97,9 @@ esac command -v gsed >/dev/null 2>&1 && export SED="gsed" || export SED="sed" command -v greadlink >/dev/null 2>&1 && export READLINK="greadlink" || export READLINK="readlink" command -v sensible-pager >/dev/null 2>&1 && export BYOBU_PAGER="sensible-pager" || export BYOBU_PAGER="less" + +# Default colors +[ -n "$BYOBU_DARK" ] || export BYOBU_DARK="black" +[ -n "$BYOBU_LIGHT" ] || export BYOBU_LIGHT="white" +[ -n "$BYOBU_ACCENT" ] || export BYOBU_ACCENT="magenta" +[ -n "$BYOBU_HIGHLIGHT" ] || export BYOBU_HIGHLIGHT="red" diff --git a/usr/lib/byobu/include/shutil b/usr/lib/byobu/include/shutil index 799f13cc..b43f4368 100755 --- a/usr/lib/byobu/include/shutil +++ b/usr/lib/byobu/include/shutil @@ -91,11 +91,11 @@ color_tmux() { local back fore attr case "$1" in "") return 0 ;; - -) printf "#[default]" ;; - --) printf "#[default] " ;; + -) printf "#[fg=$BYOBU_LIGHT,bg=$BYOBU_DARK]" ;; + --) printf "#[fg=$BYOBU_LIGHT,bg=$BYOBU_DARK] " ;; esc) printf "" ;; bold*) printf "#[fg=bold]" ;; - none) printf "#[default]" ;; + none) printf "#[fg=$BYOBU_LIGHT,bg=$BYOBU_DARK]" ;; invert) printf "#[reverse]" ;; *) if [ "$#" = "2" ]; then diff --git a/usr/share/byobu/profiles/tmux b/usr/share/byobu/profiles/tmux index 6bc50ca7..a9bed72c 100644 --- a/usr/share/byobu/profiles/tmux +++ b/usr/share/byobu/profiles/tmux @@ -38,27 +38,27 @@ source $BYOBU_PREFIX/share/byobu/keybindings/f-keys.tmux set-option -g set-titles on set-option -g set-titles-string '#(whoami)@#H - byobu (#S)' -set-option -g pane-active-border-bg magenta -set-option -g pane-active-border-fg magenta -set-option -g pane-border-fg white +set-option -g pane-active-border-bg $BYOBU_ACCENT +set-option -g pane-active-border-fg $BYOBU_ACCENT +set-option -g pane-border-fg $BYOBU_LIGHT set-option -g history-limit 10000 set-option -g display-panes-time 150 -set-option -g display-panes-colour magenta -set-option -g display-panes-active-colour red -set-option -g clock-mode-colour magenta +set-option -g display-panes-colour $BYOBU_ACCENT +set-option -g display-panes-active-colour $BYOBU_HIGHLIGHT +set-option -g clock-mode-colour $BYOBU_ACCENT set-option -g clock-mode-style 24 set-option -g mode-keys vi -set-option -g mode-bg magenta -set-option -g mode-fg white +set-option -g mode-bg $BYOBU_ACCENT +set-option -g mode-fg $BYOBU_LIGHT set-window-option -g window-status-attr default -set-window-option -g window-status-bg black -set-window-option -g window-status-fg white -set-window-option -g window-status-current-attr default -set-window-option -g window-status-current-bg white -set-window-option -g window-status-current-fg black -set-window-option -g window-status-alert-bg black -set-window-option -g window-status-alert-fg white +set-window-option -g window-status-bg $BYOBU_DARK +set-window-option -g window-status-fg $BYOBU_LIGHT +set-window-option -g window-status-current-attr reverse +set-window-option -g window-status-current-bg $BYOBU_DARK +set-window-option -g window-status-current-fg $BYOBU_LIGHT +set-window-option -g window-status-alert-bg $BYOBU_DARK +set-window-option -g window-status-alert-fg $BYOBU_LIGHT set-window-option -g window-status-alert-attr bold set-window-option -g automatic-rename on set-window-option -g aggressive-resize on @@ -69,16 +69,16 @@ set-window-option -g monitor-activity on # BUG: Should *not* hardcode /bin/bash here set -g default-terminal "screen-256color" set -g terminal-overrides 'xterm*:smcup@:rmcup@' -set -g default-command /bin/bash -set -g status-bg black -set -g status-fg white +set -g default-command $SHELL +set -g status-bg $BYOBU_DARK +set -g status-fg $BYOBU_LIGHT set -g status-interval 1 set -g status-left-length 256 set -g status-right-length 256 set -g status-left '#(byobu-status tmux_left)[' set -g status-right ']#(byobu-status tmux_right)' -set -g message-bg magenta -set -g message-fg white +set -g message-bg $BYOBU_ACCENT +set -g message-fg $BYOBU_LIGHT # Allow local overrides source $BYOBU_CONFIG_DIR/.tmux.conf diff --git a/usr/share/byobu/profiles/tmuxrc b/usr/share/byobu/profiles/tmuxrc index 2cd6f722..d502ffe8 100644 --- a/usr/share/byobu/profiles/tmuxrc +++ b/usr/share/byobu/profiles/tmuxrc @@ -22,5 +22,6 @@ # along with this program. If not, see . ############################################################################### +source-file $HOME/.byobu/color.tmux source-file $BYOBU_CONFIG_DIR/profile.tmux source-file $HOME/.byoburc.tmux