From c03cda56af2fe2908c964565c6de85a9b5c9d319 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <dustin.kirkland@gazzang.com>
Date: Sat, 24 Dec 2011 10:31:53 -0600
Subject: [PATCH] * usr/share/byobu/keybindings/f-keys.tmux,  
 usr/share/byobu/keybindings/f-keys.tmux.disable,  
 usr/share/doc/byobu/help.tmux.txt:   - put all of the status line functions
 under *-F5   - put all of the split arrangement functions under *-F8

---
 debian/changelog                                | 5 +++++
 usr/share/byobu/keybindings/f-keys.tmux         | 6 +++---
 usr/share/byobu/keybindings/f-keys.tmux.disable | 1 +
 usr/share/doc/byobu/help.tmux.txt               | 7 ++++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 166b3a30..e0148903 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ byobu (5.0) unreleased; urgency=low
     usr/bin/byobu-select-session, usr/lib/byobu/include/common:
     - bump up to the 5.x series
     - change default backend from screen to tmux
+  * usr/share/byobu/keybindings/f-keys.tmux,
+    usr/share/byobu/keybindings/f-keys.tmux.disable,
+    usr/share/doc/byobu/help.tmux.txt:
+    - put all of the status line functions under *-F5
+    - put all of the split arrangement functions under *-F8
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 18 Dec 2011 21:35:00 -0600
 
diff --git a/usr/share/byobu/keybindings/f-keys.tmux b/usr/share/byobu/keybindings/f-keys.tmux
index ba3cfb80..d0abe461 100644
--- a/usr/share/byobu/keybindings/f-keys.tmux
+++ b/usr/share/byobu/keybindings/f-keys.tmux
@@ -50,8 +50,8 @@ bind-key -n C-Down resize-pane -D
 bind-key -n C-Left resize-pane -L
 bind-key -n C-Right resize-pane -R
 bind-key -n F5 source $BYOBU_PREFIX/share/byobu/profiles/tmuxrc
-bind-key -n S-F5 next-layout
 bind-key -n C-F5 send-keys ". $BYOBU_PREFIX/bin/byobu-reconnect-sockets" \; send-keys Enter
+bind-key -n C-S-F5 new-window -d "byobu-select-profile -r"
 bind-key -n F6 detach
 bind-key -n S-F6 run-shell 'exec touch $BYOBU_RUN_DIR/no-logout' \; detach
 bind-key -n C-F6 kill-pane
@@ -59,9 +59,9 @@ bind-key -n F7 copy-mode
 bind-key -n M-NPage copy-mode \; send-keys NPage
 bind-key -n M-PPage copy-mode \; send-keys PPage
 bind-key -n F8 command-prompt -p "(rename-window)" "rename-window %%"
-bind-key -n C-F8 new-window -d "byobu-select-profile -r"
+bind-key -n S-F8 next-layout
+bind-key -n C-F8 new-window -k "$BYOBU_PREFIX/lib/byobu/include/layout restore; clear; $SHELL"
 bind-key -n C-S-F8 command-prompt -p "Save byobu layout as:" "run-shell '$BYOBU_PREFIX/lib/byobu/include/layout save %%'"
-bind-key -n S-F8 new-window -k "$BYOBU_PREFIX/lib/byobu/include/layout restore; clear; $SHELL"
 bind-key -n F9 new-window -k -n config byobu-config
 bind-key -n M-F11 break-pane
 bind-key -n C-F11 join-pane -h -s :. -t :-1
diff --git a/usr/share/byobu/keybindings/f-keys.tmux.disable b/usr/share/byobu/keybindings/f-keys.tmux.disable
index 209f7624..8aeeec4c 100644
--- a/usr/share/byobu/keybindings/f-keys.tmux.disable
+++ b/usr/share/byobu/keybindings/f-keys.tmux.disable
@@ -48,6 +48,7 @@ unbind-key -n C-Right
 unbind-key -n F5
 unbind-key -n S-F5
 unbind-key -n C-F5
+unbind-key -n C-S-F5
 unbind-key -n F6
 unbind-key -n S-F6
 unbind-key -n C-F6
diff --git a/usr/share/doc/byobu/help.tmux.txt b/usr/share/doc/byobu/help.tmux.txt
index 96f765aa..2108c22c 100644
--- a/usr/share/doc/byobu/help.tmux.txt
+++ b/usr/share/doc/byobu/help.tmux.txt
@@ -17,16 +17,17 @@ and some convenient keybindings:
     Shift-Left/Right/Up/Down    Move focus among splits
     Ctrl-Left/Right/Up/Down     Resize a split
   F5                            Reload profile, refresh status
-    Shift-F5                    Toggle through split arrangements
+    Shift-F5                    Toggle through status lines
     Ctrl-F5                     Reconnect ssh/gpg/dbus sockets
+    Ctrl-Shift-F5               Change status bar's color randomly
   F6                            Detach session and then logout
     Shift-F6                    Detach session and do not logout
     Ctrl-F6                     Kill split in focus
   F7                            Enter scrollback history
     Alt-PageUp/PageDown         Enter and move through scrollback
   F8                            Change the current window's name
-    Ctrl-F8                     Change status bar's color randomly
-    Shift-F8                    Restore a split-pane layout
+    Shift-F8                    Toggle through split arrangements
+    Ctrl-F8                     Restore a split-pane layout
     Ctrl-Shift-F8               Save the current split-pane layout
   F9                            Launch byobu-config window
   F10                           * Used by X11 *