From 4f685d5c3df2547a4b1e4b2f633a562e8ae258b8 Mon Sep 17 00:00:00 2001 From: quentin Date: Tue, 17 Mar 2015 04:13:54 +0100 Subject: [PATCH] Add an option to save the full pane contents By default only the visible pane area is captured and restored. The @resurrect-pane-contents-area option lets the full pane area be captured instead. --- scripts/save.sh | 13 ++++++++----- scripts/variables.sh | 6 ++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/scripts/save.sh b/scripts/save.sh index d33f9f3..327a352 100755 --- a/scripts/save.sh +++ b/scripts/save.sh @@ -78,7 +78,8 @@ state_format() { } dump_panes_raw() { - tmux list-panes -a -F "$(pane_format)" + local format="${1:-$(pane_format)}" + tmux list-panes -a -F "$format" } dump_windows_raw(){ @@ -110,7 +111,9 @@ pane_full_command() { capture_pane_contents() { local pane_id="$1" - tmux capture-pane -ep -t "$pane_id" > "$(resurrect_pane_file "$pane_id")" + local start_line="0" + [[ "$(get_tmux_option "$pane_contents_area_option" "visible")" == "full" ]] && start_line="-$2" + tmux capture-pane -ep -S "$start_line" -t "$pane_id" > "$(resurrect_pane_file "$pane_id")" } save_shell_history() { @@ -207,9 +210,9 @@ dump_state() { } dump_pane_contents() { - dump_panes | - while IFS=$d read line_type session_name window_number window_name window_active window_flags pane_index dir pane_active pane_command full_command; do - capture_pane_contents "$session_name:$window_number.$pane_index" + paste -d"$d" <(dump_panes) <(dump_panes_raw "#{history_size}") | + while IFS=$d read line_type session_name window_number window_name window_active window_flags pane_index dir pane_active pane_command full_command history_size; do + capture_pane_contents "$session_name:$window_number.$pane_index" "$history_size" done } diff --git a/scripts/variables.sh b/scripts/variables.sh index c1e15ef..f5fabb9 100644 --- a/scripts/variables.sh +++ b/scripts/variables.sh @@ -29,7 +29,13 @@ inline_strategy_token="->" save_command_strategy_option="@resurrect-save-command-strategy" default_save_command_strategy="ps" +# Pane contents capture options. +# @resurrect-pane-contents-area option can be: +# 'visible' - capture only the visible pane area (default) +# 'full' - capture the full pane contents pane_contents_option="@resurrect-capture-pane-contents" +pane_contents_area_option="@resurrect-pane-contents-area" + bash_history_option="@resurrect-save-bash-history" # set to 'on' to ensure panes are never ever overwritten