tmux2.1 mouse updates, also disable rainbarf use

tmux/.tmux.conf

@@ -122,39 +122,30 @@ bind 'C-\' send-prefix
 set-option -s escape-time 1
 
 # so we can scroll the mouse, select panes, etc...
-set-window-option -g mode-mouse on
-set-window-option -g mouse-select-pane on
-set-window-option -g mouse-resize-pane on
-set-window-option -g mouse-select-window on
-
-# Mouse mode can be stupid at times, so make it toggleable.
+set -g mouse on
+bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'copy-mode -e'"
 bind-key m \
   if-shell \
-    "tmux show-window-options | grep 'mode-mouse on'" \
-      "set-window-option mode-mouse off; \
-      set-window-option mouse-select-pane off; \
-      set-window-option mouse-resize-pane off; \
-      set-window-option mouse-select-window off; \
-      display 'Mouse modes off'" \
-      "set-window-option mode-mouse on; \
-      set-window-option mouse-select-pane on; \
-      set-window-option mouse-resize-pane on; \
-      set-window-option mouse-select-window on; \
+    "tmux show-options -g | grep 'mouse on'" \
+      "set -g mouse off; \
+       display 'Mouse modes off'" \
+      "set -g mouse on; \
       display 'Mouse modes on'"
 
 # Assume linux for things, load osx stuff only on osx
 bind C-p run "tmux set-buffer \"$(xclip -o)\"; tmux paste-buffer"
 bind C-y run "tmux save-buffer - | xclip -i"
 
+# TODO: FIXME replace rainbarf with a not perl dependency magnet.
 # Linux specific. Now that I installed rainbarf on things, why not use it.
-if-shell 'test "$(uname)" = "Linux"' \
-    "set-option -g status-right-length 55; \
-     set-option -g status-right '#(rainbarf --bright --width 25) %a %H:%M:%S'; "
+# if-shell 'test "$(uname)" = "Linux"' \
+#     "set-option -g status-right-length 55; \
+#      set-option -g status-right '#(rainbarf --bright --width 25) %a %H:%M:%S'; "
 
 # osx specific
 # Have to modify default command so I can ssh in.
 # that and rainbarf output is 42 chars long (utf8) but helpful.
-if-shell 'test "$(uname)" = "Darwin"' \
-    "set-option -g default-command 'reattach-to-user-namespace -l zsh'; \
-     set-option -g status-right-length 55; \
-     set-option -g status-right '#(rainbarf --remaining --bolt --bright --width 25) %a %H:%M:%S'; "
+# if-shell 'test "$(uname)" = "Darwin"' \
+#     "set-option -g default-command 'zsh -l'; \
+#      set-option -g status-right-length 55; \
+#      set-option -g status-right '#(rainbarf --remaining --bolt --bright --width 25) %a %H:%M:%S'; "