Bump version to 0.5.0

This means that "init" session layouts can now be used to start and/or
re-attach to your main session.

Personally I have a "main" session layout with a couple of default
windows. I can now either start that session, or re-attach to it from
outside of Tmux by just running `tmuxifier s main`, instead of manually
creating a session named "main" and then loading my windows into it.

README.md

@@ -33,9 +33,10 @@ looks like:
 ```bash
 window_root "~/Desktop"
 new_window "Example Window"
-tmux split-window -t "$session:$window.0" -v -p 20 "watch -t date"
-tmux split-window -t "$session:$window.1" -h -p 60
-tmux select-pane -t "$session:$window.0"
+split_v 20
+run_cmd "watch -t date"
+split_h 60
+select_pane 0
 ```
 
 You can then load that window layout into a new window in the
@@ -51,16 +52,31 @@ Which will yield a Tmux window looking like this:
 
 ## Installation
 
+Clone the repo to your machine:
+
 ```bash
 git clone https://github.com/jimeh/tmuxifier.git ~/.tmuxifier
 ```
 
-And add the following to your `~/.profile`, `~/.bash_profile` or equivalent:
+### bash & zsh
+
+And add the following to your `~/.profile`, `~/.bash_profile`, `~/.zshrc` or
+equivalent:
 
 ```bash
 [[ -s "$HOME/.tmuxifier/init.sh" ]] && source "$HOME/.tmuxifier/init.sh"
 ```
 
+### tcsh
+
+Add the following to your `~/.cshrc`, `~/.tcshrc` or equivalent:
+
+```tcsh
+if ( -s "$HOME/.tmuxifier/init.sh" ) then
+  source "$HOME/.tmuxifier/init.sh"
+endif
+```
+
 ## Usage
 
 *__Note:__ This section needs expanding upon.*
@@ -116,8 +132,8 @@ in it.
 ### Custom Installaton Path
 
 To install Tmuxifier to a custom path, clone the repository to your desired
-path and set `$TMUXIFIER` to that path, additionally loading `init.sh` from
-that same path.
+path and set `$TMUXIFIER` to that path, additionally loading `init.sh` or
+`init.tcsh` from that same path.
 
 ```bash
 export TMUXIFIER="$HOME/.dotfiles/tmuxifier"

completion/tmuxifier.tcsh

@@ -0,0 +1,2 @@
+complete tmuxifier 'p@1@`tmuxifier commands`@' \
+                   'p@2@`tmuxifier completions $:-1`@'

examples/example.window.sh

@@ -7,8 +7,9 @@ window_root "~/Desktop"
 new_window "Example Window"
 
 # Split window into panes.
-tmux split-window -t "$session:$window.0" -v -p 20 "watch -t date"
-tmux split-window -t "$session:$window.1" -h -p 60
+split_v 20
+run_cmd "watch -t date"
+split_h 60
 
 # Set active pane.
-tmux select-pane -t "$session:$window.0"
+select_pane 0

init.tcsh

@@ -0,0 +1,13 @@
+# Set tmuxifier root path.
+if ( ! $?TMUXIFIER ) then
+  setenv TMUXIFIER "${HOME}/.tmuxifier"
+endif
+
+# Add `bin` directroy to `$PATH`.
+set path = ( $TMUXIFIER/bin $path )
+
+# If `tmuxifier` is available, and `$TMUXIFIER_NO_COMPLETE` is not set, then
+# load tmuxifier shell completion.
+if ( ! $?TMUXIFIER_NO_COMPLETE ) then
+  which tmuxifier > /dev/null && source "$TMUXIFIER/completion/tmuxifier.tcsh"
+endif

lib/layout-helpers.sh

@@ -17,8 +17,8 @@ new_window() {
   if [ -n "$2" ]; then local command=("$2"); fi
   if [ -n "$window" ]; then local winarg=(-n "$window"); fi
 
-  if [ -n "$window_root" ]; then cd "$window_root"; fi
   tmux new-window -t "$session:" "${winarg[@]}" "${command[@]}"
+  __go_to_window_or_session_path
 }
 
 # Split current window/pane vertically.
@@ -30,6 +30,7 @@ new_window() {
 split_v() {
   if [ -n "$1" ]; then local percentage=(-p "$1"); fi
   tmux split-window -t "$session:$window.$2" -v "${percentage[@]}"
+  __go_to_window_or_session_path
 }
 
 # Split current window/pane horizontally.
@@ -41,6 +42,7 @@ split_v() {
 split_h() {
   if [ -n "$1" ]; then local percentage=(-p "$1"); fi
   tmux split-window -t "$session:$window.$2" -h "${percentage[@]}"
+  __go_to_window_or_session_path
 }
 
 # Select a specific window.
@@ -61,6 +63,16 @@ select_pane() {
   tmux select-pane -t "$session:$window.$1"
 }
 
+# Send/paste keys to the currently active pane/window.
+#
+# Arguments:
+#   - $1: String to paste.
+#   - $2: (optional) Target pane ID to send input to.
+#
+send_keys() {
+  tmux send-keys -t "$session:$window.$2" "$1"
+}
+
 # Runs a shell command in the currently active pane/window.
 #
 # Arguments:
@@ -68,8 +80,8 @@ select_pane() {
 #   - $2: (optional) Target pane ID to run command in.
 #
 run_cmd() {
-  tmux send-keys -t "$session:$window.$2" -l "$1"
-  tmux send-keys -t "$session:$window.$2" "C-m"
+  send_keys "$1" "$2"
+  send_keys "C-m" "$2"
 }
 
 # Cusomize session root path. Default is `$HOME`.
@@ -170,12 +182,10 @@ initialize_session() {
     fi
 
     # In order to ensure only specified windows are created, we move the
-    # default window to position 99, and later remove it with the
-    # `finalize_session` function.
-    tmux move-window -s "$session:0" -t "$session:99"
-
-    # Ensure correct pane splitting.
-    __go_to_session
+    # default window to position 999, and later remove it with the
+    # `finalize_and_go_to_session` function.
+    local first_window_index=$(__get_first_window_index)
+    tmux move-window -s "$session:$first_window_index" -t "$session:999"
 
     # Session created, return ok exit status.
     return 0
@@ -195,7 +205,7 @@ initialize_session() {
 # to it here.
 #
 finalize_and_go_to_session() {
-  ! tmux kill-window -t "$session:99" 2>/dev/null
+  ! tmux kill-window -t "$session:999" 2>/dev/null
   if [[ "$(tmuxifier-current-session)" != "$session" ]]; then
     __go_to_session
   fi
@@ -217,6 +227,16 @@ __expand_path() {
   echo $(eval echo "$@")
 }
 
+__get_first_window_index() {
+  local index
+  index=$(tmux list-windows -t "$session:" -F "#{window_index}" 2>/dev/null)
+  if [ -n "$index" ]; then
+    echo "$index" | head -1
+  else
+    echo "0"
+  fi
+}
+
 __go_to_session() {
   if [ -z "$TMUX" ]; then
     tmux -u attach-session -t "$session:"
@@ -224,3 +244,11 @@ __go_to_session() {
     tmux -u switch-client -t "$session:"
   fi
 }
+
+__go_to_window_or_session_path() {
+  local window_or_session_root=${window_root-$session_root}
+  if [ -n "$window_or_session_root" ]; then
+    run_cmd "cd \"$window_or_session_root\""
+    send_keys "C-l"
+  fi
+}

libexec/tmuxifier-current-session

@@ -3,11 +3,9 @@ set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
 if [ -n "$TMUX" ]; then
-  for item in $(tmux list-sessions -F "#{?session_attached,1,0}:#S"); do
-    if [[ "$item" == "1:"* ]]; then
-      echo ${item/1:/}
-      exit 0
-    fi
+  for item in $(tmux list-pane -F "#{session_name}");do
+    echo $item
+    exit 0
   done
 fi
 

libexec/tmuxifier-list-sessions

@@ -2,7 +2,7 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
-list=$(find "$TMUXIFIER_LAYOUT_PATH" -name "*.session.sh")
+list=$(find -L "$TMUXIFIER_LAYOUT_PATH" -name "*.session.sh")
 for file in $list; do
   file=${file/$TMUXIFIER_LAYOUT_PATH\//}
   echo "  ${file/.session.sh/}"

libexec/tmuxifier-list-windows

@@ -2,7 +2,7 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
-list=$(find "$TMUXIFIER_LAYOUT_PATH" -name "*.window.sh")
+list=$(find -L "$TMUXIFIER_LAYOUT_PATH" -name "*.window.sh")
 for file in $list; do
   file=${file/$TMUXIFIER_LAYOUT_PATH\//}
   echo "  ${file/.window.sh/}"

libexec/tmuxifier-load-session

@@ -18,9 +18,5 @@ fi
 # Load runtime functions.
 source "$TMUXIFIER/runtime.sh"
 
-if [ ! -z $TMUX ]; then
-  load_session "$1"
-else
-  echo "tmuxifier: 'load-session' command can only be used from within Tmux."
-  exit 1
-fi
+# Load session file.
+load_session "$1"

libexec/tmuxifier-new-session

@@ -2,6 +2,14 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Provide tmuxifier completions
+if [ "$1" == "--complete" ]; then
+  for item in $(tmuxifier-list-sessions); do
+    echo "$item"
+  done
+  exit
+fi
+
 if [ -z "$1" ]; then
   echo "$(tmuxifier-help new-session)" >&2
   exit 1

libexec/tmuxifier-new-window

@@ -2,6 +2,14 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
+# Provide tmuxifier completions
+if [ "$1" == "--complete" ]; then
+  for item in $(tmuxifier-list-windows); do
+    echo "$item"
+  done
+  exit
+fi
+
 if [ -z "$1" ]; then
   echo "$(tmuxifier-help new-window)" >&2
   exit 1

libexec/tmuxifier-version

@@ -2,4 +2,4 @@
 set -e
 [ -n "$TMUXIFIER_DEBUG" ] && set -x
 
-echo "0.2.0"
+echo "0.5.0"

templates/window.sh

@@ -14,5 +14,9 @@ new_window "{{WINDOW_NAME}}"
 #run_cmd "top"     # runs in active pane
 #run_cmd "date" 1  # runs in pane 1
 
+# Paste text
+#send_keys "top"    # paste into active pane
+#send_keys "date" 1 # paste into active pane
+
 # Set active pane.
 #select_pane 0