mirror of
https://github.com/dustinkirkland/byobu
synced 2025-08-22 14:24:39 -07:00
* profiles/common: monitor windows, showing "@" next to the window name,
but don't print an "Activity" message * byobu-select-profile: improve color selection with more informative color names and support screen default background/foreground colors, LP: #500669
This commit is contained in:
parent
b367cd3e10
commit
082b3d3b6a
3 changed files with 54 additions and 30 deletions
|
@ -26,7 +26,25 @@ PKG="byobu"
|
||||||
|
|
||||||
TEXTDOMAIN="$PKG"
|
TEXTDOMAIN="$PKG"
|
||||||
|
|
||||||
COLORS="black blue cyan green purple red grey yellow"
|
COLORS="default_light \
|
||||||
|
default_dark \
|
||||||
|
white \
|
||||||
|
black \
|
||||||
|
grey \
|
||||||
|
dark_grey \
|
||||||
|
light_grey \
|
||||||
|
blue \
|
||||||
|
light_blue \
|
||||||
|
cyan \
|
||||||
|
light_cyan \
|
||||||
|
green \
|
||||||
|
light_green \
|
||||||
|
purple \
|
||||||
|
light_purple \
|
||||||
|
red \
|
||||||
|
light_red \
|
||||||
|
yellow \
|
||||||
|
brown"
|
||||||
|
|
||||||
usage () {
|
usage () {
|
||||||
cat <<EOT
|
cat <<EOT
|
||||||
|
@ -63,8 +81,7 @@ assert_symlink "$HOME/.$PKG/profile"
|
||||||
listprofiles() {
|
listprofiles() {
|
||||||
# Display list of profiles, one per line
|
# Display list of profiles, one per line
|
||||||
for x in $COLORS; do
|
for x in $COLORS; do
|
||||||
echo "dark_$x"
|
echo "$x"
|
||||||
echo "light_$x"
|
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,10 +98,10 @@ prompt() {
|
||||||
echo
|
echo
|
||||||
if [ "$which" = "foreground" ]; then
|
if [ "$which" = "foreground" ]; then
|
||||||
echo `gettext 'Select the foreground color: '`
|
echo `gettext 'Select the foreground color: '`
|
||||||
simple="black"
|
simple="default"
|
||||||
else
|
else
|
||||||
echo `gettext 'Select the background color: '`
|
echo `gettext 'Select the background color: '`
|
||||||
simple="grey"
|
simple="default"
|
||||||
fi
|
fi
|
||||||
i=1
|
i=1
|
||||||
for x in $COLORS; do
|
for x in $COLORS; do
|
||||||
|
@ -92,9 +109,6 @@ prompt() {
|
||||||
echo "$i. $x"
|
echo "$i. $x"
|
||||||
i=$(expr $i + 1)
|
i=$(expr $i + 1)
|
||||||
[ "$simple" = "$x" ] && simple=$i
|
[ "$simple" = "$x" ] && simple=$i
|
||||||
test $i -lt 10 2>/dev/null && echo -n " " || echo -n " "
|
|
||||||
echo "$i. $x (light)"
|
|
||||||
i=$(expr $i + 1)
|
|
||||||
done
|
done
|
||||||
echo
|
echo
|
||||||
if [ -z "$selected" -a -n "$simple" ]; then
|
if [ -z "$selected" -a -n "$simple" ]; then
|
||||||
|
@ -107,11 +121,7 @@ prompt() {
|
||||||
selected=`head -n1`
|
selected=`head -n1`
|
||||||
else
|
else
|
||||||
i=1
|
i=1
|
||||||
for x in $COLORS; do
|
for color in $COLORS; do
|
||||||
color="dark_$x"
|
|
||||||
[ "$i" = "$selected" ] && break
|
|
||||||
i=$(expr $i + 1)
|
|
||||||
color="light_$x"
|
|
||||||
[ "$i" = "$selected" ] && break
|
[ "$i" = "$selected" ] && break
|
||||||
i=$(expr $i + 1)
|
i=$(expr $i + 1)
|
||||||
done
|
done
|
||||||
|
@ -128,24 +138,29 @@ getletter() {
|
||||||
echo "$1"
|
echo "$1"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
desc=$(echo "$1" | awk -F"_" '{print $1}')
|
color="$1"
|
||||||
color=$(echo "$1" | awk -F"_" '{print $2}')
|
|
||||||
COLORS="black blue cyan green purple red grey yellow"
|
|
||||||
|
|
||||||
case $color in
|
case $color in
|
||||||
black) letter="k";;
|
default_light) letter="d";;
|
||||||
blue) letter="b";;
|
default_dark) letter="D";;
|
||||||
cyan) letter="c";;
|
black) letter="k";;
|
||||||
green) letter="g";;
|
dark_grey) letter="K";;
|
||||||
purple) letter="m";;
|
blue) letter="b";;
|
||||||
red) letter="r";;
|
light_blue) letter="B";;
|
||||||
grey) letter="w";;
|
cyan) letter="c";;
|
||||||
yellow) letter="y";;
|
light_cyan) letter="C";;
|
||||||
*) letter="w";;
|
green) letter="g";;
|
||||||
|
light_green) letter="G";;
|
||||||
|
purple) letter="m";;
|
||||||
|
light_purple) letter="M";;
|
||||||
|
red) letter="r";;
|
||||||
|
light_red) letter="R";;
|
||||||
|
grey) letter="w";;
|
||||||
|
light_grey) letter="W";;
|
||||||
|
white) letter="w";;
|
||||||
|
yellow) letter="Y";;
|
||||||
|
brown) letter="y";;
|
||||||
|
*) letter="d";;
|
||||||
esac
|
esac
|
||||||
if [ "$desc" = "light" ]; then
|
|
||||||
letter=$(echo "$letter" | tr "[:lower:]" "[:upper:]")
|
|
||||||
fi
|
|
||||||
echo "$letter"
|
echo "$letter"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
7
debian/changelog
vendored
7
debian/changelog
vendored
|
@ -1,6 +1,11 @@
|
||||||
byobu (2.43) unreleased; urgency=low
|
byobu (2.43-0ubuntu1) lucid; urgency=low
|
||||||
|
|
||||||
* byobu.1: improve putty bug documentation
|
* byobu.1: improve putty bug documentation
|
||||||
|
* profiles/common: monitor windows, showing "@" next to the window name,
|
||||||
|
but don't print an "Activity" message
|
||||||
|
* byobu-select-profile: improve color selection with more informative
|
||||||
|
color names and support screen default background/foreground colors,
|
||||||
|
LP: #500669
|
||||||
|
|
||||||
-- Dustin Kirkland <kirkland@ubuntu.com> Wed, 23 Dec 2009 14:01:55 -0600
|
-- Dustin Kirkland <kirkland@ubuntu.com> Wed, 23 Dec 2009 14:01:55 -0600
|
||||||
|
|
||||||
|
|
|
@ -84,6 +84,10 @@ defbce "on"
|
||||||
# Log 10000 lines
|
# Log 10000 lines
|
||||||
defscrollback 10000
|
defscrollback 10000
|
||||||
|
|
||||||
|
# Monitor windows
|
||||||
|
defmonitor on
|
||||||
|
activity ""
|
||||||
|
|
||||||
# Maintain SSH_AUTH_SOCK link
|
# Maintain SSH_AUTH_SOCK link
|
||||||
setenv SSH_AUTH_SOCK /var/run/screen/S-$USER/byobu.ssh-agent
|
setenv SSH_AUTH_SOCK /var/run/screen/S-$USER/byobu.ssh-agent
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue