diff --git a/debian/changelog b/debian/changelog index b69cdea6..21483445 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ -byobu (2.78) unreleased; urgency=low +byobu (2.78) UNRELEASED; urgency=low - * UNRELEASED + * usr/bin/byobu-status, usr/lib/byobu/menu, + usr/share/byobu/keybindings/f-keys, + usr/share/byobu/keybindings/screen-escape-keys: show a visual queue + when toggling on/off the f-key keybindings; Menu: vs. Menu:<^a-@>, + LP: #589016 -- Dustin Kirkland Tue, 01 Jun 2010 10:53:54 -0500 diff --git a/usr/bin/byobu-status b/usr/bin/byobu-status index 5a349be6..7d786f4e 100755 --- a/usr/bin/byobu-status +++ b/usr/bin/byobu-status @@ -85,5 +85,6 @@ case "$P" in *) eval x="\$$P" || exit 1 [ "$x" = "1" ] || exit 0 - . $(find_script "$P") + shift + . $(find_script "$P") "$@" esac diff --git a/usr/lib/byobu/menu b/usr/lib/byobu/menu index a34e47af..e775e449 100755 --- a/usr/lib/byobu/menu +++ b/usr/lib/byobu/menu @@ -23,7 +23,7 @@ color 2>/dev/null || color() { true; } [ -r "$HOME/.$PKG/keybindings" ] && bindings="$HOME/.$PKG/keybindings" || bindings="$HOME/.screenrc" -if grep -qs "^source.*screen-escape-keys$" $bindings 2>/dev/null; then +if grep -qs "^source.*screen-escape-keys$" $bindings 2>/dev/null || [ "$1" = "--disable-f-keys" ]; then esc=`grep "^escape" $bindings | sed "s/^.*\(.\)$/\1/"` [ -n "$esc" ] && key="^$esc-@" || key="^a-@" elif grep -qs "^source.*none$" $bindings 2>/dev/null; then diff --git a/usr/share/byobu/keybindings/f-keys b/usr/share/byobu/keybindings/f-keys index 192a88ce..4aac9f00 100644 --- a/usr/share/byobu/keybindings/f-keys +++ b/usr/share/byobu/keybindings/f-keys @@ -42,4 +42,4 @@ bind ~ eval 'process s' 'exec sed -i "/./,/^$/!d" /var/run/screen/S-$USER/byobu- # toggle f-key keybindings off register d "^a:source /usr/share/byobu/keybindings/screen-escape-keys^M" -bind ! process d +bind ! eval 'process d' 'backtick 111 9999999 9999999 byobu-status menu --disable-f-keys' diff --git a/usr/share/byobu/keybindings/screen-escape-keys b/usr/share/byobu/keybindings/screen-escape-keys index ae567f97..076b5ae9 100644 --- a/usr/share/byobu/keybindings/screen-escape-keys +++ b/usr/share/byobu/keybindings/screen-escape-keys @@ -49,4 +49,4 @@ bind @ screen -t config 0 byobu-config bind $ screen -t status 0 byobu-status-detail # ctrl-a-! Toggle f-key keybindings on register e "^a:source /usr/share/byobu/keybindings/f-keys^M" -bind ! process e +bind ! eval 'process e' 'backtick 111 9999999 9999999 byobu-status menu'