From fc58b3cc040c24ab8483cfdb933db067310843bf Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Sat, 28 May 2011 12:34:45 -0500 Subject: [PATCH] * usr/bin/byobu-select-session: - fix select session, when there is only 1 session to attach to * usr/share/byobu/keybindings/f-keys: - use shift-F6 (in both ssh and tty) for detach, but don't logout - seems that ctrl-F6 doesn't work in tty right now --- debian/changelog | 6 +++++- usr/bin/byobu-select-session | 4 ++-- usr/share/byobu/keybindings/f-keys | 5 ++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index eca3c074..6e17bb51 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ byobu (4.6) unreleased; urgency=low - * UNRELEASED + * usr/bin/byobu-select-session: + - fix select session, when there is only 1 session to attach to + * usr/share/byobu/keybindings/f-keys: + - use shift-F6 (in both ssh and tty) for detach, but don't logout + - seems that ctrl-F6 doesn't work in tty right now -- Dustin Kirkland Thu, 26 May 2011 15:14:52 -0500 diff --git a/usr/bin/byobu-select-session b/usr/bin/byobu-select-session index 3ee72e78..bdde2507 100755 --- a/usr/bin/byobu-select-session +++ b/usr/bin/byobu-select-session @@ -65,8 +65,8 @@ if i > 1: tries += 1 choice = "" sys.stderr.write("\nERROR: Invalid input\n"); -else: - os.execvp("byobu", ["", "shell"]) +elif i == 1: + os.execvp("byobu", ["", "-AOxRR"]) if choice: if choice == i-1: diff --git a/usr/share/byobu/keybindings/f-keys b/usr/share/byobu/keybindings/f-keys index 4b923743..93d25a72 100644 --- a/usr/share/byobu/keybindings/f-keys +++ b/usr/share/byobu/keybindings/f-keys @@ -52,7 +52,6 @@ bindkey "^[O1;5Q" eval 'split -v' 'focus down' 'next' 'focus up' 'layout save by bindkey "^[O1;2R" focus up # shift-F3 | focus up bindkey "^[O1;2S" focus down # shift-F4 | focus down bindkey "^[[15;2~" only # shift-F5 | kill all splits -bindkey "^[[17;2~" remove # shift-F6 | kill this split # Hotkeys for splits (tty) bindkey "^[[26~" eval 'split' 'focus down' 'next' 'focus up' # shift-F2 | horizontal split @@ -60,7 +59,6 @@ bindkey "^[[26~" eval 'split' 'focus down' 'next' 'focus up' # shift-F2 | horiz bindkey "^[[28~" focus up # shift-F3 | focus up bindkey "^[[29~" focus down # shift-F4 | focus down bindkey "^[[31~" only # shift-F5 | kill all splits -bindkey "^[[32~" remove # shift-F6 | kill this split # Make it more logical how to enter scrollback register p "^[[5~" @@ -72,7 +70,8 @@ bindkey "^[[6;3~" eval 'msgwait 0' 'msgminwait 0' 'copy' 'process n' # alt-page bindkey "^[[15;5~" eval 'process x' 'process r' 'stuff ". $BYOBU_PREFIX/bin/byobu-reconnect-sockets^M"' # ctrl-F5 | reconnect gpg/ssh/x sockets # Detach from an auto-launched byobu, but don't log out of the shell -bindkey "^[[17;2~" eval 'exec touch /var/run/screen/S-$USER/byobu.no-logout' 'detach' # ctrl-F6 | detach, but don't logout +bindkey "^[[17;2~" eval 'exec touch /var/run/screen/S-$USER/byobu.no-logout' 'detach' # shift-F6 | detach, but don't logout +bindkey "^[[32~" eval 'exec touch /var/run/screen/S-$USER/byobu.no-logout' 'detach' # shift-F6 | detach, but don't logout # toggle f-key keybindings off register d ":source $BYOBU_PREFIX/share/byobu/keybindings/screen-escape-keys^M"