X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.tmux.conf;h=9b915df1a2cacf5a58bbc98877a05d94e7716adb;hp=dd5202a450637829486ead5ff46747a5375c2dd9;hb=76b8970768f42bcc78f1145f6bd719fdbc285857;hpb=a9aced1a57ade71015b8bcbcc3b1bf00cd0f6ef3

diff --git a/.tmux.conf b/.tmux.conf
index dd5202a..9b915df 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -31,8 +31,6 @@ set -g prefix C-p
 unbind C-b
 bind C-p last-window
 bind p send-keys C-p
-bind C-l refresh-client
-bind l refresh-client
 bind S split-window -v
 bind | split-window -h
 bind C-[ copy-mode
@@ -66,13 +64,18 @@ bind C-^ last-pane
 bind J select-pane -D
 bind K select-pane -U
 # Swap panes.
-bind w swap-pane
+bind o swap-pane -D
+bind C-o swap-pane -D
+bind O swap-pane -U
+bind w command-prompt -p "Select [<window>.]<pane> to swap:" 'swap-pane -s . -t %1'
+# Swap windows.
+bind W choose-window "swap-window -t '%%'"
 # Show panes.
 bind = display-panes
 # Move the current pane into a separate window.
 bind b break-pane
 # Split another pane into this window.
-bind B command-prompt -p "Select [<window>.]<pane> to join:" 'join-pane -s %1'
+bind B command-prompt -p "Select <window>[.<pane>] to join:" 'join-pane -s %1'
 # Split vertically.
 bind C-\ split-window -v
 # Next pane.