github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-22 14:24:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

* usr/bin/byobu, usr/share/byobu/keybindings/f-keys.tmux: LP: #1103449

Browse source 
- fix regression, re-enable blank window titles in both screen and tmux
This commit is contained in:
Dustin Kirkland 2013-02-06 22:50:14 -06:00
commit b499dc61ef
3 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -22,6 +22,8 @@ byobu (5.31) unreleased; urgency=low
- support fish shell in the installer - support fish shell in the installer
* usr/bin/byobu-select-session: * usr/bin/byobu-select-session:
- fix python exception - fix python exception
* usr/bin/byobu, usr/share/byobu/keybindings/f-keys.tmux: LP: #1103449
- fix regression, re-enable blank window titles in both screen and tmux
-- Dustin Kirkland <kirkland@ubuntu.com> Mon, 28 Jan 2013 02:21:15 -0600 -- Dustin Kirkland <kirkland@ubuntu.com> Mon, 28 Jan 2013 02:21:15 -0600

37
usr/bin/byobu
View file

@ -140,18 +140,8 @@ case $BYOBU_BACKEND in
-*r*|-*d*|-*D*|-*S*|-ls|-list) -*r*|-*d*|-*D*|-*S*|-ls|-list)
BYOBU_SESSION_NAME= BYOBU_SESSION_NAME=
;; ;;
-t)
shelltitle=1
;;
esac esac
done done
if [ -n "$shelltitle" ]; then
unset shelltitle
unset BYOBU_SHELL_TITLE
else
BYOBU_SHELL_TITLE="-t ."
fi
sessions=$($BYOBU_BACKEND -wipe 2>/dev/null) || true sessions=$($BYOBU_BACKEND -wipe 2>/dev/null) || true
;; ;;
esac esac
@ -164,7 +154,14 @@ esac
if [ "$#" = "0" ]; then if [ "$#" = "0" ]; then
if [ "$CUSTOM_WINDOW_SET" = "1" ]; then if [ "$CUSTOM_WINDOW_SET" = "1" ]; then
# Start new custom window set session # Start new custom window set session
exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE $BYOBU_SHELL_TITLE case $BYOBU_BACKEND in
tmux)
exec tmux $SCREEN_TERM $BYOBU_PROFILE
;;
screen)
exec screen $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE -t ''
;;
esac
else else
case "$sessions" in case "$sessions" in
*\(*\)*) *\(*\)*)
@ -173,13 +170,27 @@ if [ "$#" = "0" ]; then
;; ;;
*) *)
# Start new default session # Start new default session
exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE $BYOBU_SHELL_TITLE $DEFAULT_WINDOW case $BYOBU_BACKEND in
tmux)
exec tmux $SCREEN_TERM $BYOBU_PROFILE $DEFAULT_WINDOW
;;
screen)
exec screen $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE -t '' $DEFAULT_WINDOW
;;
esac
;; ;;
esac esac
fi fi
else else
# Launch with command line args # Launch with command line args
exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE $BYOBU_SHELL_TITLE "$@" case $BYOBU_BACKEND in
tmux)
exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_PROFILE "$@"
;;
screen)
exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE -t '' "$@"
;;
esac
fi fi
# vi: syntax=sh ts=4 noexpandtab # vi: syntax=sh ts=4 noexpandtab

2
usr/share/byobu/keybindings/f-keys.tmux
View file

@ -28,7 +28,7 @@ source $BYOBU_PREFIX/share/byobu/keybindings/f-keys.tmux.disable
# Documented in: $BYOBU_PREFIX/share/doc/byobu/help.tmux.txt # Documented in: $BYOBU_PREFIX/share/doc/byobu/help.tmux.txt
bind-key -n F1 new-window -k -n config byobu-config bind-key -n F1 new-window -k -n config byobu-config
bind-key -n S-F1 new-window -k -n help '$BYOBU_PAGER $BYOBU_PREFIX/share/doc/byobu/help.tmux.txt' bind-key -n S-F1 new-window -k -n help '$BYOBU_PAGER $BYOBU_PREFIX/share/doc/byobu/help.tmux.txt'
bind-key -n F2 new-window \; rename-window "$BYOBU_SHELL_TITLE" bind-key -n F2 new-window \; rename-window ""
bind-key -n C-F2 display-panes \; split-window -h bind-key -n C-F2 display-panes \; split-window -h
bind-key -n S-F2 display-panes \; split-window -v bind-key -n S-F2 display-panes \; split-window -v
bind-key -n C-S-F2 new-session bind-key -n C-S-F2 new-session